diff options
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/css/settings.css | 5 | ||||
| -rw-r--r-- | settings/js/apps.js | 18 | ||||
| -rw-r--r-- | settings/templates/users/part.grouplist.php | 2 |
3 files changed, 15 insertions, 10 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index 3a6e40ad361..cd81cfb2b3d 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -7,7 +7,10 @@ input#openid, input#webdav { width:20em; } #user-controls { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - position: fixed; right: 0; left:380px; height: 44px; + position: fixed; + right: 0; + left: 230px; + height: 44px; padding: 0; margin: 0; background: #eee; border-bottom: 1px solid #e7e7e7; z-index: 50; diff --git a/settings/js/apps.js b/settings/js/apps.js index b1c28498266..2539982be83 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -232,7 +232,7 @@ OC.Settings.Apps = OC.Settings.Apps || { if(response.status === 'success'){ var navIds=response.nav_ids; for(var i=0; i< navIds.length; i++){ - $('#apps .wrapper').children('li[data-id="'+navIds[i]+'"]').remove(); + $('#apps ul').children('li[data-id="'+navIds[i]+'"]').remove(); } } }); @@ -243,7 +243,7 @@ OC.Settings.Apps = OC.Settings.Apps || { var navEntries=response.nav_entries; for(var i=0; i< navEntries.length; i++){ var entry = navEntries[i]; - var container = $('#apps .wrapper'); + var container = $('#apps ul'); if(container.children('li[data-id="'+entry.id+'"]').length === 0){ var li=$('<li></li>'); @@ -257,8 +257,9 @@ OC.Settings.Apps = OC.Settings.Apps || { li.append(a); // append the new app as last item in the list - // (.push is from sticky footer) - $('#apps .wrapper .push').before(li); + // which is the "add apps" entry with the id + // #apps-management + $('#apps-management').before(li); // scroll the app navigation down // so the newly added app is seen @@ -268,11 +269,12 @@ OC.Settings.Apps = OC.Settings.Apps || { // draw attention to the newly added app entry // by flashing it twice - container.children('li[data-id="' + entry.id + '"]') - .animate({opacity: 0.3}) + $('#header .menutoggle') + .animate({opacity: 0.5}) .animate({opacity: 1}) - .animate({opacity: 0.3}) - .animate({opacity: 1}); + .animate({opacity: 0.5}) + .animate({opacity: 1}) + .animate({opacity: 0.75}); if (!SVGSupport() && entry.icon.match(/\.svg$/i)) { $(img).addClass('svg'); diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php index a903f43f876..593c202f2c9 100644 --- a/settings/templates/users/part.grouplist.php +++ b/settings/templates/users/part.grouplist.php @@ -8,7 +8,7 @@ <li id="newgroup-form"> <form> <input type="text" id="newgroupname" placeholder="<?php p($l->t('Group')); ?>..." /> - <input type="submit" class="button" value="<?php p($l->t('Add Group'))?>" /> + <input type="submit" class="button icon-add" value="" /> </form> </li> <!-- Everyone --> |