From 71e5fb5346c6ceb6d09961de0b4eb4695b6911cd Mon Sep 17 00:00:00 2001 From: Ruud Date: Sat, 7 Apr 2012 19:30:55 +0200 Subject: [PATCH] Whitespace cleanup --- couchpotato/core/plugins/file/static/file.js | 4 +- couchpotato/core/plugins/log/static/log.css | 2 +- couchpotato/core/plugins/log/static/log.js | 8 +- couchpotato/core/plugins/movie/static/list.js | 2 +- couchpotato/core/plugins/movie/static/movie.css | 89 +++++++++-------- couchpotato/core/plugins/movie/static/search.css | 10 +- .../core/plugins/profile/static/profile.css | 30 +++--- .../core/plugins/quality/static/quality.css | 4 +- couchpotato/core/plugins/quality/static/quality.js | 2 +- couchpotato/core/plugins/status/static/status.js | 2 +- .../core/plugins/userscript/static/userscript.js | 2 +- couchpotato/core/plugins/wizard/static/wizard.css | 6 +- couchpotato/static/scripts/block.js | 8 +- couchpotato/static/scripts/page.js | 8 +- couchpotato/static/scripts/page/manage.js | 2 +- couchpotato/static/scripts/page/settings.js | 6 +- couchpotato/static/style/main.css | 68 ++++++------- couchpotato/static/style/page/settings.css | 109 ++++++++++----------- couchpotato/static/style/uniform.css | 44 ++++----- couchpotato/static/style/uniform.generic.css | 40 ++++---- 20 files changed, 222 insertions(+), 224 deletions(-) diff --git a/couchpotato/core/plugins/file/static/file.js b/couchpotato/core/plugins/file/static/file.js index 50458db..2093e2f 100644 --- a/couchpotato/core/plugins/file/static/file.js +++ b/couchpotato/core/plugins/file/static/file.js @@ -2,7 +2,7 @@ var File = new Class({ initialize: function(file){ var self = this; - + if(!file){ self.el = new Element('div'); return @@ -17,7 +17,7 @@ var File = new Class({ createImage: function(){ var self = this; - + var file_name = self.data.path.replace(/^.*[\\\/]/, ''); self.el = new Element('div', { diff --git a/couchpotato/core/plugins/log/static/log.css b/couchpotato/core/plugins/log/static/log.css index 01e9a86..ec1f838 100644 --- a/couchpotato/core/plugins/log/static/log.css +++ b/couchpotato/core/plugins/log/static/log.css @@ -60,6 +60,6 @@ color: lightgrey; padding: 3px 0; } - + .page.log .container .time:last-child { display: none; } diff --git a/couchpotato/core/plugins/log/static/log.js b/couchpotato/core/plugins/log/static/log.js index ff77282..1668ded 100644 --- a/couchpotato/core/plugins/log/static/log.js +++ b/couchpotato/core/plugins/log/static/log.js @@ -5,18 +5,18 @@ Page.Log = new Class({ name: 'log', title: 'Show recent logs.', has_tab: false, - + initialize: function(options){ var self = this; self.parent(options) - - + + App.getBlock('more').addLink(new Element('a', { 'href': App.createUrl(self.name), 'text': self.name.capitalize(), 'title': self.title })) - + }, indexAction: function(){ diff --git a/couchpotato/core/plugins/movie/static/list.js b/couchpotato/core/plugins/movie/static/list.js index 9ddffd9..d70db1f 100644 --- a/couchpotato/core/plugins/movie/static/list.js +++ b/couchpotato/core/plugins/movie/static/list.js @@ -200,7 +200,7 @@ var MovieList = new Class({ } }); - + // Add menu or hide if (self.options.menu.length > 0) self.options.menu.each(function(menu_item){ diff --git a/couchpotato/core/plugins/movie/static/movie.css b/couchpotato/core/plugins/movie/static/movie.css index b66d046..55dce2e 100644 --- a/couchpotato/core/plugins/movie/static/movie.css +++ b/couchpotato/core/plugins/movie/static/movie.css @@ -24,7 +24,7 @@ .movies .movie.list_view:hover, .movies .movie.mass_edit_view:hover { background: rgba(255,255,255,0.03); } - + .movies .data { padding: 20px; height: 180px; @@ -43,11 +43,11 @@ border: 0; background: none; } - + .movies .movie .check { display: none; } - + .movies.mass_edit_list .movie .check { float: left; display: block; @@ -62,21 +62,21 @@ height: 180px; border-radius: 4px 0 0 4px; transition: all 0.2s linear; - + } - .movies .list_view .poster, .movies .mass_edit_view .poster { + .movies .list_view .poster, .movies .mass_edit_view .poster { width: 20px; height: 30px; } .movies.mass_edit_list .poster { display: none; } - + .movies .poster img, .options .poster img { width: 101%; height: 101%; } - + .movies .info .title { font-size: 30px; font-weight: bold; @@ -91,7 +91,7 @@ text-overflow: ellipsis; width: 64%; } - + .movies .info .year { font-size: 30px; margin-bottom: 10px; @@ -105,7 +105,7 @@ font-size: 16px; width: 6%; } - + .movies .info .rating { font-size: 30px; margin-bottom: 10px; @@ -114,7 +114,7 @@ width: 5%; padding: 0 0 0 3%; } - + .movies .info .description { clear: both; height: 80px; @@ -126,13 +126,13 @@ .movies .list_view .info .description, .movies .mass_edit_view .info .description { display: none; } - + .movies .data .quality { display: block; min-height: 20px; vertical-align: mid; } - + .movies .data .quality span { padding: 2px 3px; font-weight: bold; @@ -154,39 +154,39 @@ float: right; width: 30%; } - + .movies .data .quality .available, .movies .data .quality .snatched { opacity: 1; box-shadow: 1px 1px 0 rgba(0,0,0,0.2); cursor: pointer; } - + .movies .data .quality .available { background-color: #578bc3; } .movies .data .quality .snatched { background-color: #369545; } .movies .data .quality .done { background-color: #369545; opacity: 1; } - .movies .data .quality .finish { + .movies .data .quality .finish { background-image: url('../images/sprite.png'); background-repeat: no-repeat; background-position: 0 2px; padding-left: 14px; background-size: 14px } - + .movies .data .actions { line-height: 0; clear: both; float: right; margin-top: -25px; } - .movies .data:hover .action { opacity: 0.6; } + .movies .data:hover .action { opacity: 0.6; } .movies .data:hover .action:hover { opacity: 1; } .movies.mass_edit_list .data .actions { display: none; } - + .movies .data .action { background-repeat: no-repeat; background-position: center; @@ -196,12 +196,12 @@ padding: 3px; opacity: 0; } - + .movies .list_view .data:hover .actions, .movies .mass_edit_view .data:hover .actions { margin: -34px 2px 0 0; background: #4e5969; } - + .movies .delete_container { clear: both; text-align: center; @@ -223,23 +223,23 @@ color: #fff; background-color: #d32917; } - + .movies .options { position: absolute; margin-left: 120px; width: 840px; } - + .movies .options .form { margin: 70px 20px 0; float: left; font-size: 20px; } - + .movies .options .form select { margin-right: 20px; } - + .movies .options .table { height: 180px; overflow: auto; @@ -255,15 +255,15 @@ .movies .options .table .item.ignored .delete { background-image: url('../images/icon.undo.png'); } - + .movies .options .table .item:last-child { border: 0; } - .movies .options .table .item:nth-child(even) { + .movies .options .table .item:nth-child(even) { background: rgba(255,255,255,0.05); } - .movies .options .table .item:not(.head):hover { + .movies .options .table .item:not(.head):hover { background: rgba(255,255,255,0.03); } - + .movies .options .table .item > * { display: inline-block; padding: 0 5px; @@ -290,7 +290,7 @@ .movies .options .table.files .name { width: 605px; } .movies .options .table .type { width: 130px; } .movies .options .table .is_available { width: 90px; } - + .movies .options .table a { width: 30px !important; height: 20px; @@ -307,7 +307,7 @@ padding-bottom: 4px; height: auto; } - + .movies .load_more { display: block; padding: 10px; @@ -363,14 +363,14 @@ .movies .alph_nav li.available { color: rgba(255,255,255,0.8); font-weight: bolder; - + } .movies .alph_nav li.active.available, .movies .alph_nav li.available:hover { color: #fff; font-size: 24px; line-height: 24px; } - + .movies .alph_nav input { padding: 6px 5px; margin: 0 0 0 6px; @@ -378,16 +378,16 @@ width: 155px; height: 25px; } - + .movies .alph_nav .actions { margin: 0 6px 0 0; -moz-user-select: none; } - .movies .alph_nav .actions li { + .movies .alph_nav .actions li { border-radius: 1px; width: auto; } - .movies .alph_nav .actions li.active { + .movies .alph_nav .actions li.active { background: none; border: 1px solid transparent; box-shadow: none; @@ -398,15 +398,15 @@ width: 25px; height: 100%; } - + .movies .alph_nav .actions li.mass_edit span { background-position: 3px 3px; } - + .movies .alph_nav .actions li.list span { background-position: 3px -95px; } - + .movies .alph_nav .actions li.thumbs span { background-position: 3px -74px; } @@ -417,7 +417,7 @@ .movies .alph_nav .actions li:last-child { border-radius: 0 3px 3px 0; } - + .movies .alph_nav .mass_edit_form { clear: both; text-align: center; @@ -439,7 +439,7 @@ font-weight: bold; margin: 0 3px 0 10px; } - + .movies .alph_nav .mass_edit_form .quality { float: left; padding: 8px 0 0; @@ -452,21 +452,20 @@ .movies .alph_nav .mass_edit_form .button { padding: 3px 7px; } - + .movies .alph_nav .mass_edit_form .delete { float: left; padding: 8px 0 0 8px; } - + .movies .alph_nav .mass_edit_form .delete span { margin: 0 10px 0 0; } - + .movies .alph_nav .more_menu { margin-left: 48px; } - + .movies .alph_nav .more_menu > a { background-position: center -157px; } - \ No newline at end of file diff --git a/couchpotato/core/plugins/movie/static/search.css b/couchpotato/core/plugins/movie/static/search.css index 2be6ce1..4f43ffe 100644 --- a/couchpotato/core/plugins/movie/static/search.css +++ b/couchpotato/core/plugins/movie/static/search.css @@ -14,7 +14,7 @@ .search_form input:focus { padding-right: 83px; } - + .search_form .input .enter { background: #369545 url('../images/sprite.png') right -188px no-repeat; padding: 0 20px 0 4px; @@ -36,7 +36,7 @@ .search_form.focused.filled .input .enter { opacity: 1; } - + .search_form .input a { width: 17px; height: 20px; @@ -50,7 +50,7 @@ transition: all 0.2s ease-in-out; vertical-align: middle; } - + .search_form.filled .input a { opacity: 1; } @@ -68,7 +68,7 @@ .search_form.shown.filled .results_container { display: block; } - + .search_form .results_container:before { content: ' '; height: 0; @@ -146,7 +146,7 @@ } .movie_result:last-child .data { border-bottom: 0; } - + .movie_result .in_wanted, .movie_result .in_library { position: absolute; margin-top: 105px; diff --git a/couchpotato/core/plugins/profile/static/profile.css b/couchpotato/core/plugins/profile/static/profile.css index b763cd8..9d50d2f 100644 --- a/couchpotato/core/plugins/profile/static/profile.css +++ b/couchpotato/core/plugins/profile/static/profile.css @@ -16,7 +16,7 @@ padding: 14px; background-position: center; } - + .profile .qualities { min-height: 80px; } @@ -40,36 +40,36 @@ .profile .wait_for input { margin: 0 5px !important; } - + .profile .types { padding: 0; margin: 0 20px 0 -4px; display: inline-block; } - + .profile .types li { padding: 3px 5px; border-bottom: 1px solid rgba(255,255,255,0.2); list-style: none; } .profile .types li:last-child { border: 0; } - + .profile .types li > * { display: inline-block; vertical-align: middle; line-height: 0; margin-right: 10px; } - + .profile .quality_type select { width: 186px; margin-left: -1px; } - + .profile .types li.is_empty .check, .profile .types li.is_empty .delete, .profile .types li.is_empty .handle { visibility: hidden; } - + .profile .types .type .handle { background: url('./handle.png') center; display: inline-block; @@ -80,7 +80,7 @@ cursor: -webkit-grab; margin: 0; } - + .profile .types .type .delete { background-position: left center; height: 20px; @@ -88,13 +88,13 @@ visibility: hidden; cursor: pointer; } - + .profile .types .type:hover:not(.is_empty) .delete { visibility: visible; } - + #profile_ordering { - + } #profile_ordering ul { @@ -112,19 +112,19 @@ padding: 0 5px; } #profile_ordering li:last-child { border: 0; } - + #profile_ordering li .check { margin: 2px 10px 0 0; vertical-align: top; } - + #profile_ordering li > span { display: inline-block; height: 20px; vertical-align: top; - line-height: 20px; + line-height: 20px; } - + #profile_ordering li .handle { background: url('./handle.png') center; width: 20px; diff --git a/couchpotato/core/plugins/quality/static/quality.css b/couchpotato/core/plugins/quality/static/quality.css index a66fefc..f71f007 100644 --- a/couchpotato/core/plugins/quality/static/quality.css +++ b/couchpotato/core/plugins/quality/static/quality.css @@ -1,5 +1,5 @@ .group_sizes { - + } .group_sizes .head { @@ -15,7 +15,7 @@ .group_sizes .label { max-width: 120px; } - + .group_sizes .min, .group_sizes .max { text-align: center; width: 50px; diff --git a/couchpotato/core/plugins/quality/static/quality.js b/couchpotato/core/plugins/quality/static/quality.js index 314ca57..bd2ff2a 100644 --- a/couchpotato/core/plugins/quality/static/quality.js +++ b/couchpotato/core/plugins/quality/static/quality.js @@ -93,7 +93,7 @@ var QualityBase = new Class({ var data = data || {'id': randomString()} var profile = new Profile(data) self.profiles.include(profile) - + return profile; }, diff --git a/couchpotato/core/plugins/status/static/status.js b/couchpotato/core/plugins/status/static/status.js index 9c2167b..2b8d30f 100644 --- a/couchpotato/core/plugins/status/static/status.js +++ b/couchpotato/core/plugins/status/static/status.js @@ -6,7 +6,7 @@ var StatusBase = new Class({ self.statuses = statuses; }, - + get: function(id){ return this.statuses.filter(function(status){ return status.id == id diff --git a/couchpotato/core/plugins/userscript/static/userscript.js b/couchpotato/core/plugins/userscript/static/userscript.js index 126e711..d6d5983 100644 --- a/couchpotato/core/plugins/userscript/static/userscript.js +++ b/couchpotato/core/plugins/userscript/static/userscript.js @@ -72,7 +72,7 @@ var UserscriptSettingTab = new Class({ catch(e){ userscript = Browser.chrome === true; } - + var host_url = window.location.protocol + '//' + window.location.host; self.settings.createGroup({ diff --git a/couchpotato/core/plugins/wizard/static/wizard.css b/couchpotato/core/plugins/wizard/static/wizard.css index 3b19cf1..d1aa99c 100644 --- a/couchpotato/core/plugins/wizard/static/wizard.css +++ b/couchpotato/core/plugins/wizard/static/wizard.css @@ -31,14 +31,14 @@ margin: 0; display: block; } - + .page.wizard .tabs li { display: inline-block; } .page.wizard .tabs li a { padding: 20px 30px; } - + .page.wizard .tab_wrapper .pointer { border-right: 10px solid transparent; border-left: 10px solid transparent; @@ -47,7 +47,7 @@ position: absolute; top: 60px; } - + .page.wizard .tab_content { margin: 20px 0 160px; } diff --git a/couchpotato/static/scripts/block.js b/couchpotato/static/scripts/block.js index da816d2..82193ca 100644 --- a/couchpotato/static/scripts/block.js +++ b/couchpotato/static/scripts/block.js @@ -7,13 +7,13 @@ var BlockBase = new Class({ initialize: function(parent, options){ var self = this; self.setOptions(options); - + self.page = parent; self.create(); }, - + create: function(){ this.el = new Element('div.block'); }, @@ -21,11 +21,11 @@ var BlockBase = new Class({ getParent: function(){ return this.page }, - + hide: function(){ this.el.hide(); }, - + show: function(){ this.el.show(); }, diff --git a/couchpotato/static/scripts/page.js b/couchpotato/static/scripts/page.js index af77cfe..589fa3e 100644 --- a/couchpotato/static/scripts/page.js +++ b/couchpotato/static/scripts/page.js @@ -46,7 +46,7 @@ var PageBase = new Class({ self.fireEvent('error'); } }, - + openUrl: function(url){ if(History.getPath() != url) History.push(url); @@ -59,15 +59,15 @@ var PageBase = new Class({ getName: function(){ return this.name }, - + show: function(){ this.el.addClass('active'); }, - + hide: function(){ this.el.removeClass('active'); }, - + toElement: function(){ return this.el } diff --git a/couchpotato/static/scripts/page/manage.js b/couchpotato/static/scripts/page/manage.js index 8a88a36..74dba98 100644 --- a/couchpotato/static/scripts/page/manage.js +++ b/couchpotato/static/scripts/page/manage.js @@ -16,7 +16,7 @@ Page.Manage = new Class({ 'click': self.refresh.bind(self, true) } }); - + self.refresh_quick = new Element('a', { 'title': 'Just scan for recently changed', 'text': 'Quick library scan', diff --git a/couchpotato/static/scripts/page/settings.js b/couchpotato/static/scripts/page/settings.js index 442d61a..94643cc 100644 --- a/couchpotato/static/scripts/page/settings.js +++ b/couchpotato/static/scripts/page/settings.js @@ -9,11 +9,11 @@ Page.Settings = new Class({ tabs: {}, current: 'about', has_tab: false, - + initialize: function(options){ var self = this; self.parent(options); - + // Add to more menu if(self.name == 'settings') App.getBlock('more').addLink(new Element('a', { @@ -21,7 +21,7 @@ Page.Settings = new Class({ 'text': self.name.capitalize(), 'title': self.title }), 'top') - + }, open: function(action, params){ diff --git a/couchpotato/static/style/main.css b/couchpotato/static/style/main.css index 9975da7..a128ee3 100644 --- a/couchpotato/static/style/main.css +++ b/couchpotato/static/style/main.css @@ -13,13 +13,14 @@ body { background: #4e5969; overflow-y: scroll; height: 100%; + text-align: justify; } body.noscroll { overflow: hidden; } #clean { background: transparent !important; } - + * { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -99,9 +100,9 @@ a:hover { color: #f3f3f3; } right: 0; padding: 10px 10px 10px 40px; background: #f7f7f7 url('../images/toTop.gif') no-repeat 10px center; - border-radius: 5px 0 0 0; + border-radius: 5px 0 0 0; } - + form { padding:0; margin:0; @@ -202,19 +203,19 @@ body > .spinner, .mask{ display: block; margin-top: 5px; } - + .header .navigation li.disabled { color: #e5e5e5; } - + .header .navigation li a:link, .header .navigation li a:visited { color: #fff; } - + .header .navigation li a:hover, .header .navigation li a:active { color: #b1d8dc; } - + .header .navigation .backtotop { opacity: 0; display: block; @@ -231,7 +232,7 @@ body > .spinner, .mask{ font-weight: normal; } .header:hover .navigation .backtotop { color: #fff; } - + .header .more_menu { margin-left: 12px; } @@ -242,10 +243,10 @@ body > .spinner, .mask{ .header .more_menu .wrapper:before { margin-left: -34px; } - + .header .more_menu .red { color: red; } .header .more_menu .orange { color: orange; } - + .badge { position: absolute; width: 14px; @@ -261,30 +262,31 @@ body > .spinner, .mask{ background-color: #1b79b8; text-shadow: none; } - + .header .notification_menu .wrapper { width: 300px; margin-left: -260px; text-align: left; } - + .header .notification_menu .wrapper:before { left: 296px; } - + .header .notification_menu ul { max-height: 300px; overflow: auto; } - + .header .notification_menu > a { background-position: center -209px; } - + .header .notification_menu li > span { padding: 5px; display: block; border-bottom: 1px solid rgba(0,0,0,0.2); + word-wrap: break-word; } .header .notification_menu li > span { color: #777; } .header .notification_menu li:last-child > span { border: 0; } @@ -294,11 +296,11 @@ body > .spinner, .mask{ color: #aaa; text-align: ; } - + .header .notification_menu li .more { text-align: center; } - + .header .message.update { text-align: center; position: relative; @@ -340,9 +342,9 @@ body > .spinner, .mask{ display: inline-block; padding: 0 30px 0 20px; border-radius:30px; - + box-shadow: 0 1px 1px rgba(0,0,0,0.35), inset 0 1px 0px rgba(255,255,255,0.20); - + background: url('../images/sprite.png') no-repeat 94% -53px, -webkit-gradient( linear, left bottom, @@ -356,12 +358,12 @@ body > .spinner, .mask{ #406db8 100% ); } - + .select .selection .selectionDisplay { display: inline-block; padding-right: 15px; border-right: 1px solid rgba(0,0,0,0.2); - + box-shadow: 1px 0 0 rgba(255,255,255,0.15); } @@ -370,7 +372,7 @@ body > .spinner, .mask{ overflow: hidden; font-weight: bold; } - + .select .list:before { content: ' '; height: 0; @@ -380,7 +382,7 @@ body > .spinner, .mask{ border-bottom-color: #282d34; margin: -11px 0 0 70px; } - + .select .list { display: none; background: #282d34; @@ -391,7 +393,7 @@ body > .spinner, .mask{ border-radius:3px; z-index: 3; } - .select.active .list { + .select.active .list { display: block; } .select .list ul { @@ -409,7 +411,7 @@ body > .spinner, .mask{ background: rgba(255,255,255,0.1); border-color: transparent; } - + .select input { display: none; } .inlay { @@ -425,7 +427,7 @@ body > .spinner, .mask{ outline: none; box-shadow: inset 0 1px 8px rgba(0,0,0,0.05), 0 1px 0px rgba(255,255,255,0.15); } - + .inlay:focus { background-color: #3a4350; outline: none; @@ -491,7 +493,7 @@ body > .spinner, .mask{ .question .answer:hover { background: #f1f1f1; } - + .question .answer.delete { background-color: #a82f12; } @@ -516,7 +518,7 @@ body > .spinner, .mask{ .more_menu.show > a:not(:active), .more_menu > a:hover:not(:active) { background-color: #406db8; } - + .more_menu .wrapper { display: none; border: 1px solid #333; @@ -544,7 +546,7 @@ body > .spinner, .mask{ rgb(255,255,255) 100% ); } - + .more_menu .wrapper:before { content: ' '; height: 0; @@ -559,18 +561,18 @@ body > .spinner, .mask{ .more_menu.show .wrapper { display: block; } - + .more_menu ul { padding: 0; margin: -12px 0 0 0; list-style: none; } - + .more_menu .wrapper li { width: 100%; height: auto; } - + .more_menu .wrapper li a { display: block; border-bottom: 1px solid rgba(255,255,255,0.2); @@ -582,7 +584,7 @@ body > .spinner, .mask{ padding: 3px 0; color: #000; } - + .more_menu .wrapper li:last-child a { border: none; } diff --git a/couchpotato/static/style/page/settings.css b/couchpotato/static/style/page/settings.css index 361a2e3..464be77 100644 --- a/couchpotato/static/style/page/settings.css +++ b/couchpotato/static/style/page/settings.css @@ -1,6 +1,3 @@ -/* @override - http://127.0.0.1:5000/_api_/static/style/page/settings.css */ - .page.settings:after { content: "."; display: block; @@ -19,7 +16,7 @@ padding: 40px 0; margin: 0; min-height: 470px; - + background-image: -webkit-gradient( linear, right top, @@ -46,7 +43,7 @@ font-size: 25px; color: #fff; } - + .page.settings .tabs .subtabs { list-style: none; padding: 0; @@ -57,7 +54,7 @@ .page.settings .tabs > .active .subtabs { max-height: 300px; } - + .page.settings .tabs .subtabs a { font-size: 15px; padding: 1px 15px; @@ -65,27 +62,27 @@ color: rgba(255, 255, 255, 0.8); background: rgba(78, 89, 105, 0.4); } - + .page.settings .tabs .subtabs .active a { font-weight: bold; color: #fff; background: rgb(78, 89, 105); } - + .page.settings .containers { width: 80%; float: left; padding: 20px 2%; min-height: 300px; - } + } - .page .advanced { + .page .advanced { display: none; color: #edc07f; } .page.show_advanced .advanced { display: block; } - + .page.settings .tab_content { display: none; } @@ -106,7 +103,7 @@ font-size: 12px; margin-left: 10px; } - + .page fieldset.disabled .ctrlHolder { display: none; } @@ -153,14 +150,14 @@ height: 24px; vertical-align: middle; } - + .page .ctrlHolder label { font-weight: bold; width: 20%; margin: 0; padding: 6px 0 0; } - + .page .xsmall { width: 20px !important; text-align: center; } .page input[type=text], .page input[type=password] { @@ -174,7 +171,7 @@ .page .input.medium { width: 15% } .page .input.large { width: 25% } .page .input.xlarge { width: 30% } - + .page .advanced_toggle { clear: both; display: block; @@ -183,10 +180,10 @@ margin: 0; } .page .advanced_toggle span { padding: 0 5px; } - .page.show_advanced .advanced_toggle { + .page.show_advanced .advanced_toggle { color: #edc07f; } - + .page .directory { display: inline-block; padding: 0 4% 0 4px; @@ -206,7 +203,7 @@ white-space: nowrap; cursor: pointer; } - + .page .directory_list { z-index: 2; position: absolute; @@ -216,7 +213,7 @@ border-radius: 3px; box-shadow: 0 0 50px rgba(0,0,0,0.55); } - + .page .directory_list .pointer { border-right: 6px solid transparent; border-left: 6px solid transparent; @@ -226,7 +223,7 @@ width: 0px; margin: -6px 0 0 38%; } - + .page .directory_list ul { width: 92%; height: 300px; @@ -234,7 +231,7 @@ margin: 0 4%; font-size: 16px; } - + .page .directory_list li { padding: 4px 10px; cursor: pointer; @@ -245,17 +242,17 @@ .page .directory_list li:last-child { border-bottom: 1px solid rgba(255,255,255,0.1); } - + .page .directory_list li:hover { background-color: #515c68; } - + .page .directory_list .actions { clear: both; padding: 4% 4% 2%; min-height: 25px; } - + .page .directory_list .actions label { float: right; width: auto; @@ -264,7 +261,7 @@ .page .directory_list .actions .inlay { margin: -2px 0 0 7px; } - + .page .directory_list .actions .back { font-weight: bold; width: 160px; @@ -273,7 +270,7 @@ line-height: 120%; vertical-align: top; } - + .page .directory_list .actions:last-child { float: right; padding: 4%; @@ -283,23 +280,23 @@ padding: 0 5px; text-shadow: none; } - + .page .directory_list .actions:last-child > .clear { left: -90%; position: relative; background-color: #af3128; } - + .page .directory_list .actions:last-child > .cancel { font-weight: bold; color: #ddd; } - + .page .directory_list .actions:last-child > .save { background: #9dc156; } - - + + .page .multi_directory.is_empty .delete { visibility: hidden; } @@ -315,18 +312,18 @@ background-position: center; margin-left: 5px; } - - + + .page .tag_input select { width: 20%; display: inline-block; } - + .page .tag_input .selection { border-radius: 0 10px 10px 0; height: 26px; } - + .page .tag_input > input { display: none; } @@ -345,7 +342,7 @@ border-radius: 3px 0 0 3px; } .page .tag_input:hover .formHint { display: none; } - + .page .tag_input > ul > li { display: inline-block; min-height: 20px; @@ -392,12 +389,12 @@ #406db8 100% ); } - + .page .tag_input .select { display: none; } .page .tag_input:hover .select { display: inline-block; } - + .page .tag_input li input { background: 0; border: 0; @@ -410,13 +407,13 @@ padding-left: 2px; min-width: 0; } - + .page .tag_input li:not(.choice) span { white-space: pre; position: absolute; top: -9999px; } - + .page .tag_input .delete { display: none; height: 10px; @@ -440,11 +437,11 @@ background-size: 65%; } .page .tag_input .choice:hover .delete { display: inline-block; } - .page .tag_input .choice .delete:hover { + .page .tag_input .choice .delete:hover { height: 14px; margin-top: -13px; } - + .page .combined_table .head { margin: 0 0 0 60px; } @@ -462,17 +459,17 @@ .page .combined_table .head abbr.host { margin-right: 197px; } - + .page .combined_table .ctrlHolder { padding-top: 2px; padding-bottom: 3px; } .page .combined_table .ctrlHolder.hide { display: none; } - + .page .combined_table .ctrlHolder > * { margin: 0 10px 0 0; } - + .page .combined_table .ctrlHolder .delete { display: none; width: 22px; @@ -483,7 +480,7 @@ .page .combined_table .ctrlHolder:hover .delete { display: inline-block; } - + .page .combined_table .ctrlHolder.is_empty .delete, .page.settings .combined_table .ctrlHolder.is_empty .check { visibility: hidden; } @@ -522,7 +519,7 @@ .page .tab_about .donate form { padding: 10px 0 0; } - + .page .tab_about .info { padding: 20px 30px; margin: 0; @@ -535,7 +532,7 @@ width: 17%; font-weight: bold; } - + .page .tab_about .info dd { float: right; width: 80%; @@ -544,12 +541,12 @@ font-style: italic; } .page .tab_about .info dd.version { cursor: pointer; } - + .page .tab_about .group_actions > div { padding: 30px; text-align: center; } - + .page .tab_about .group_actions a { margin: 0 10px; font-size: 20px; @@ -561,24 +558,24 @@ font-size: 20px; font-weight: normal; } - + .group_userscript h2 .hint { display: block; margin: 0 !important; } - + .group_userscript .userscript { float: left; margin: 14px 0 0 25px; height: 36px; line-height: 25px; } - + .group_userscript .or { float: left; margin: 20px 10px; } - + .group_userscript .bookmarklet { display: block; display: block; @@ -586,8 +583,8 @@ padding: 20px 15px 0 0 ; border-radius: 5px; } - + .group_userscript .bookmarklet span { margin-left: 10px; - display: inline-block; + display: inline-block; } \ No newline at end of file diff --git a/couchpotato/static/style/uniform.css b/couchpotato/static/style/uniform.css index a64359c..91bc83f 100644 --- a/couchpotato/static/style/uniform.css +++ b/couchpotato/static/style/uniform.css @@ -1,7 +1,7 @@ /* ------------------------------------------------------------------------------ Copyright (c) 2010, Dragan Babic - + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without @@ -10,10 +10,10 @@ copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -28,22 +28,22 @@ /* ------------------------------------------------------------------------------ */ .uniForm{ margin: 0; padding: 0; position: relative; z-index: 1; } /* reset stuff */ - + /* Some generals and more resets */ .uniForm fieldset{ border: none; margin: 0; padding: 0; } .uniForm fieldset legend{ margin: 0; padding: 0; } - + /* This are the main units that contain form elements */ .uniForm .ctrlHolder, .uniForm .buttonHolder{ margin: 0; padding: 0; clear: both; } - - /* Clear all floats */ + + /* Clear all floats */ .uniForm:after, - .uniForm .buttonHolder:after, - .uniForm .ctrlHolder:after, + .uniForm .buttonHolder:after, + .uniForm .ctrlHolder:after, .uniForm .ctrlHolder .multiField:after, .uniForm .inlineLabel:after{ content: "."; display: block; height: 0; line-height: 0; font-size: 0; clear: both; min-height: 0; visibility: hidden; } - + .uniForm label, .uniForm button{ cursor: pointer; } @@ -55,17 +55,17 @@ .uniForm label, .uniForm .label{ display: block; float: none; margin: 0 0 .5em 0; padding: 0; line-height: 100%; width: auto; } - + /* Float the input elements */ .uniForm .textInput, .uniForm .fileUpload, .uniForm .selectInput, .uniForm select, .uniForm textarea{ float: left; width: 53%; margin: 0; } - + /* Postition the hints */ .uniForm .formHint{ float: right; width: 43%; margin: 0; clear: none; } - + /* Position the elements inside combo boxes (multiple inputs/selects/checkboxes/radio buttons per unit) */ .uniForm ul{ float: left; width: 53%; margin: 0; padding: 0; } .uniForm ul li{ margin: 0 0 .5em 0; list-style: none; } @@ -79,7 +79,7 @@ .uniForm ul.alternate .textInput, .uniForm ul.alternate .selectInput, .uniForm ul.alternate select{ width: 98%; margin-top: .5em; display: block; float: none; } - + /* Required fields asterisk styling */ .uniForm label em, .uniForm .label em{ float: left; width: 1em; margin: 0 0 0 -1em; } @@ -93,7 +93,7 @@ .uniForm .inlineLabels label, .uniForm .inlineLabels .label{ float: left; margin: .3em 2% 0 0; padding: 0; line-height: 1; position: relative; width: 32%; } - + /* Float the input elements */ .uniForm .inlineLabels .textInput, .uniForm .inlineLabels .fileUpload, @@ -103,7 +103,7 @@ /* Postition the hints */ .uniForm .inlineLabels .formHint{ clear: both; float: none; width: auto; margin-left: 34%; position: static; } - + /* Position the elements inside combo boxes (multiple inputs/selects/checkboxes/radio buttons per unit) */ .uniForm .inlineLabels ul{ float: left; width: 66%; } .uniForm .inlineLabels ul li{ margin: .5em 0; } @@ -113,7 +113,7 @@ .uniForm .inlineLabels ul li label .textInput, .uniForm .inlineLabels ul li label textarea, .uniForm .inlineLabels ul li label select{ float: none; display: block; width: 98%; } - + /* Required fields asterisk styling */ .uniForm .inlineLabels label em, .uniForm .inlineLabels .label em{ display: block; float: none; margin: 0; position: absolute; right: 0; } @@ -124,22 +124,22 @@ /* Generals */ .uniForm legend{ color: inherit; } - + .uniForm .secondaryAction{ float: left; } - + /* .inlineLabel is used for inputs within labels - checkboxes and radio buttons */ .uniForm .inlineLabel input, .uniForm .inlineLabels .inlineLabel input, .uniForm .blockLabels .inlineLabel input, /* class .inlineLabel is depreciated */ .uniForm label input{ float: none; display: inline; margin: 0; padding: 0; border: none; } - + .uniForm .buttonHolder .inlineLabel, .uniForm .buttonHolder label{ float: left; margin: .5em 0 0 0; width: auto; max-width: 60%; text-align: left; } - + /* When you don't want to use a label */ .uniForm .inlineLabels .noLabel ul{ margin-left: 34%; /* Match to width of label + gap to field */ } - + /* Classes for control of the widths of the fields */ .uniForm .small { width: 30% !important; } .uniForm .medium{ width: 45% !important; } diff --git a/couchpotato/static/style/uniform.generic.css b/couchpotato/static/style/uniform.generic.css index a532dbf..e70a915 100644 --- a/couchpotato/static/style/uniform.generic.css +++ b/couchpotato/static/style/uniform.generic.css @@ -1,11 +1,11 @@ /* ------------------------------------------------------------------------------ - + UNI-FORM DEFAULT by DRAGAN BABIC (v2) | Wed, 31 Mar 10 - + ------------------------------------------------------------------------------ - + Copyright (c) 2010, Dragan Babic - + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without @@ -14,10 +14,10 @@ copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -26,18 +26,18 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - + ------------------------------------------------------------------------------ */ .uniForm{} - + .uniForm legend{ font-weight: bold; font-size: 100%; margin: 0; padding: 1.5em 0; } - + .uniForm .ctrlHolder{ padding: 1em; border-bottom: 1px solid #efefef; } .uniForm .ctrlHolder.focused{ background: #fffcdf; } - + .uniForm .inlineLabels .noLabel{} - + .uniForm .buttonHolder{ background: #efefef; text-align: right; margin: 1.5em 0 0 0; padding: 1.5em; /* CSS3 */ border-radius: 4px; @@ -51,21 +51,21 @@ .uniForm .buttonHolder .primaryAction:active{ position: relative; top: 1px; } .uniForm .secondaryAction { text-align: left; } .uniForm button.secondaryAction { background: transparent; border: none; color: #777; margin: 1.25em 0 0 0; padding: 0; } - + .uniForm .inlineLabels label em, .uniForm .inlineLabels .label em{ font-style: normal; font-weight: bold; } .uniForm label small{ font-size: .75em; color: #777; } - + .uniForm .textInput, .uniForm textarea { padding: 4px 2px; border: 1px solid #aaa; background: #fff; } .uniForm textarea { height: 12em; } .uniForm select {} .uniForm .fileUpload {} - + .uniForm ul{} .uniForm li{} .uniForm ul li label{ font-size: .85em; } - + .uniForm .small {} .uniForm .medium{} .uniForm .large {} /* Large is default and should match the value you set for .textInput, textarea or select */ @@ -73,15 +73,15 @@ .uniForm .small, .uniForm .medium, .uniForm .auto{} - + /* Get rid of the 'glow' effect in WebKit, optional */ .uniForm .ctrlHolder .textInput:focus, .uniForm .ctrlHolder textarea:focus{ outline: none; } - + .uniForm .formHint { font-size: .85em; color: #777; } .uniForm .inlineLabels .formHint { padding-top: .5em; } .uniForm .ctrlHolder.focused .formHint{ color: #333; } - + /* ----------------------------------------------------------------------------- */ /* ############################### Messages #################################### */ /* ----------------------------------------------------------------------------- */ @@ -105,7 +105,7 @@ -o-border-radius: 4px; -khtml-border-radius: 4px; } - + .uniForm .ctrlHolder.error, .uniForm .ctrlHolder.focused.error{ background: #ffdfdf; border: 1px solid #f3afb5; /* CSS3 */ @@ -118,7 +118,7 @@ .uniForm .ctrlHolder.error input.error, .uniForm .ctrlHolder.error select.error, .uniForm .ctrlHolder.error textarea.error{ color: #af4c4c; margin: 0 0 6px 0; padding: 4px; } - + /* Success messages at the top of the form */ .uniForm #okMsg{ background: #c8ffbf; border: 1px solid #a2ef95; margin: 0 0 1.5em 0; padding: 0 1.5em; text-align: center; /* CSS3 */