diff --git a/src/UI/Activity/Blacklist/BlacklistLayout.js b/src/UI/Activity/Blacklist/BlacklistLayout.js index c6ca98dab..cc186a5b0 100644 --- a/src/UI/Activity/Blacklist/BlacklistLayout.js +++ b/src/UI/Activity/Blacklist/BlacklistLayout.js @@ -80,6 +80,7 @@ module.exports = Marionette.Layout.extend({ var leftSideButtons = { type : 'default', storeState : false, + collapse: true, items : [ { title : 'Clear Blacklist', diff --git a/src/UI/Content/Fonts/opensans-light.woff2 b/src/UI/Content/Fonts/opensans-light.woff2 new file mode 100644 index 000000000..57fd3f402 Binary files /dev/null and b/src/UI/Content/Fonts/opensans-light.woff2 differ diff --git a/src/UI/Content/Fonts/opensans-regular.woff2 b/src/UI/Content/Fonts/opensans-regular.woff2 new file mode 100644 index 000000000..e07a1700d Binary files /dev/null and b/src/UI/Content/Fonts/opensans-regular.woff2 differ diff --git a/src/UI/Content/Fonts/opensans-semibold.woff2 b/src/UI/Content/Fonts/opensans-semibold.woff2 new file mode 100644 index 000000000..c8572eb14 Binary files /dev/null and b/src/UI/Content/Fonts/opensans-semibold.woff2 differ diff --git a/src/UI/Content/Fonts/ubuntumono-regular.woff2 b/src/UI/Content/Fonts/ubuntumono-regular.woff2 new file mode 100644 index 000000000..42fed3dbc Binary files /dev/null and b/src/UI/Content/Fonts/ubuntumono-regular.woff2 differ diff --git a/src/UI/Content/Overrides/bootstrap.less b/src/UI/Content/Overrides/bootstrap.less index 9ec9eb3be..7d1fd4a91 100644 --- a/src/UI/Content/Overrides/bootstrap.less +++ b/src/UI/Content/Overrides/bootstrap.less @@ -80,3 +80,13 @@ .table-responsive { overflow-x: visible; } + +.navbar-nav { + margin-bottom : 20px; +} + +.navbar-brand { + @media (min-width: @screen-md-min) and (max-width: @screen-md-max) { + padding : 22px 15px !important; + } +} diff --git a/src/UI/Content/font.less b/src/UI/Content/font.less index f20b10dc1..8d249f781 100644 --- a/src/UI/Content/font.less +++ b/src/UI/Content/font.less @@ -6,6 +6,7 @@ src: local('Open Sans Light'), local('OpenSans-Light'), url('./fonts/opensans-light.eot?#iefix') format('embedded-opentype'), + url('./fonts/opensans-light.woff2') format('woff2'), url('./fonts/opensans-light.woff') format('woff'), url('./fonts/opensans-light.ttf') format('truetype'); } @@ -18,6 +19,7 @@ src: local('Open Sans'), local('OpenSans'), url('./fonts/opensans-regular.eot?#iefix') format('embedded-opentype'), + url('./fonts/opensans-regular.woff2') format('woff2'), url('./fonts/opensans-regular.woff') format('woff'), url('./fonts/opensans-regular.ttf') format('truetype') } @@ -30,6 +32,7 @@ src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), url('./fonts/opensans-semibold.eot?#iefix') format('embedded-opentype'), + url('./fonts/opensans-semibold.woff2') format('woff2'), url('./fonts/opensans-semibold.woff') format('woff'), url('./fonts/opensans-semibold.ttf') format('truetype') } @@ -39,9 +42,10 @@ font-style: normal; font-weight: 400; src: url('./fonts/ubuntumono-regular.eot'); - src: local('Open Sans'), - local('OpenSans'), + src: local('Ubuntu Mono'), + local('Ubuntu-Mono'), url('./fonts/ubuntumono-regular.eot?#iefix') format('embedded-opentype'), + url('./fonts/ubuntumono-regular.woff2') format('woff'), url('./fonts/ubuntumono-regular.woff') format('woff'), url('./fonts/ubuntumono-regular.ttf') format('truetype') -} \ No newline at end of file +} diff --git a/src/UI/Content/theme.less b/src/UI/Content/theme.less index ecc5e4962..ba2ef5b41 100644 --- a/src/UI/Content/theme.less +++ b/src/UI/Content/theme.less @@ -48,6 +48,16 @@ display : inline-block; } + @media (max-width: @screen-sm-max) { + .x-toolbar-left-1 { + display: block; + } + + .btn-group { + display: block; + } + } + .sorting-buttons { .sorting-title { display : inline-block; diff --git a/src/UI/Movies/Editor/MovieEditorLayout.js b/src/UI/Movies/Editor/MovieEditorLayout.js index 28d73c7ae..6c72eb481 100644 --- a/src/UI/Movies/Editor/MovieEditorLayout.js +++ b/src/UI/Movies/Editor/MovieEditorLayout.js @@ -97,16 +97,17 @@ module.exports = Marionette.Layout.extend({ this.leftSideButtons = { type : 'default', storeState : false, + collapse: true, items : [ { - title : 'Update Library', + title : 'Update library', icon : 'icon-sonarr-refresh', command : 'refreshmovie', successMessage : 'Library was updated!', errorMessage : 'Library update failed!' }, { - title : 'Delete Selected', + title : 'Delete selected', icon : 'icon-radarr-delete-white', className: 'btn-danger', callback : this._deleteSelected diff --git a/src/UI/Navbar/NavbarLayoutTemplate.hbs b/src/UI/Navbar/NavbarLayoutTemplate.hbs index 873887929..ec7221988 100644 --- a/src/UI/Navbar/NavbarLayoutTemplate.hbs +++ b/src/UI/Navbar/NavbarLayoutTemplate.hbs @@ -1,46 +1,81 @@