From f975fd54996fd994f0fa9628d4eba42d92406792 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Thu, 16 Jan 2014 14:23:39 +0530
Subject: [PATCH] Fixes Trashbin and Files Style Conflicts, more em to px
conversions post rebase
---
apps/files/css/files.css | 12 ++++++------
apps/files_trashbin/css/trash.css | 2 ++
apps/files_trashbin/templates/index.php | 4 ++--
core/css/styles.css | 3 ++-
4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 9c689c05ec..8edca4cd3c 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -144,7 +144,7 @@ table.multiselect #headerName {
position: relative;
width: 100%;
}
-table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; }
+table td.selection, table th.selection, table td.fileaction { width:32px; text-align:center; }
table td.filename a.name {
position:relative; /* Firefox needs to explicitly have this default set … */
-moz-box-sizing: border-box;
@@ -162,8 +162,8 @@ table td.filename input.filename {
margin-left: 2px;
cursor: text;
}
-table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.2em .5em .5em .3em; }
-table td.filename .nametext, .uploadtext, .modified { float:left; padding:.3em 0; }
+table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:3px 8px 8px 3px; }
+table td.filename .nametext, .uploadtext, .modified { float:left; padding:14px 0; }
#modified {
position: absolute;
@@ -184,7 +184,7 @@ table td.filename .nametext {
max-width: 800px;
}
table td.filename .uploadtext { font-weight:normal; margin-left:8px; }
-table td.filename form { font-size:.85em; margin-left:48px; margin-right:48px; }
+table td.filename form { font-size:14px; margin-left:48px; margin-right:48px; }
.ie8 input[type="checkbox"]{
padding: 0;
@@ -252,11 +252,11 @@ table td.filename form { font-size:.85em; margin-left:48px; margin-right:48px; }
right: 0;
}
-#fileList img.move2trash { display:inline; margin:-.5em 0; padding:16px 8px 16px 8px !important; float:right; }
+#fileList img.move2trash { display:inline; margin:-8px 0; padding:16px 8px 16px 8px !important; float:right; }
#fileList a.action.delete {
position: absolute;
right: 0;
- padding: 9px 14px 19px !important;
+ padding: 28px 14px 19px !important;
}
a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
diff --git a/apps/files_trashbin/css/trash.css b/apps/files_trashbin/css/trash.css
index 97819f4e80..a85ee3f5a6 100644
--- a/apps/files_trashbin/css/trash.css
+++ b/apps/files_trashbin/css/trash.css
@@ -1,3 +1,5 @@
#fileList td a.file, #fileList td a.file span {
cursor: default;
}
+.trash-controls { top: 45px; }
+.trash-filestable { top: 5px !important; } /* To avoid the clashes with #filestable in files */
\ No newline at end of file
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index f9264d4352..45851d7f49 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -1,4 +1,4 @@
-<div id="controls">
+<div id="controls" class="trash-controls">
<?php print_unescaped($_['breadcrumb']); ?>
<div id="file_action_panel"></div>
</div>
@@ -10,7 +10,7 @@
<input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>"></input>
<input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
-<table id="filestable">
+<table id="filestable" class="trash-filestable">
<thead>
<tr>
<th id='headerName'>
diff --git a/core/css/styles.css b/core/css/styles.css
index df01456708..1fe40f987e 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 {
--
GitLab