From f64c7b38183beda7b4bc6d54303ed470a3bf0d51 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 31 Jan 2015 18:11:54 -0500 Subject: [PATCH] update naming project --- dashboard-ui/addplugin.html | 5 +++-- dashboard-ui/css/materialize.css | 24 +++++++++++------------- dashboard-ui/css/site.css | 2 ++ dashboard-ui/scripts/livetvguide.js | 5 +---- dashboard-ui/supporter.html | 5 ++++- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dashboard-ui/addplugin.html b/dashboard-ui/addplugin.html index 3934fe020c..ad8dc1b3d8 100644 --- a/dashboard-ui/addplugin.html +++ b/dashboard-ui/addplugin.html @@ -70,8 +70,9 @@ - diff --git a/dashboard-ui/css/materialize.css b/dashboard-ui/css/materialize.css index 434872489a..f434d7a007 100644 --- a/dashboard-ui/css/materialize.css +++ b/dashboard-ui/css/materialize.css @@ -18,11 +18,10 @@ .btn, .btn-large, .btn-flat { display: block; padding: 0 2rem; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; background-clip: padding-box; - text-transform: uppercase; border: none; outline: 0; -webkit-tap-highlight-color: transparent; @@ -67,7 +66,6 @@ outline: 0; -webkit-tap-highlight-color: transparent; margin-bottom: 15px; - display: inline-block; position: relative; z-index: 1; @@ -129,9 +127,9 @@ font-size: 1.6rem; } - .btn-floating-large i { - font-size: 1.6rem; - } +.btn-floating-large i { + font-size: 1.6rem; +} .btn, .btn-large { @@ -163,12 +161,12 @@ .ui-page-theme-a .btnCancel { background-color: #e8e8e8; - color: #333!important; + color: #333 !important; } -.ui-page-theme-a .btnCancel i { - color: #666!important; -} + .ui-page-theme-a .btnCancel i { + color: #666 !important; + } .btn-inline { display: inline-block; @@ -176,7 +174,7 @@ margin-bottom: 0; } -button.btn:not(.btn-inline),button.btn-large:not(.btn-inline) { +button.btn:not(.btn-inline), button.btn-large:not(.btn-inline) { width: 100%; } diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 6b6a23a86a..b3614fadad 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -669,6 +669,8 @@ progress { width: auto !important; display: inline-block !important; background: none !important; + border: 0 !important; + outline: 0 !important; } .btnUserItemRating div { diff --git a/dashboard-ui/scripts/livetvguide.js b/dashboard-ui/scripts/livetvguide.js index 25ccf1988e..0931599205 100644 --- a/dashboard-ui/scripts/livetvguide.js +++ b/dashboard-ui/scripts/livetvguide.js @@ -531,10 +531,7 @@ $(this).off("popupafterclose").off("mouseenter").off("mouseleave").remove(); }); - LibraryBrowser.renderGenres($('.itemGenres', popup), { - Type: item.type, - Genres: item.Genres.splice(0, 3) - }, 'livetv'); + LibraryBrowser.renderGenres($('.itemGenres', popup), item, 'livetv'); LiveTvHelpers.renderMiscProgramInfo($('.miscTvProgramInfo', popup), item); popup.parents().prev('.ui-popup-screen').remove(); diff --git a/dashboard-ui/supporter.html b/dashboard-ui/supporter.html index 2bdb1153f6..1febebaa79 100644 --- a/dashboard-ui/supporter.html +++ b/dashboard-ui/supporter.html @@ -98,7 +98,10 @@ - +