From 4e683c4fca55164194ae4486ff0247926637a95c Mon Sep 17 00:00:00 2001 From: dkanada Date: Wed, 11 Dec 2019 23:34:29 +0900 Subject: [PATCH] fix context menu margin and user preference buttons --- src/components/actionsheet/actionsheet.css | 9 ++++---- src/components/indicators/indicators.js | 1 - .../itemMediaInfo/itemMediaInfo.template.html | 8 +++---- .../itemidentifier.template.html | 19 +++++----------- .../loading/{loader2.gif => loader.gif} | Bin src/components/loading/loadingLegacy.js | 9 ++------ src/components/loading/package.json | 3 --- src/components/loadingdialog/loadingdialog.js | 11 +-------- src/components/mediainfo/mediainfo.css | 3 --- .../serverNotifications/package.json | 3 --- src/mypreferencesmenu.html | 20 ++++++++--------- src/mypreferencesplayback.html | 5 ++--- src/mypreferencessubtitles.html | 5 ++--- src/myprofile.html | 6 ++--- src/notificationsettings.html | 5 ++--- src/nowplaying.html | 4 +--- src/search.html | 10 +++------ src/streamingsettings.html | 6 +++-- src/tv.html | 11 ++++----- src/userparentalcontrol.html | 19 ++++++---------- src/userpassword.html | 4 +--- src/wizardfinish.html | 9 +------- src/wizardlibrary.html | 21 +++++++++--------- src/wizardremoteaccess.html | 16 +++++++------ src/wizardsettings.html | 15 ++++++++----- src/wizardstart.html | 13 +++++------ src/wizarduser.html | 19 ++++++++-------- 27 files changed, 99 insertions(+), 155 deletions(-) rename src/components/loading/{loader2.gif => loader.gif} (100%) delete mode 100644 src/components/loading/package.json delete mode 100644 src/components/serverNotifications/package.json diff --git a/src/components/actionsheet/actionsheet.css b/src/components/actionsheet/actionsheet.css index c1b169889..8e5084038 100644 --- a/src/components/actionsheet/actionsheet.css +++ b/src/components/actionsheet/actionsheet.css @@ -37,11 +37,12 @@ box-shadow: none; flex-shrink: 0; border-radius: 0; + margin: 0; } - .actionSheetMenuItem:focus { - transform: none !important; - } +.actionSheetMenuItem:focus { + transform: none !important; +} .actionsheetListItemBody { padding: .4em 1em .4em .6em !important; @@ -104,7 +105,7 @@ } .actionsheet-xlargeFont { - font-size: 112%!important; + font-size: 112% !important; } .btnCloseActionSheet { diff --git a/src/components/indicators/indicators.js b/src/components/indicators/indicators.js index 8deedef6c..e8813d947 100644 --- a/src/components/indicators/indicators.js +++ b/src/components/indicators/indicators.js @@ -115,7 +115,6 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun } function getTimerIndicator(item) { - var status; if (item.Type === 'SeriesTimer') { diff --git a/src/components/itemMediaInfo/itemMediaInfo.template.html b/src/components/itemMediaInfo/itemMediaInfo.template.html index a947a55d2..1eeab4fbd 100644 --- a/src/components/itemMediaInfo/itemMediaInfo.template.html +++ b/src/components/itemMediaInfo/itemMediaInfo.template.html @@ -1,8 +1,8 @@
- -

- ${HeaderMediaInfo} -

+ +

${HeaderMediaInfo}

diff --git a/src/components/itemidentifier/itemidentifier.template.html b/src/components/itemidentifier/itemidentifier.template.html index 0081b543a..d921d580a 100644 --- a/src/components/itemidentifier/itemidentifier.template.html +++ b/src/components/itemidentifier/itemidentifier.template.html @@ -2,9 +2,7 @@ -

- ${Identify} -

+

${Identify}

@@ -17,16 +15,13 @@
- +
- +
-
-
+
-
+

${SearchResults}

-

@@ -51,8 +45,7 @@
-
diff --git a/src/components/loading/loader2.gif b/src/components/loading/loader.gif similarity index 100% rename from src/components/loading/loader2.gif rename to src/components/loading/loader.gif diff --git a/src/components/loading/loadingLegacy.js b/src/components/loading/loadingLegacy.js index c5ffd8dc6..757cea016 100644 --- a/src/components/loading/loadingLegacy.js +++ b/src/components/loading/loadingLegacy.js @@ -6,14 +6,11 @@ define(['require', 'css!./loadingLegacy'], function (require) { return { show: function () { var elem = loadingElem; - if (!elem) { - elem = document.createElement("img"); - elem.src = require.toUrl('.').split('?')[0] + '/loader2.gif'; + elem.src = require.toUrl('.').split('?')[0] + '/loader.gif'; loadingElem = elem; - elem.classList.add('loading-spinner'); document.body.appendChild(elem); @@ -23,11 +20,9 @@ define(['require', 'css!./loadingLegacy'], function (require) { }, hide: function () { var elem = loadingElem; - if (elem) { - elem.classList.add('hide'); } } }; -}); \ No newline at end of file +}); diff --git a/src/components/loading/package.json b/src/components/loading/package.json deleted file mode 100644 index 79fd41b0f..000000000 --- a/src/components/loading/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "main": "loading.js" -} \ No newline at end of file diff --git a/src/components/loadingdialog/loadingdialog.js b/src/components/loadingdialog/loadingdialog.js index 03e3cc198..bd6a80fd5 100644 --- a/src/components/loadingdialog/loadingdialog.js +++ b/src/components/loadingdialog/loadingdialog.js @@ -2,14 +2,12 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp 'use strict'; function showDialog(instance, options, template) { - var dialogOptions = { removeOnClose: true, scrollY: false }; var enableTvLayout = layoutManager.tv; - if (enableTvLayout) { dialogOptions.size = 'fullscreen'; } @@ -48,7 +46,6 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp instance.dlg = dlg; return dialogHelper.open(dlg).then(function () { - if (enableTvLayout) { scrollHelper.centerFocus.off(dlg.querySelector('.formDialogContent'), false); } @@ -58,12 +55,10 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp } function LoadingDialog(options) { - this.options = options; } LoadingDialog.prototype.show = function () { - var instance = this; loading.show(); @@ -76,15 +71,12 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp }; LoadingDialog.prototype.setTitle = function (title) { - }; LoadingDialog.prototype.setText = function (text) { - }; LoadingDialog.prototype.hide = function () { - if (this.dlg) { dialogHelper.close(this.dlg); this.dlg = null; @@ -92,10 +84,9 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp }; LoadingDialog.prototype.destroy = function () { - this.dlg = null; this.options = null; }; return LoadingDialog; -}); \ No newline at end of file +}); diff --git a/src/components/mediainfo/mediainfo.css b/src/components/mediainfo/mediainfo.css index 9b27e1253..2203ba667 100644 --- a/src/components/mediainfo/mediainfo.css +++ b/src/components/mediainfo/mediainfo.css @@ -69,10 +69,7 @@ } .closedCaptionMediaInfoText { - /*padding: .24em .4em;*/ font-weight: bold; - /*font-size: inherit;*/ - /*background: rgba(81, 81, 81, .7);*/ } .mediaInfoOfficialRating { diff --git a/src/components/serverNotifications/package.json b/src/components/serverNotifications/package.json deleted file mode 100644 index 779da202d..000000000 --- a/src/components/serverNotifications/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "main": "serverNotifications.js" -} \ No newline at end of file diff --git a/src/mypreferencesmenu.html b/src/mypreferencesmenu.html index 0be133ef7..0638a49d9 100644 --- a/src/mypreferencesmenu.html +++ b/src/mypreferencesmenu.html @@ -3,7 +3,7 @@

- +
person
@@ -12,7 +12,7 @@
- +
tv
@@ -21,7 +21,7 @@
- +
home
@@ -30,7 +30,7 @@
- +
play_circle_filled
@@ -39,7 +39,7 @@
- +
closed_caption
@@ -50,7 +50,7 @@

${HeaderAdmin}

- +
dashboard
@@ -58,7 +58,7 @@
- +
mode_edit
@@ -69,7 +69,7 @@

${HeaderUser}

- +
wifi
@@ -77,7 +77,7 @@
- +
exit_to_app
@@ -88,4 +88,4 @@
-
\ No newline at end of file +
diff --git a/src/mypreferencesplayback.html b/src/mypreferencesplayback.html index 93f806d0d..d908c0609 100644 --- a/src/mypreferencesplayback.html +++ b/src/mypreferencesplayback.html @@ -1,4 +1,3 @@
-
-
-
\ No newline at end of file +
+
diff --git a/src/mypreferencessubtitles.html b/src/mypreferencessubtitles.html index aa26a8f15..29d1c8489 100644 --- a/src/mypreferencessubtitles.html +++ b/src/mypreferencessubtitles.html @@ -1,4 +1,3 @@
-
-
-
\ No newline at end of file +
+
diff --git a/src/myprofile.html b/src/myprofile.html index d30f90581..3765ac5e7 100644 --- a/src/myprofile.html +++ b/src/myprofile.html @@ -42,9 +42,7 @@
-

- ${HeaderEasyPinCode} -

+

${HeaderEasyPinCode}

${EasyPasswordHelp}

@@ -68,4 +66,4 @@
-
\ No newline at end of file +
diff --git a/src/notificationsettings.html b/src/notificationsettings.html index e0747c34b..241e1cef2 100644 --- a/src/notificationsettings.html +++ b/src/notificationsettings.html @@ -2,9 +2,8 @@
-
-
+
-
\ No newline at end of file +
diff --git a/src/nowplaying.html b/src/nowplaying.html index 86565254a..44b7e3816 100644 --- a/src/nowplaying.html +++ b/src/nowplaying.html @@ -13,7 +13,6 @@
- @@ -53,8 +52,7 @@
-
-
+
diff --git a/src/streamingsettings.html b/src/streamingsettings.html index 7efb4a396..2d51d9ee7 100644 --- a/src/streamingsettings.html +++ b/src/streamingsettings.html @@ -11,8 +11,10 @@
${LabelRemoteClientBitrateLimitHelp}
- + - \ No newline at end of file + diff --git a/src/tv.html b/src/tv.html index 2a8c3ade2..1327d53ff 100644 --- a/src/tv.html +++ b/src/tv.html @@ -8,10 +8,8 @@ -
-
-
-
+
+
@@ -23,8 +21,7 @@

${HeaderContinueWatching}

-
-
+
@@ -76,4 +73,4 @@
- \ No newline at end of file + diff --git a/src/userparentalcontrol.html b/src/userparentalcontrol.html index e2bc19151..302969b6c 100644 --- a/src/userparentalcontrol.html +++ b/src/userparentalcontrol.html @@ -1,5 +1,4 @@
-
@@ -15,17 +14,17 @@ ${TabParentalControl} ${TabPassword}
-
+
${MaxParentalRatingHelp}
-
-
+
+
@@ -35,9 +34,7 @@ add
-
- -
+
@@ -47,10 +44,9 @@ add
-

${HeaderAccessScheduleHelp}

-
-
+

${HeaderAccessScheduleHelp}

+
@@ -58,8 +54,7 @@ ${ButtonSave}
-
- \ No newline at end of file + diff --git a/src/userpassword.html b/src/userpassword.html index 3014317cf..3f65c214f 100644 --- a/src/userpassword.html +++ b/src/userpassword.html @@ -1,5 +1,4 @@
-
@@ -18,7 +17,6 @@
-
@@ -71,4 +69,4 @@
-
\ No newline at end of file +
diff --git a/src/wizardfinish.html b/src/wizardfinish.html index 2c01ec22b..e593c430f 100644 --- a/src/wizardfinish.html +++ b/src/wizardfinish.html @@ -1,14 +1,8 @@
-
-
-

- ${LabelYoureDone} -

- +

${LabelYoureDone}

${WizardCompleted}

-
-
diff --git a/src/wizardlibrary.html b/src/wizardlibrary.html index 758a545cb..710bf5581 100644 --- a/src/wizardlibrary.html +++ b/src/wizardlibrary.html @@ -1,25 +1,24 @@
-
-
-
-

- ${HeaderSetupLibrary} -

+

${HeaderSetupLibrary}

-


- - + +
-
-
\ No newline at end of file +
diff --git a/src/wizardremoteaccess.html b/src/wizardremoteaccess.html index 98fe1b2d8..f0375a4e2 100644 --- a/src/wizardremoteaccess.html +++ b/src/wizardremoteaccess.html @@ -1,7 +1,5 @@
-
-

${HeaderConfigureRemoteAccess}

@@ -21,13 +19,17 @@
${LabelEnableAutomaticPortMapHelp}

-
- - + +
-
-
\ No newline at end of file + diff --git a/src/wizardsettings.html b/src/wizardsettings.html index 95e1d459f..cced04c5b 100644 --- a/src/wizardsettings.html +++ b/src/wizardsettings.html @@ -1,11 +1,8 @@
-
-

${HeaderPreferredMetadataLanguage}

-

${DefaultMetadataLangaugeDescription}

@@ -18,11 +15,17 @@
- - + +
-
\ No newline at end of file +
diff --git a/src/wizardstart.html b/src/wizardstart.html index 35fc1172d..1308fcb2e 100644 --- a/src/wizardstart.html +++ b/src/wizardstart.html @@ -1,14 +1,9 @@
-
-
-
-

- ${WelcomeToProject} -

+

${WelcomeToProject}

${ButtonQuickStartGuide} @@ -23,10 +18,12 @@
- +
-
diff --git a/src/wizarduser.html b/src/wizarduser.html index 26064d32f..0a943f81a 100644 --- a/src/wizarduser.html +++ b/src/wizarduser.html @@ -1,15 +1,9 @@
-
-
-
-

- ${TellUsAboutYourself} -

- +

${TellUsAboutYourself}

${UserProfilesIntro}


@@ -26,11 +20,16 @@
- - + +
-