diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2016-11-18 14:27:34 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2016-11-21 11:30:01 +0100 |
| commit | e53e585e91d39addc95c660d9780adc766a6ebec (patch) | |
| tree | 05f437f90dd129f7e5ba36772d9231796dcb1cfe /settings | |
| parent | c20c7f31da84ac1330707b3f23e75b9ade879206 (diff) | |
| download | nextcloud-server-e53e585e91d39addc95c660d9780adc766a6ebec.tar.gz nextcloud-server-e53e585e91d39addc95c660d9780adc766a6ebec.zip | |
put explanatory text directly in popup
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/css/settings.css | 20 | ||||
| -rw-r--r-- | settings/js/federationscopemenu.js | 6 |
2 files changed, 17 insertions, 9 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index 5ed97a61a25..74e19a22011 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -90,9 +90,11 @@ input#openid, input#webdav { width:20em; } #personal-settings-container > div h2 span[class^="icon-"], #personal-settings-avatar-container h2 span[class^="icon-"] { display: inline-block; - margin-left: 5px; - background-size: 110%; - opacity: 0.3; + padding: 8px; + margin-left: -5px; + margin-bottom: -8px; + background-size: 22px; + opacity: .3; cursor: pointer; } .personal-settings-setting-box input[type="text"], @@ -112,10 +114,16 @@ input#openid, input#webdav { width:20em; } .federationScopeMenu.bubble::after { right: 50%; transform: translate(50%, 0); + margin-right: -8px; +} +.federationScopeMenu.popovermenu a.menuitem, +.federationScopeMenu.popovermenu label.menuitem, +.federationScopeMenu.popovermenu .menuitem { + font-size: 12.8px; + line-height: 1.6em; } -.federationScopeMenu.popovermenu { - font-weight: 100; - font-size: medium; +.federationScopeMenu.popovermenu .menuitem .menuitem-text-detail { + opacity: .75; } #lostpassword, diff --git a/settings/js/federationscopemenu.js b/settings/js/federationscopemenu.js index e129f69fe9e..a5da04df918 100644 --- a/settings/js/federationscopemenu.js +++ b/settings/js/federationscopemenu.js @@ -16,7 +16,7 @@ '<ul>' + '{{#each items}}' + '<li>' + - '<a href="#" class="menuitem action action-{{name}} permanent" data-action="{{name}}" title="{{tooltip}}">' + + '<a href="#" class="menuitem action action-{{name}} permanent {{#if active}}active{{/if}}" data-action="{{name}}">' + '{{#if icon}}<img class="icon" src="{{icon}}"/>' + '{{else}}'+ '{{#if iconClass}}' + @@ -25,7 +25,8 @@ '<span class="no-icon"></span>' + '{{/if}}' + '{{/if}}' + - '<span>{{displayName}}</span></a>' + + '<p><strong class="menuitem-text">{{displayName}}</strong><br>' + + '<span class="menuitem-text-detail">{{tooltip}}</span></p></a>' + '</li>' + '{{/each}}' + '</ul>'; @@ -134,4 +135,3 @@ OC.Settings.FederationScopeMenu = FederationScopeMenu; })(); - |