summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorraghunayyar <me@iraghu.com>2014-01-16 14:23:39 +0530
committerraghunayyar <me@iraghu.com>2014-01-16 14:23:39 +0530
commitf975fd54996fd994f0fa9628d4eba42d92406792 (patch)
treec2a0adacc15a00660c32d13b5df1ad5c4c263fd7 /core
parentd8eac2b9bcb5e9e7e9537a458fa331a53b603796 (diff)
downloadnextcloud-server-f975fd54996fd994f0fa9628d4eba42d92406792.tar.gz
nextcloud-server-f975fd54996fd994f0fa9628d4eba42d92406792.zip
Fixes Trashbin and Files Style Conflicts, more em to px conversions post rebase
Diffstat (limited to 'core')
-rw-r--r--core/css/styles.css3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/css/styles.css b/core/css/styles.css
index df014567087..1fe40f987e6 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -229,6 +229,7 @@ input[type="submit"].enabled {
-webkit-box-sizing: border-box;
box-sizing: border-box;
position: fixed;
+ /*top: 45px;*/
right: 0;
left: 0;
height: 44px;
@@ -264,7 +265,7 @@ input[type="submit"].enabled {
top: 45px;
}
#content-wrapper {
- position:absolute; height:100%; width:100%; padding-top:3.5em; padding-left:80px;
+ position:absolute; height:100%; width:100%; padding-left:80px;padding-top: 45px;
-moz-box-sizing:border-box; box-sizing:border-box;
}
#leftcontent, .leftcontent {