From 88ad1e5fbd2178c6281d060e9caa47837c447edf Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Sun, 3 Feb 2013 16:02:25 +0100 Subject: [PATCH 1/3] Make app icon linkable when enabling app. --- settings/js/apps.js | 1 + 1 file changed, 1 insertion(+) diff --git a/settings/js/apps.js b/settings/js/apps.js index 8bee958ec57..912ae99016d 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -138,6 +138,7 @@ OC.Settings.Apps = OC.Settings.Apps || { li.append(img); var a=$('').attr('href', entry.href); a.text(entry.name); + a.prepend(img); li.append(a); container.append(li); } From 2ec0c491d4f24ead6bdb8bbff519182d08b2d139 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 5 Feb 2013 11:30:18 +0100 Subject: [PATCH 2/3] remove superfluous enabled-app class again --- core/css/styles.css | 5 ----- settings/js/apps.js | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 19cfad76268..a467857a21a 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -228,11 +228,6 @@ 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 { 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; } #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 912ae99016d..467d5312696 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -132,7 +132,7 @@ OC.Settings.Apps = OC.Settings.Apps || { var container = $('#apps'); if(container.children('li[data-id="'+entry.id+'"]').length === 0){ - var li=$('
  • ').attr({class: 'enabled-app'}); + var li=$('
  • '); li.attr('data-id', entry.id); var img= $('').attr({ src: entry.icon, class:'icon'}); li.append(img); From cda0780d4b029133a7641ca4565593a3ffa6c691 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Tue, 5 Feb 2013 14:15:17 +0100 Subject: [PATCH 3/3] Remove superfluous append --- settings/js/apps.js | 1 - 1 file changed, 1 deletion(-) diff --git a/settings/js/apps.js b/settings/js/apps.js index 467d5312696..3bc3488e490 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -135,7 +135,6 @@ OC.Settings.Apps = OC.Settings.Apps || { var li=$('
  • '); li.attr('data-id', entry.id); var img= $('').attr({ src: entry.icon, class:'icon'}); - li.append(img); var a=$('').attr('href', entry.href); a.text(entry.name); a.prepend(img);