From 18510cbd3875b1050a03916362bab1b431bdb932 Mon Sep 17 00:00:00 2001 From: Ruud Date: Mon, 5 Mar 2012 07:50:49 +0100 Subject: [PATCH] More menu styling Logs link fix --- couchpotato/core/plugins/log/static/log.js | 2 +- couchpotato/core/plugins/movie/static/list.js | 6 ++--- couchpotato/static/scripts/block/more.js | 6 ++--- couchpotato/static/style/main.css | 22 ++++++++++--------- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/couchpotato/core/plugins/log/static/log.js b/couchpotato/core/plugins/log/static/log.js index 8f5baf5e..ff772829 100644 --- a/couchpotato/core/plugins/log/static/log.js +++ b/couchpotato/core/plugins/log/static/log.js @@ -2,7 +2,7 @@ Page.Log = new Class({ Extends: PageBase, - name: 'logs', + name: 'log', title: 'Show recent logs.', has_tab: false, diff --git a/couchpotato/core/plugins/movie/static/list.js b/couchpotato/core/plugins/movie/static/list.js index 76692210..e13fe2ee 100644 --- a/couchpotato/core/plugins/movie/static/list.js +++ b/couchpotato/core/plugins/movie/static/list.js @@ -121,11 +121,11 @@ var MovieList = new Class({ self.navigation_menu_toggle = new Element('a.button.onlay', { 'events': { 'click': function(){ - self.navigation_menu_ul.toggleClass('show') + self.navigation_menu.toggleClass('show') - if(self.navigation_menu_ul.hasClass('show')) + if(self.navigation_menu.hasClass('show')) this.addEvent('outerClick', function(){ - self.navigation_menu_ul.removeClass('show') + self.navigation_menu.removeClass('show') this.removeEvents('outerClick'); }) else diff --git a/couchpotato/static/scripts/block/more.js b/couchpotato/static/scripts/block/more.js index d0926d05..c9cd11b1 100644 --- a/couchpotato/static/scripts/block/more.js +++ b/couchpotato/static/scripts/block/more.js @@ -27,11 +27,11 @@ Block.More = new Class({ new Element('a.button.onlay', { 'events': { 'click': function(){ - self.more_option_ul.toggleClass('show') + self.el.toggleClass('show') - if(self.more_option_ul.hasClass('show')) + if(self.el.hasClass('show')) this.addEvent('outerClick', function(){ - self.more_option_ul.removeClass('show') + self.el.removeClass('show') this.removeEvents('outerClick'); }) else diff --git a/couchpotato/static/style/main.css b/couchpotato/static/style/main.css index 808da171..e5826221 100644 --- a/couchpotato/static/style/main.css +++ b/couchpotato/static/style/main.css @@ -195,15 +195,6 @@ body > .spinner, .mask{ padding: 15px; } .header .navigation li:first-child a { padding-left: 10px; } - .header .navigation li a.logLink { font-size: 13px; padding: 23px 20px 15px; } - .header .navigation li.tab_settings { - } - .header .navigation li.tab_settings a { - background: url('../images/gear.png') no-repeat center; - width: 35px; - text-indent: -1000px; - } - .header .navigation li span { display: block; margin-top: 5px; @@ -242,6 +233,13 @@ body > .spinner, .mask{ float: right; margin-top: 20px; } + .header .more_menu ul { + width: 100px; + margin-left: -60px; + } + .header .more_menu ul:before { + margin-left: -84px; + } .header .more_menu .red { color: red; } .header .more_menu .orange { color: orange; } @@ -454,6 +452,10 @@ body > .spinner, .mask{ height: 25px; width: 25px; border: 1px solid rgba(0,0,0,0.3); + transition: all 0.3s ease-in-out; + } + .more_menu.show > a, .more_menu > a:hover { + background-color: #406db8; } .more_menu ul { @@ -482,7 +484,7 @@ body > .spinner, .mask{ top: -16px; left: 146px; } - .more_menu ul.show { + .more_menu.show ul { display: block; } .more_menu ul li {