diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-02-21 12:46:09 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-02-21 12:46:09 +0100 |
| commit | 80481a1e41fe568d1aec3ab82789e0f8c649c79c (patch) | |
| tree | 6d8d99656272103a9bf570793c58179728506a32 /core/css | |
| parent | d5739e83d16dd4af1865999180c7867a7f77734f (diff) | |
| parent | fc209a594445fbea503332e601df2f253c64de7b (diff) | |
| download | nextcloud-server-80481a1e41fe568d1aec3ab82789e0f8c649c79c.tar.gz nextcloud-server-80481a1e41fe568d1aec3ab82789e0f8c649c79c.zip | |
Merge branch 'master' into mobile-header
Diffstat (limited to 'core/css')
| -rw-r--r-- | core/css/fixes.css | 5 | ||||
| -rw-r--r-- | core/css/multiselect.css | 8 | ||||
| -rw-r--r-- | core/css/styles.css | 30 |
3 files changed, 37 insertions, 6 deletions
diff --git a/core/css/fixes.css b/core/css/fixes.css index 4ee854addef..a33afd5cf77 100644 --- a/core/css/fixes.css +++ b/core/css/fixes.css @@ -54,11 +54,6 @@ background-color: #1B314D; } -/* in IE9 the nav bar on the left side is too narrow and leave a white area - original width is 80px */ -.ie9 #navigation { - width: 100px; -} - /* IE8 isn't able to display transparent background. So it is specified using a gradient */ .ie8 #nojavascript { filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#4c320000', endColorstr='#4c320000'); /* IE */ diff --git a/core/css/multiselect.css b/core/css/multiselect.css index 60f2f47e698..8d949e7cdb7 100644 --- a/core/css/multiselect.css +++ b/core/css/multiselect.css @@ -48,7 +48,7 @@ ul.multiselectoptions > li input[type='checkbox']:checked+label { font-weight: bold; } -div.multiselect { +div.multiselect, select.multiselect { display: inline-block; max-width: 400px; min-width: 150px; @@ -58,6 +58,12 @@ div.multiselect { vertical-align: bottom; } +/* To make a select look like a multiselect until it's initialized */ +select.multiselect { + height: 30px; + min-width: 113px; +} + div.multiselect.active { background-color: #fff; position: relative; diff --git a/core/css/styles.css b/core/css/styles.css index 1c80a3ea160..341a507ce37 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -75,6 +75,19 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari color: #aaa; } +#header .logo { + background-image: url(../img/logo.svg); + width: 250px; + height: 118px; + margin: 0 auto; +} + +#header .logo-wide { + background-image: url(../img/logo-wide.svg); + width: 147px; + height: 32px; +} + /* INPUTS */ input[type="text"], input[type="password"], @@ -935,3 +948,20 @@ div.crumb:active { opacity:.7; } +.appear { + opacity: 1; + transition: opacity 500ms ease 0s; + -moz-transition: opacity 500ms ease 0s; + -ms-transition: opacity 500ms ease 0s; + -o-transition: opacity 500ms ease 0s; + -webkit-transition: opacity 500ms ease 0s; +} +.appear.transparent { + opacity: 0; +} + +/* for IE10 */ +@-ms-viewport { + width: device-width; +} + |