From f40d1013b0bcaf6fd2f5b50a5314be25647d6012 Mon Sep 17 00:00:00 2001 From: Keivan Beigi Date: Tue, 25 Jun 2013 17:33:17 -0700 Subject: [PATCH] less cleanup. --- Gruntfile.js | 29 +- UI/Content/Backgrid/backgrid.less | 2 + UI/Content/Backgrid/filter.less | 11 + UI/Content/Backgrid/paginator.less | 48 ++ UI/Content/Overrides/bootstrap.less | 9 + UI/Content/Overrides/browser.less | 12 + UI/Content/Overrides/overrides.less | 2 + UI/Content/backbone.backgrid.filter.css | 19 - UI/Content/backbone.backgrid.paginator.less | 45 -- UI/Content/base.less | 46 +- UI/Content/bootstrap.slider.css | 155 ----- UI/Content/form.less | 46 +- UI/Content/fullcalendar.css | 5 +- UI/Content/overrides.less | 0 UI/Content/theme.less | 675 ++------------------ UI/Index.html | 15 +- UI/Series/details.less | 43 -- UI/Series/series.less | 43 ++ UI/Settings/Quality/quality.less | 2 +- UI/Settings/settings.less | 3 + UI/app.js | 1 - 21 files changed, 224 insertions(+), 987 deletions(-) create mode 100644 UI/Content/Backgrid/backgrid.less create mode 100644 UI/Content/Backgrid/filter.less create mode 100644 UI/Content/Backgrid/paginator.less create mode 100644 UI/Content/Overrides/bootstrap.less create mode 100644 UI/Content/Overrides/browser.less create mode 100644 UI/Content/Overrides/overrides.less delete mode 100644 UI/Content/backbone.backgrid.filter.css delete mode 100644 UI/Content/backbone.backgrid.paginator.less delete mode 100644 UI/Content/bootstrap.slider.css create mode 100644 UI/Content/overrides.less delete mode 100644 UI/Series/details.less create mode 100644 UI/Settings/settings.less diff --git a/Gruntfile.js b/Gruntfile.js index 8c92d9f2e..a61000073 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -33,25 +33,7 @@ module.exports = function (grunt) { 'UI/Content/Messenger/messenger.css' : 'http://raw.github.com/HubSpot/messenger/master/build/css/messenger.css', 'UI/Content/Messenger/messenger.future.css' : 'http://raw.github.com/HubSpot/messenger/master/build/css/messenger-theme-future.css', - 'UI/Content/bootstrap.toggle-switch.css' : 'http://raw.github.com/ghinda/css-toggle-switch/gh-pages/toggle-switch.css', - - /* - 'UI/Content/FontAwesome/fontawesome.otf' : 'http://github.com/FortAwesome/Font-Awesome/blob/master/build/assets/font-awesome/font/FontAwesome.otf?raw=true', - 'UI/Content/FontAwesome/fontawesome-webfont.eot' : 'http://github.com/FortAwesome/Font-Awesome/blob/master/build/assets/font-awesome/font/fontawesome-webfont.eot?raw=true', - 'UI/Content/FontAwesome/fontawesome-webfont.svg' : 'http://github.com/FortAwesome/Font-Awesome/blob/master/build/assets/font-awesome/font/fontawesome-webfont.svg?raw=true', - 'UI/Content/FontAwesome/fontawesome-webfont.ttf' : 'http://github.com/FortAwesome/Font-Awesome/blob/master/build/assets/font-awesome/font/fontawesome-webfont.ttf?raw=true', - 'UI/Content/FontAwesome/fontawesome-webfont.woff': 'http://github.com/FortAwesome/Font-Awesome/blob/master/build/assets/font-awesome/font/fontawesome-webfont.woff?raw=true', - - 'UI/Content/FontAwesome/bootstrap.less' : 'http://raw.github.com/FortAwesome/Font-Awesome/master/build/assets/font-awesome/less/bootstrap.less', - 'UI/Content/FontAwesome/core.less' : 'http://raw.github.com/FortAwesome/Font-Awesome/master/build/assets/font-awesome/less/core.less', - 'UI/Content/FontAwesome/extras.less' : 'http://raw.github.com/FortAwesome/Font-Awesome/master/build/assets/font-awesome/less/extras.less', - 'UI/Content/FontAwesome/font-awesome-ie7.less' : 'http://raw.github.com/FortAwesome/Font-Awesome/master/build/assets/font-awesome/less/font-awesome-ie7.less', - 'UI/Content/FontAwesome/font-awesome.less' : 'http://raw.github.com/FortAwesome/Font-Awesome/master/build/assets/font-awesome/less/font-awesome.less', - 'UI/Content/FontAwesome/icons.less' : 'http://raw.github.com/FortAwesome/Font-Awesome/master/build/assets/font-awesome/less/icons.less', - 'UI/Content/FontAwesome/mixins.less' : 'http://raw.github.com/FortAwesome/Font-Awesome/master/build/assets/font-awesome/less/mixins.less', - 'UI/Content/FontAwesome/path.less' : 'http://raw.github.com/FortAwesome/Font-Awesome/master/build/assets/font-awesome/less/path.less', - 'UI/Content/FontAwesome/variables.less' : 'http://raw.github.com/FortAwesome/Font-Awesome/master/build/assets/font-awesome/less/variables.less' - */ + 'UI/Content/bootstrap.toggle-switch.css' : 'http://raw.github.com/ghinda/css-toggle-switch/gh-pages/toggle-switch.css' }, clean: { @@ -67,7 +49,14 @@ module.exports = function (grunt) { files: [ { expand: true, - src : ['UI/**/*.less', '!**/Bootstrap/**','!**/FontAwesome/**'], + src : [ + 'UI/Content/base.less', + 'UI/Series/Series.less', + 'UI/AddSeries/addSeries.less', + 'UI/Calendar/calendar.less', + 'UI/Cells/cells.less', + 'UI/Settings/settings.less', + ], dest : '_output/', ext : '.css' } diff --git a/UI/Content/Backgrid/backgrid.less b/UI/Content/Backgrid/backgrid.less new file mode 100644 index 000000000..969597665 --- /dev/null +++ b/UI/Content/Backgrid/backgrid.less @@ -0,0 +1,2 @@ +@import "filter"; +@import "paginator"; diff --git a/UI/Content/Backgrid/filter.less b/UI/Content/Backgrid/filter.less new file mode 100644 index 000000000..84313310a --- /dev/null +++ b/UI/Content/Backgrid/filter.less @@ -0,0 +1,11 @@ +.backgrid-filter .close { + display : inline-block; + float : none; + width : 20px; + height : 20px; + margin-top : -4px; + font-size : 20px; + line-height : 20px; + text-align : center; + vertical-align : text-top; +} diff --git a/UI/Content/Backgrid/paginator.less b/UI/Content/Backgrid/paginator.less new file mode 100644 index 000000000..84470e588 --- /dev/null +++ b/UI/Content/Backgrid/paginator.less @@ -0,0 +1,48 @@ +.backgrid-paginator { + text-align : center; + -webkit-box-sizing : border-box; + -moz-box-sizing : border-box; + box-sizing : border-box; + border-top : none; + -webkit-border-radius : 0 0 4px 4px; + -moz-border-radius : 0 0 4px 4px; + border-radius : 0 0 4px 4px; + + + + + ul { + display : inline-block; + *display : inline; + margin : 5px 0; + *zoom : 1; + + li { + display : inline; + + i, span { + float : left; + width : 30px; + height : 30px; + padding : 0; + line-height : 30px; + text-decoration : none; + } + } + + .active { + i, span { + background-color : #f5f5f5; + color : #999999; + cursor : default; + } + } + + .disabled { + i, span { + color : #999999; + cursor : default; + } + } + } +} diff --git a/UI/Content/Overrides/bootstrap.less b/UI/Content/Overrides/bootstrap.less new file mode 100644 index 000000000..b349f9ed4 --- /dev/null +++ b/UI/Content/Overrides/bootstrap.less @@ -0,0 +1,9 @@ +.label, .badge { + cursor : default; +} + +.input-append { + .add-on { + margin-left : 0; + } +} diff --git a/UI/Content/Overrides/browser.less b/UI/Content/Overrides/browser.less new file mode 100644 index 000000000..9ce4896b2 --- /dev/null +++ b/UI/Content/Overrides/browser.less @@ -0,0 +1,12 @@ +html { + overflow : -moz-scrollbars-vertical; + overflow-y : scroll; +} + +button::-moz-focus-inner, a::-moz-focus-inner { + border : 0; +} + +a:focus { + outline : none; +} diff --git a/UI/Content/Overrides/overrides.less b/UI/Content/Overrides/overrides.less new file mode 100644 index 000000000..d10bd1ce7 --- /dev/null +++ b/UI/Content/Overrides/overrides.less @@ -0,0 +1,2 @@ +@import "bootstrap"; +@import "browser"; diff --git a/UI/Content/backbone.backgrid.filter.css b/UI/Content/backbone.backgrid.filter.css deleted file mode 100644 index 4f9388529..000000000 --- a/UI/Content/backbone.backgrid.filter.css +++ /dev/null @@ -1,19 +0,0 @@ -/* -backgrid-filter -http://github.com/wyuenho/backgrid - -Copyright (c) 2013 Jimmy Yuen Ho Wong and contributors -Licensed under the MIT @license. -*/ - -.backgrid-filter .close { - display: inline-block; - float: none; - width: 20px; - height: 20px; - margin-top: -4px; - font-size: 20px; - line-height: 20px; - text-align: center; - vertical-align: text-top; -} \ No newline at end of file diff --git a/UI/Content/backbone.backgrid.paginator.less b/UI/Content/backbone.backgrid.paginator.less deleted file mode 100644 index 2ad0a609c..000000000 --- a/UI/Content/backbone.backgrid.paginator.less +++ /dev/null @@ -1,45 +0,0 @@ -.backgrid-paginator { - text-align: center; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - border-top: none; - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; - - ul { - display: inline-block; - *display: inline; - margin: 5px 0; - *zoom: 1; - - li { - display: inline; - - i, span { - float: left; - width: 30px; - height: 30px; - padding: 0; - line-height: 30px; - text-decoration: none; - } - } - - .active { - i, span { - background-color: #f5f5f5; - color: #999999; - cursor: default; - } - } - - .disabled { - i, span { - color: #999999; - cursor: default; - } - } - } -} \ No newline at end of file diff --git a/UI/Content/base.less b/UI/Content/base.less index 977982281..9f6babd43 100644 --- a/UI/Content/base.less +++ b/UI/Content/base.less @@ -1,6 +1,12 @@ @import "bootstrap/variables"; @import "bootstrap/mixins"; @import "bootstrap/type"; +@import "Overrides/overrides"; +@import "font"; +@import "form"; +@import "theme"; +@import "menu"; +@import "backgrid/backgrid"; @import "../shared/styles/clickable"; .progress { @@ -32,16 +38,6 @@ box-shadow : none; } -html { - overflow : -moz-scrollbars-vertical; - overflow-y : scroll; -} - -.input-append { - .add-on { - margin-left : 0; - } -} .line &>[class^="icon-"], .line &>[class*=" icon-"] { margin-top : 1em; @@ -58,18 +54,6 @@ html { font-size : 13px; } -#notification-region { - pre { - font-size : 12px; - } - .alert { - margin : 10px; - } - i { - padding-right : 10px; - } -} - .nz-loading { .text-center; font-size : 40px; @@ -92,25 +76,14 @@ html { min-height : 600px; } -button::-moz-focus-inner, a::-moz-focus-inner { - border : 0; -} - -a:focus { - outline : none; -} - -.label, .badge { - cursor : default; -} - #scroll-up { + .clickable; + &:hover { text-decoration : none; - opacity : 0.4; + opacity : 0.4; } - .clickable; opacity : 0.2; position : fixed; bottom : 50px; @@ -118,5 +91,4 @@ a:focus { display : none; font-size : 56px; color : white; - } diff --git a/UI/Content/bootstrap.slider.css b/UI/Content/bootstrap.slider.css deleted file mode 100644 index e78385ae5..000000000 --- a/UI/Content/bootstrap.slider.css +++ /dev/null @@ -1,155 +0,0 @@ -/*! - * Slider for Bootstrap - * - * Copyright 2012 Stefan Petre - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - */ -.slider { - display: inline-block; - vertical-align: middle; - position: relative; -} - -.slider.slider-horizontal { - width: 210px; - height: 20px; -} - -.slider.slider-horizontal .slider-track { - height: 10px; - width: 100%; - margin-top: -5px; - top: 50%; - left: 0; -} - -.slider.slider-horizontal .slider-selection { - height: 100%; - top: 0; - bottom: 0; -} - -.slider.slider-horizontal .slider-handle { - margin-left: -10px; - margin-top: -5px; -} - -.slider.slider-horizontal .slider-handle.triangle { - border-width: 0 10px 10px 10px; - width: 0; - height: 0; - border-bottom-color: #0480be; - margin-top: 0; -} - -.slider.slider-vertical { - height: 210px; - width: 20px; -} - -.slider.slider-vertical .slider-track { - width: 10px; - height: 100%; - margin-left: -5px; - left: 50%; - top: 0; -} - -.slider.slider-vertical .slider-selection { - width: 100%; - left: 0; - top: 0; - bottom: 0; -} - -.slider.slider-vertical .slider-handle { - margin-left: -5px; - margin-top: -10px; -} - -.slider.slider-vertical .slider-handle.triangle { - border-width: 10px 0 10px 10px; - width: 1px; - height: 1px; - border-left-color: #0480be; - margin-left: 0; -} - -.slider input { - display: none; -} - -.slider .tooltip-inner { - white-space: nowrap; -} - -.slider-track { - position: absolute; - cursor: pointer; - background-color: #f7f7f7; - background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.slider-selection { - position: absolute; - background-color: #bababa; - background-image: -moz-linear-gradient(top, #f9f9f9, #bababa); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f9f9f9), to(#bababa)); - background-image: -webkit-linear-gradient(top, #f9f9f9, #bababa); - background-image: -o-linear-gradient(top, #f9f9f9, #bababa); - background-image: linear-gradient(to bottom, #f9f9f9, #bababa); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9f9f9', endColorstr='#fff5f5f5', GradientType=0); - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} - -.slider-handle { - position: absolute; - width: 20px; - height: 20px; - background-color: #3a87ad; - background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); - background-image: -webkit-linear-gradient(top, #149bdf, #0480be); - background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(to bottom, #149bdf, #0480be); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .2), 0 1px 2px rgba(0, 0, 0, .05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .2), 0 1px 2px rgba(0, 0, 0, .05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, .2), 0 1px 2px rgba(0, 0, 0, .05); - /*opacity: 0.8;*/ - border: 0px solid transparent; -} - -.slider-handle.round { - -webkit-border-radius: 20px; - -moz-border-radius: 20px; - border-radius: 20px; -} - -.slider-handle.triangle { - background: transparent none; -} \ No newline at end of file diff --git a/UI/Content/form.less b/UI/Content/form.less index e6569d70b..8ca4c3c03 100644 --- a/UI/Content/form.less +++ b/UI/Content/form.less @@ -1,50 +1,42 @@ .control-group { .controls { i.danger { - color: #b94a48; + color : #b94a48; } i.warning { - color: #f89406; + color : #f89406; } i { - font-size: 16px; - color: #595959; - cursor: default; + font-size : 16px; + color : #595959; + cursor : default; } .checkbox { - width: 100px; - margin-left: 0px; - display: inline-block; - padding-top: 0px; - margin-bottom: 0px; + width : 100px; + margin-left : 0px; + display : inline-block; + padding-top : 0px; + margin-bottom : 0px; } - - - - - - .help-inline-checkbox { - padding-left: 5px; - display: inline-block; - margin-top: -20px; - margin-bottom: 0; - vertical-align: middle; + padding-left : 5px; + display : inline-block; + margin-top : -20px; + margin-bottom : 0; + vertical-align : middle; } } } .text-area-help { - display: block; - color: #777777; - font-size: 12px; + display : block; + color : #777777; + font-size : 12px; } - - textarea.nzb-restrictions { - width: 260px; + width : 260px; } diff --git a/UI/Content/fullcalendar.css b/UI/Content/fullcalendar.css index ff8749c8e..b7a226d74 100644 --- a/UI/Content/fullcalendar.css +++ b/UI/Content/fullcalendar.css @@ -232,9 +232,8 @@ html .fc, .fc-state-down, .fc-state-active { - background-color: #cccccc; - background-image: none; - outline: 0; + background : #cccccc none; + outline: 0; box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); } diff --git a/UI/Content/overrides.less b/UI/Content/overrides.less new file mode 100644 index 000000000..e69de29bb diff --git a/UI/Content/theme.less b/UI/Content/theme.less index 53218330e..def64d0d8 100644 --- a/UI/Content/theme.less +++ b/UI/Content/theme.less @@ -1,679 +1,108 @@ -.settings-group { - margin-top: 40px; -} - -.tag:hover { - background-color: #008dcd; - color: #ffffff; - text-decoration: none; -} - -.panel .danger, .panel .danger h6 { - background-color: #ea494a; -} - -#in-nav { - background-color: white; - background-repeat: repeat; - height: 50px; - padding-top: 10px; - ul { - position: relative; - top: 10px; - li { - list-style-type: none; - display: inline; - a { - padding: 10px; - } - } - } -} - -.panel .success, .panel .success h6 { - background-color: #4cb158; -} - -.panel .warning, .panel .warning h6 { - background-color: #ffa93c; -} - -.panel { - width: 150px; - background-color: #eeeeee; - border-radius: 6px; - text-align: center; - display: inline-block; - margin-bottom: 20px; - margin-right: 20px; - .bottom { - padding-top: 20px; - border-bottom-left-radius: 6px; - border-bottom-right-radius: 6px; - text-align: center; - border-top: none; - h6 { - font-size: 0.7em; - font-weight: 600; - position: relative; - bottom: 10px; - color: #555555; - } - h2 { - font-weight: 600; - margin: 0; - } - } - .top { - border-top-left-radius: 6px; - border-top-right-radius: 6px; - background-color: #555555; - padding-top: 20px; - h6 { - display: inline; - background-color: #555555; - position: relative; - top: 5px; - padding: 6px 12px; - border-radius: 30px; - color: #ffffff; - font-weight: 600; - font-size: 0.7em; - } - i { - display: block; - margin: 0px auto 20px; - } - } -} - -.peity { - margin-bottom: 20px; - h4 { - display: inline-block; - font-weight: 600; - min-width: 30px; - margin: 0; - } - canvas { - margin-right: 10px; - } - h4.sub { - font-weight: 300; - color: #999999; - } -} - -.star { - background-position: -192px -96px; -} - -.small-divide { - border-top: 1px solid #eeeeee; - margin-top: 20px; - padding-top: 20px; -} - -body { - background-color: #1c1c1c; - background-image: url('../content/images/pattern.png'); - margin-bottom: 100px; - p.sub { - color: #999999; - } +body { + background-color : #1c1c1c; + background-image : url('../content/images/pattern.png'); + margin-bottom : 100px; p { - font-size: 0.9em; - } -} - -.popover { - width: 276px; -} - -.tag { - display: inline-block; - background-color: #eeeeee; - padding: 3px 8px; - margin-right: 5px; - margin-bottom: 5px; - border-radius: 4px; -} - -.profile-sidebar { - ul { - margin: 0; - margin-top: 20px; - li { - list-style-type: none; - border-top: 1px solid #eeeeee; - padding: 10px 0px; - i { - margin-right: 5px; - } - } - } -} - -.table-panel { - table { - border-top: 1px solid #eeeeee; - } - i { - margin: 4px; + font-size : 0.9em; } } -.progress-small { - height: 8px; -} .calendar { - background-position: -160px -128px; -} - -.quill { - background-position: -288px 0px; -} - -.stream { - background-position: 0 -64px; - .item { - border-bottom: 1px solid #eeeeee; - padding: 10px 0px 30px 60px; - h4 { - margin-bottom: 6px; - } - p.date { - padding: 0; - float: right; - margin-top: 10px; - } - .stream-danger { - background-color: #ea494a; - } - p { - color: #777777; - } - .stream-info { - background-color: #14b8d4; - } - .stream-success { - background-color: #4cb158; - } - .stream-icon { - display: inline-block; - background-color: #cccccc; - border-radius: 4px; - height: 40px; - width: 40px; - text-align: center; - margin-left: -40px; - margin-bottom: -40px; - position: relative; - top: 15px; - right: 20px; - float: left; - i { - margin-top: 12px; - } - } - .avatar { - border-radius: 4px; - margin-left: -40px; - margin-bottom: -40px; - height: 40px; - position: relative; - top: 15px; - right: 20px; - float: left; - } - .stream-warning { - background-color: #ffa93c; - } - } -} - -.forms { - background-position: -96px -32px; -} - -.filters { - h5 { - margin-top: 20px; - padding-bottom: 5px; - border-bottom: 1px solid #eeeeee; - } - input[type="checkbox"] { - float: left; - margin-right: 10px; - } - span { - color: #999999; - } + background-position : -160px -128px; } .panel .primary, .panel .primary h6 { - background-color: #007ccd; + background-color : #007ccd; } .panel .info, .panel .info h6 { - background-color: #14b8d4; -} - -.spark { - margin-bottom: 20px; - h4 { - font-weight: 500; - } - .sparklines { - float: right; - } - h4.sub { - color: #999999; - font-weight: 300; - span.minus { - color: #ea494a; - float: right; - } - span.plus { - color: #4cb158; - float: right; - } - } -} - -.widget td.bar-number, .widget td.bar-percent { - width: 15%; - font-weight: 600; -} - -ul.stat-list { - margin: 0; - li { - list-style-type: none; - label { - height: 32px; - width: 32px; - border-radius: 2px; - text-align: center; - vertical-align: middle; - margin-right: 10px; - i { - margin-top: 8px; - } - } - h4 { - font-weight: 600; - margin-right: 10px; - min-width: 30px; - } - h4.sub { - color: #999999; - font-weight: 300; - } - } -} - -.messages { - h4 { - text-transform: none; - font-weight: 400; - } - .message-body { - padding-left: 80px; - textarea { - height: 80px; - margin-right: 20px; - width: 96%; - } - } - .message { - padding-bottom: 20px; - border-bottom: 1px solid #eeeeee; - margin-bottom: 20px; - h5 { - font-weight: 300; - } - } + background-color : #14b8d4; } .message-sidebar a.message-preview p, .message-sidebar a.message-preview h5 { - color: #999999; -} - -.b-alarm { - background-position: -384px 0px; -} - -.users { - background-position: 0 -96px; -} - -.home { - background-position: -128px -96px; -} - -.no-star { - background-position: 0 -16px; -} - -.sidebar { - border-top: 1px solid #eeeeee; - ul { - padding: 0; - margin: 0; - li { - list-style-type: none; - ul { - background-color: #f6f6f6; - box-shadow: inset 0 1px 10px #e0e0e0; - } - a { - display: block; - padding: 10px; - border-bottom: 1px solid #eeeeee; - text-transform: uppercase; - } - a:hover { - background-color: #eeeeee; - text-decoration: none; - } - } - } -} - -.login { - padding: 20px; - margin-top: 40px; - margin-bottom: 80px; -} - -.b-wifi { - background-position: -256px -64px; -} - -.plane { - background-position: -256px -96px; -} - -.batch { - background-image: url(images/white-batch-32.png); - display: inline-block; - height: 32px; - width: 32px; -} - -.b-code { - background-position: -64px 0px; -} - -.widget { - background-color: #eeeeee; - color: #555555; - padding: 20px; - border-radius: 6px; - margin-bottom: 20px; - td.bar-percent { - span { - font-weight: 300; - } - } - td { - .progress { - margin-top: 10px; - margin-bottom: 10px; - border-radius: 4px; - display: block; - width: 100%; - height: 8px; - overflow: hidden; - } - } - td.bar-label { - width: 20%; - text-align: right; - padding-right: 20px; - color: #999999; - font-weight: 300; - } + color : #999999; } ul.stat-list li label, ul.stat-list li h4, ul.stat-list li small, ul.stat-list li p { - display: inline-block; -} - -.b-flag { - background-position: -384px -256px; + display : inline-block; } footer { - font-size: 13px; - font-weight: lighter; - padding-top: 0px; - padding-bottom: 20px; - color: #999999; - margin: 0; - text-decoration: none; + font-size : 13px; + font-weight : lighter; + padding-top : 0px; + padding-bottom : 20px; + color : #999999; + margin : 0; + text-decoration : none; a { - color: #999999; - text-decoration: underline; + color : #999999; + text-decoration : underline; } p { - margin-bottom: 0px; + margin-bottom : 0px; } } .popover-title { - text-transform: none; -} - -.qa { - border-bottom: 1px solid #eeeeee; - padding-bottom: 20px; - margin-bottom: 20px; - margin-top: 20px; - h4 { - text-transform: none; - font-weight: 400; - } -} - -.panel .purple, .panel .purple h6 { - background-color: #7932ea; -} - -.knob { - text-align: center; + text-transform : none; } .message-sidebar a.active p, .message-sidebar a.active h5 { - color: rgba(255, 255, 255, 0.8); -} - -.b-comment { - background-position: -192px -256px; + color : rgba(255, 255, 255, 0.8); } #in-sub-nav li a:hover, #in-sub-nav li a.active { - background-color: #555555; - text-decoration: none; + background-color : #555555; + text-decoration : none; } body h1, body h2, body h3, body h4, body h5, body h6 { - text-transform: capitalize; - font-weight: 300; -} - -.b-database { - background-position: -256px 0px; -} - -.batch-big { - background-image: url(images/white-batch-64.png); - display: inline-block; - height: 64px; - width: 64px; -} - -.divide { - border-top: 1px solid #eeeeee; - margin-top: 40px; - padding-top: 40px; + text-transform : capitalize; + font-weight : 300; } .page { - width: 1210px; - min-width: 1210px; - margin: auto; - background-color: #ffffff; - border-radius: 6px; - margin-top: -70px; - padding: 20px 0px; - box-shadow: 0 0 6px rgba(0, 0, 0, 0.1); + width : 1210px; + min-width : 1210px; + margin : auto; + background-color : #ffffff; + border-radius : 6px; + margin-top : -70px; + padding : 20px 0px; + box-shadow : 0 0 6px rgba(0, 0, 0, 0.1); .header { - padding-bottom: 10px; - margin-bottom: 20px; - border-bottom: 1px solid #eeeeee; - } -} - -#events { - .load-more { - text-align: center; - overflow: auto; - height: 600px; - } -} - -.half-star { - background-position: 0 -32px; -} - -.rating-star, .no-star, .half-star { - display: inline-block; - height: 16px; - width: 16px; - background-image: url(../img/stars.png); -} - -.stats { - text-align: center; - .primary { - background-color: #007ccd; - color: #ffffff; - } - .info { - background-color: #14b8d4; - color: #ffffff; - } - .inverse { - background-color: #333333; - color: #ffffff; - } - .stat { - background-color: #eeeeee; - color: #555555; - padding: 10px; - border-radius: 6px; - margin-bottom: 20px; - text-align: center; - h6 { - margin-top: -10px; - } - h2 { - font-weight: 600; - } - } - .warning { - background-color: #ffa93c; - color: #ffffff; - } - .danger { - background-color: #ea494a; - color: #ffffff; - } - .purple { - background-color: #7932ea; - color: #ffffff; - } - .success { - background-color: #4cb158; - color: #ffffff; - } -} - -.message-sidebar { - border-right: 1px solid #eeeeee; - margin: -20px; - margin-right: 0; - overflow: auto; - height: 700px; - a:hover { - text-decoration: none; - cursor: pointer; - } - a.message-preview { - display: block; - background-color: #f6f6f6; - border-bottom: 1px solid #eeeeee; - padding: 10px 20px; - h4 { - font-weight: 400; - text-transform: none; - } - } - .load-more { - text-align: center; - a { - padding: 20px; - display: block; - } - } - a.active { - background-color: #008dcd; - color: #ffffff; - } - a.new { - background-color: #ffffff; - } -} - -.settings { - background-position: -288px -128px; -} - -.tables { - background-position: -32px -32px; - code { - display: inline-block; - margin: 2px; + padding-bottom : 10px; + margin-bottom : 20px; + border-bottom : 1px solid #eeeeee; } } #in-sub-nav { ul { - text-align: center; - margin-bottom: 10px; + text-align : center; + margin-bottom : 10px; } li { - list-style-type: none; - display: inline-block; + list-style-type : none; + display : inline-block; a { - display: block; - border-radius: 6px; - padding: 15px 10px 5px; - min-height: 56px; - min-width: 64px; - margin: 20px 10px 10px; - color: #ffffff; - font-weight: 100; + display : block; + border-radius : 6px; + padding : 15px 10px 5px; + min-height : 56px; + min-width : 64px; + margin : 20px 10px 10px; + color : #ffffff; + font-weight : 100; } span.label.pull-right { - position: relative; - top: 24px; - right: 14px; + position : relative; + top : 24px; + right : 14px; } } } diff --git a/UI/Index.html b/UI/Index.html index 44f7429a1..667e254f7 100644 --- a/UI/Index.html +++ b/UI/Index.html @@ -3,27 +3,16 @@ NzbDrone - - - - - + - - - - - - - - +
diff --git a/UI/Series/details.less b/UI/Series/details.less deleted file mode 100644 index 15f2996e7..000000000 --- a/UI/Series/details.less +++ /dev/null @@ -1,43 +0,0 @@ -@import "../shared/Styles/clickable.less"; - -.series-season { - .episode-number-cell { - width: 22px; - } - .episode-air-date-cell { - width: 150px; - } - - .episode-status-cell { - width: 100px; - } - - .episode-title-cell { - cursor: pointer; - } -} - -.episode-detail-modal { - - .episode-overview { - - font-style: italic; - } - - .episode-file-info { - - margin-top: 30px; - font-size: 12px; - } -} - -.season-grid { - .toggle-cell { - width: 10px; - } -} - -.season-search { - .clickable; - font-size: 24px; -} \ No newline at end of file diff --git a/UI/Series/series.less b/UI/Series/series.less index 7bc7f7e59..c14f38e9b 100644 --- a/UI/Series/series.less +++ b/UI/Series/series.less @@ -134,3 +134,46 @@ margin-bottom: 50px; } +@import "../shared/Styles/clickable.less"; + +.series-season { + .episode-number-cell { + width: 22px; + } + .episode-air-date-cell { + width: 150px; + } + + .episode-status-cell { + width: 100px; + } + + .episode-title-cell { + cursor: pointer; + } +} + +.episode-detail-modal { + + .episode-overview { + + font-style: italic; + } + + .episode-file-info { + + margin-top: 30px; + font-size: 12px; + } +} + +.season-grid { + .toggle-cell { + width: 10px; + } +} + +.season-search { + .clickable; + font-size: 24px; +} diff --git a/UI/Settings/Quality/quality.less b/UI/Settings/Quality/quality.less index b1030ab84..1c414d82c 100644 --- a/UI/Settings/Quality/quality.less +++ b/UI/Settings/Quality/quality.less @@ -55,4 +55,4 @@ #quality-size { overflow: hidden; -} \ No newline at end of file +} diff --git a/UI/Settings/settings.less b/UI/Settings/settings.less new file mode 100644 index 000000000..fb74dba9c --- /dev/null +++ b/UI/Settings/settings.less @@ -0,0 +1,3 @@ +@import "Indexers/indexers"; +@import "Quality/quality"; +@import "Notifications/notifications"; diff --git a/UI/app.js b/UI/app.js index 33f8aca6a..fec403ed3 100644 --- a/UI/app.js +++ b/UI/app.js @@ -193,7 +193,6 @@ define( app.addRegions({ mainRegion : '#main-region', - notificationRegion: '#notification-region', modalRegion : ModalRegion, footerRegion : '#footer-region' });