diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-16 10:40:06 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-16 10:40:06 +0200 |
| commit | 534d93d2d3d549039db2661cdc4b9e939a0abe0d (patch) | |
| tree | 7868026ba14b6558c8e50b601a9a5fa85fdc585b /core/css | |
| parent | f8563ec5831713b341db1b2cd480328912818607 (diff) | |
| parent | 46f59b165e5bd1908509e8a62b67bf983cfd6224 (diff) | |
| download | nextcloud-server-534d93d2d3d549039db2661cdc4b9e939a0abe0d.tar.gz nextcloud-server-534d93d2d3d549039db2661cdc4b9e939a0abe0d.zip | |
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
apps/files/index.php
Diffstat (limited to 'core/css')
| -rw-r--r-- | core/css/apps.css | 4 | ||||
| -rw-r--r-- | core/css/styles.css | 20 |
2 files changed, 20 insertions, 4 deletions
diff --git a/core/css/apps.css b/core/css/apps.css index 5de146feb1f..de63495e50e 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -50,8 +50,8 @@ #app-navigation li > a { display: block; width: 100%; - height: 44px; - padding: 12px; + line-height: 44px; + padding: 0 12px; overflow: hidden; -moz-box-sizing: border-box; box-sizing: border-box; white-space: nowrap; diff --git a/core/css/styles.css b/core/css/styles.css index bf78af15af5..dcdeda8a9c9 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -40,6 +40,11 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari .header-right { float:right; vertical-align:middle; padding:0.5em; } .header-right > * { vertical-align:middle; } +#header .avatardiv { + text-shadow: none; + float: left; + display: inline-block; +} /* INPUTS */ input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"], @@ -583,8 +588,18 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } /* USER MENU */ -#settings { float:right; margin-top:7px; color:#bbb; text-shadow:0 -1px 0 #000; } -#expand { padding:15px; cursor:pointer; font-weight:bold; } +#settings { + float: right; + margin-top: 7px; + margin-left: 10px; + color: #bbb; + text-shadow: 0 -1px 0 #000; +} +#expand { + padding: 15px 15px 15px 5px; + cursor: pointer; + font-weight: bold; +} #expand:hover, #expand:focus, #expand:active { color:#fff; } #expand img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; margin-bottom:-2px; } #expand:hover img, #expand:focus img, #expand:active img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } @@ -624,6 +639,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } .hidden { display:none; } .bold { font-weight:bold; } .center { text-align:center; } +.inlineblock { display: inline-block; } #notification-container { position: fixed; top: 0px; width: 100%; text-align: center; z-index: 101; line-height: 1.2;} #notification, #update-notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position: relative; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; } |