From d620495e9250a2c12aa96fd3a2b8291848df73f1 Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Wed, 30 Jan 2013 00:54:23 +0530 Subject: [PATCH 1/3] No Image Repetition on Enabling Apps in Navigation Bar --- core/css/styles.css | 5 +++++ settings/js/apps.js | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/core/css/styles.css b/core/css/styles.css index 6179df351c7..dc9bd0b5c03 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -192,6 +192,11 @@ fieldset.warning legend { color:#b94a48 !important; } #navigation a:hover, #navigation a:focus { opacity:.8; } #navigation a.active { opacity:1; } #navigation .icon { display:block; width:32px; height:32px; margin:0 16px 0; } + #navigation .enabled-app:hover, #navigation .enabled-app:focus {opacity:1; } + #navigation .enabled-app img {display:block; width:32px; height:32px; margin:0 16px 0; opacity:0.3; background-repeat:no-repeat; cursor:pointer;} + #navigation .enabled-app a {padding:4px 0 4px; } + #navigation .enabled-app:hover a, #navigation .enabled-app:focus a {opacity:0.8; } + #navigation .enabled-app:hover img, #navigation .enabled-app:focus img {opacity:0.8; } #navigation li:first-child a { padding-top:16px; } #settings { float:right; margin-top:7px; color:#bbb; text-shadow:0 -1px 0 #000; } #expand { padding:15px; cursor:pointer; font-weight:bold; } diff --git a/settings/js/apps.js b/settings/js/apps.js index c4c36b4bb12..d4d25c499ca 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -110,9 +110,12 @@ OC.Settings.Apps = OC.Settings.Apps || { if(container.children('li[data-id="'+entry.id+'"]').length === 0){ var li=$('
  • '); + var img =$(''); li.attr('data-id', entry.id); + li.attr('class', 'enabled-app'); + img.attr('style', 'background-image: url('+entry.icon+');'); + li.append(img); var a=$(''); - a.attr('style', 'background-image: url('+entry.icon+')'); a.text(entry.name); a.attr('href', entry.href); li.append(a); From 0dfbd53a6efdc1cb37c36c6bf64fd4eb8f8206d7 Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Wed, 30 Jan 2013 19:12:51 +0530 Subject: [PATCH 2/3] Reduced Styling and Image loads as from src and not backgorund. --- core/css/styles.css | 5 +++-- settings/js/apps.js | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index dc9bd0b5c03..3b107a87224 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -192,8 +192,8 @@ fieldset.warning legend { color:#b94a48 !important; } #navigation a:hover, #navigation a:focus { opacity:.8; } #navigation a.active { opacity:1; } #navigation .icon { display:block; width:32px; height:32px; margin:0 16px 0; } - #navigation .enabled-app:hover, #navigation .enabled-app:focus {opacity:1; } - #navigation .enabled-app img {display:block; width:32px; height:32px; margin:0 16px 0; opacity:0.3; background-repeat:no-repeat; cursor:pointer;} + #navigation .enabled-app:hover, #navigation .enabled-app:focus { opacity:1; } + #navigation .enabled-app img { opacity:0.3; cursor:pointer;} #navigation .enabled-app a {padding:4px 0 4px; } #navigation .enabled-app:hover a, #navigation .enabled-app:focus a {opacity:0.8; } #navigation .enabled-app:hover img, #navigation .enabled-app:focus img {opacity:0.8; } @@ -208,6 +208,7 @@ fieldset.warning legend { color:#b94a48 !important; } #expanddiv a img { margin-bottom:-3px; } #expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active { opacity:1; } + /* VARIOUS REUSABLE SELECTORS */ .hidden { display:none; } .bold { font-weight:bold; } diff --git a/settings/js/apps.js b/settings/js/apps.js index d4d25c499ca..ec0de8e4da5 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -113,7 +113,8 @@ OC.Settings.Apps = OC.Settings.Apps || { var img =$(''); li.attr('data-id', entry.id); li.attr('class', 'enabled-app'); - img.attr('style', 'background-image: url('+entry.icon+');'); + img.attr('src', entry.icon); + img.attr('class', 'icon'); li.append(img); var a=$(''); a.text(entry.name); From b978cc8b288d3e05b6eb83b04215402665ed128b Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Thu, 31 Jan 2013 11:52:56 +0530 Subject: [PATCH 3/3] Shorter, Cleaner JS in apps.js --- settings/js/apps.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/settings/js/apps.js b/settings/js/apps.js index ec0de8e4da5..83a3f3c7dcc 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -109,16 +109,12 @@ OC.Settings.Apps = OC.Settings.Apps || { var container = $('#apps'); if(container.children('li[data-id="'+entry.id+'"]').length === 0){ - var li=$('
  • '); - var img =$(''); + var li=$('
  • ').attr({class: 'enabled-app'}); li.attr('data-id', entry.id); - li.attr('class', 'enabled-app'); - img.attr('src', entry.icon); - img.attr('class', 'icon'); - li.append(img); - var a=$(''); + var img= $('').attr({ src: entry.icon, class:'icon'}); + li.append(img); + var a=$('').attr('href', entry.href); a.text(entry.name); - a.attr('href', entry.href); li.append(a); container.append(li); }