diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2013-02-06 08:13:45 -0800 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2013-02-06 08:13:45 -0800 |
| commit | 3879e5d9c513bf76b3bf11fc3d9e0ab9e23d784b (patch) | |
| tree | f42c13762cdcb6f98fa7b6a4ebd9714a85db294a /core | |
| parent | 09a4424b1f9458bc0ee57c3b5f5c8a2d6a6c3c77 (diff) | |
| parent | 2d77c7c0fdc49e4386994117eef35da2ad12aa4d (diff) | |
| download | nextcloud-server-3879e5d9c513bf76b3bf11fc3d9e0ab9e23d784b.tar.gz nextcloud-server-3879e5d9c513bf76b3bf11fc3d9e0ab9e23d784b.zip | |
Merge pull request #1428 from owncloud/content_positioning
Fix leftcontent positioning. Ref #1255
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 6a2773c2d9d..6182655893f 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -119,18 +119,26 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b #select_all{ margin-top:.4em !important;} /* CONTENT ------------------------------------------------------------------ */ -#controls { padding:0 0.5em; width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; } +#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:#f7f7f7; border-bottom:1px solid #eee; z-index:50; +} #controls .button { display:inline-block; } #content { position:relative; height:100%; width:100%; } +#content .hascontrols { position: relative; top: 2.9em; } #content-wrapper { position:absolute; height:100%; width:100%; padding-top:3.5em; padding-left:64px; -moz-box-sizing:border-box; box-sizing:border-box; } #leftcontent, .leftcontent { - position:fixed; overflow:auto; top:0; width:20em; height:100%; + position:relative; overflow:auto; width:20em; height:100%; background:#f8f8f8; border-right:1px solid #ddd; - -moz-box-sizing:border-box; box-sizing:border-box; padding-top:6.4em; + -moz-box-sizing:border-box; box-sizing:border-box; } #leftcontent li, .leftcontent li { background:#f8f8f8; padding:.5em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; } #leftcontent li:hover, #leftcontent li:active, #leftcontent li.active, .leftcontent li:hover, .leftcontent li:active, .leftcontent li.active { background:#eee; } |