From fdb13570d7f7b0ad71628467913cfeef2b38fdaf Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 21 Jul 2016 13:23:25 -0400 Subject: [PATCH] update components --- .../emby-webcomponents/.bower.json | 8 ++++---- .../emby-webcomponents/dialog/dialog.js | 4 ++-- .../dialoghelper/dialoghelper.css | 17 +++++++++++++---- .../emby-webcomponents/listview/listview.css | 11 ++++++++--- .../emby-webcomponents/strings/en-US.json | 6 +++--- .../subtitleeditor/subtitleeditor.js | 6 +++--- .../components/channelmapper/channelmapper.js | 2 +- 7 files changed, 34 insertions(+), 20 deletions(-) diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index fe6262f98c..339f527baf 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -15,12 +15,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.4.110", - "_release": "1.4.110", + "version": "1.4.112", + "_release": "1.4.112", "_resolution": { "type": "version", - "tag": "1.4.110", - "commit": "fec7da49cf36f8177347d4ad14e443db644dc7f5" + "tag": "1.4.112", + "commit": "3dcd3f9498f9c9963f5d195179b3ae0f85a1e909" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.0", diff --git a/dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.js b/dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.js index 2727206950..0b5b4295c8 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.js +++ b/dashboard-ui/bower_components/emby-webcomponents/dialog/dialog.js @@ -52,12 +52,12 @@ define(['layoutManager', 'globalize'], function (layoutManager, globalize) { if (options.title) { html += '

' + options.title + '

'; - } + } var text = options.html || options.text; if (text) { - html += '
' + text + '
'; + html += '
' + text + '
'; } html += '
'; diff --git a/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.css b/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.css index 6ad6be829a..5da7ccfd8d 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.css +++ b/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.css @@ -3,7 +3,6 @@ border-radius: 1px; z-index: 999999 !important; position: fixed; - margin: 24px 40px; -webkit-font-smoothing: antialiased; box-shadow: 0 16px 24px 2px rgba(0, 0, 0, 0.14), 0 6px 30px 5px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.4); height: auto; @@ -71,9 +70,8 @@ .dialog .buttons { position: relative; - padding: 8px 8px 8px 24px; - margin: 0; - color: #3f51b5; + padding: 0; + margin: 1em; display: -ms-flexbox; display: -webkit-flex; display: flex; @@ -85,6 +83,17 @@ justify-content: flex-end; } + .dialog .buttons button { + color: #52B54B; + padding: 0.35em 1em; + margin: 0; + } + + .dialog .buttons button:focus { + color: #fff; + background-color: #52B54B; + } + .dialogBackdrop { background-color: #000; opacity: 0; diff --git a/dashboard-ui/bower_components/emby-webcomponents/listview/listview.css b/dashboard-ui/bower_components/emby-webcomponents/listview/listview.css index 17a59f638c..66379aa57a 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/listview/listview.css +++ b/dashboard-ui/bower_components/emby-webcomponents/listview/listview.css @@ -102,11 +102,16 @@ div.listItem { } .listItemIcon { - width: 3vh; - height: 3vh; - font-size: 3vh; + width: auto !important; + height: auto !important; + font-size: 120%; + border-radius: 500px; + background-color: #52B54B; + padding: .5em; + color: #fff; } + .listItem.largeImage .listItemImage { width: 45vh; height: 30vh; diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json b/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json index 1f3bff351e..0fa6cf349c 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json @@ -118,9 +118,9 @@ "RemoveFromPlaylist": "Remove from playlist", "RemoveFromCollection": "Remove from collection", "Trailer": "Trailer", - "MarkPlayed": "Mark Played", - "MarkUnplayed": "Mark Unplayed", - "GroupVersions": "Group Versions", + "MarkPlayed": "Mark played", + "MarkUnplayed": "Mark unplayed", + "GroupVersions": "Group versions", "PleaseSelectTwoItems": "Please select at least two items.", "TheSelectedItemsWillBeGrouped": "The selected videos will be grouped into one virtual item. Emby apps will automatically choose which version to play based on device and network performance. Are you sure you wish to continue?", "TryMultiSelect": "Try Multi-Select", diff --git a/dashboard-ui/bower_components/emby-webcomponents/subtitleeditor/subtitleeditor.js b/dashboard-ui/bower_components/emby-webcomponents/subtitleeditor/subtitleeditor.js index f099a76d8e..d202d5dc62 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/subtitleeditor/subtitleeditor.js +++ b/dashboard-ui/bower_components/emby-webcomponents/subtitleeditor/subtitleeditor.js @@ -125,9 +125,9 @@ itemHtml += '
'; - itemHtml += '

'; + itemHtml += '
'; itemHtml += s.DisplayTitle || ''; - itemHtml += '

'; + itemHtml += '
'; if (s.Path) { itemHtml += '
' + (s.Path) + '
'; @@ -241,7 +241,7 @@ //html += ''; - html += '

' + (result.Name) + '

'; + html += '
' + (result.Name) + '
'; html += '
' + (result.Format) + '
'; if (result.Comment) { diff --git a/dashboard-ui/components/channelmapper/channelmapper.js b/dashboard-ui/components/channelmapper/channelmapper.js index 430c964af8..5b559e14a3 100644 --- a/dashboard-ui/components/channelmapper/channelmapper.js +++ b/dashboard-ui/components/channelmapper/channelmapper.js @@ -95,7 +95,7 @@ function (dialogHelper, loading, connectionManager, globalize, actionsheet) { html += '
'; - html += ''; + html += 'dvr'; html += '
'; html += '

';