diff options
| author | kondou <kondou@ts.unde.re> | 2013-09-03 04:43:11 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-09-03 04:43:11 +0200 |
| commit | 65413a95dcffee0d803dd30c9cd0028eb9c113e5 (patch) | |
| tree | 5e51e6da3aa76f69c0045fe5ed6b2b20f7226a1f /core/css | |
| parent | e7e3f1b81a5026116ef0c9cd95a00fdd7ff6f5a2 (diff) | |
| parent | 431cf06e996dad7af99b4c65678e5793bd682850 (diff) | |
| download | nextcloud-server-65413a95dcffee0d803dd30c9cd0028eb9c113e5.tar.gz nextcloud-server-65413a95dcffee0d803dd30c9cd0028eb9c113e5.zip | |
Merge branch 'master' into oc_avatars
Conflicts:
config/config.sample.php
Diffstat (limited to 'core/css')
| -rw-r--r-- | core/css/fixes.css | 4 | ||||
| -rw-r--r-- | core/css/styles.css | 46 |
2 files changed, 40 insertions, 10 deletions
diff --git a/core/css/fixes.css b/core/css/fixes.css index 3df60ad5b5c..a33bd94bb10 100644 --- a/core/css/fixes.css +++ b/core/css/fixes.css @@ -44,3 +44,7 @@ height: auto !important; } +/* oc-dialog only uses box shadow which is not supported by ie8 */ +.ie8 .oc-dialog { + border: 1px solid #888888; +} diff --git a/core/css/styles.css b/core/css/styles.css index e7bbf1eef2e..faa458dd58e 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -155,14 +155,20 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b /* CONTENT ------------------------------------------------------------------ */ #controls { - position:fixed; - height:2.8em; width:100%; - padding:0 70px 0 0.5em; margin:0; - -moz-box-sizing:border-box; box-sizing:border-box; - -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; - background:#eee; border-bottom:1px solid #e7e7e7; z-index:50; + position: fixed; + height: 36px; + width: 100%; + padding: 0 75px 0 6px; + margin: 0; + background: #eee; + border-bottom: 1px solid #e7e7e7; + z-index: 50; + -moz-box-sizing: border-box; box-sizing: border-box; + -moz-box-shadow: 0 -3px 7px #000; -webkit-box-shadow: 0 -3px 7px #000; box-shadow: 0 -3px 7px #000; +} +#controls .button { + display: inline-block; } -#controls .button { display:inline-block; } #content { position:relative; height:100%; width:100%; } #content .hascontrols { position: relative; top: 2.9em; } @@ -182,7 +188,14 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b #leftcontent a { height:100%; display:block; margin:0; padding:0 1em 0 0; float:left; } #rightcontent, .rightcontent { position:fixed; top:6.4em; left:24.5em; overflow:auto } - +#emptycontent { + font-size:1.5em; font-weight:bold; + color:#888; text-shadow:#fff 0 1px 0; + position: absolute; + text-align: center; + top: 50%; + width: 100%; +} /* LOG IN & INSTALLATION ------------------------------------------------------------ */ @@ -683,8 +696,21 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin background-color:white; width:100%; } -#oc-dialog-filepicker-content .filelist img { margin: 2px 1em 0 4px; } -#oc-dialog-filepicker-content .filelist .date { float:right;margin-right:1em; } +#oc-dialog-filepicker-content .filelist li { + position: relative; +} +#oc-dialog-filepicker-content .filelist .filename { + position: absolute; + top: 8px; +} +#oc-dialog-filepicker-content .filelist img { + margin: 2px 1em 0 4px; +} +#oc-dialog-filepicker-content .filelist .date { + float: right; + margin-right: 1em; + margin-top: 8px; +} #oc-dialog-filepicker-content .filepicker_element_selected { background-color:lightblue;} .ui-dialog {position:fixed !important;} span.ui-icon {float: left; margin: 3px 7px 30px 0;} |