From 39906cefbf0ee6e4d161c4a09c88194175d3d64e Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Sun, 6 Oct 2013 23:28:22 +0530 Subject: [PATCH 1/8] Converts em to px values for styles in Files. --- apps/files/css/files.css | 28 ++++++++++++++-------------- apps/files/css/upload.css | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index e26c1a89b7..546451806e 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -3,7 +3,7 @@ See the COPYING-README file. */ /* FILE MENU */ -.actions { padding:.3em; height:2em; width: 100%; } +.actions { padding:5px; height:32px; width: 100%; } .actions input, .actions button, .actions .button { margin:0; float:left; } .actions .button a { color: #555; } .actions .button a:hover, .actions .button a:active { color: #333; } @@ -30,9 +30,9 @@ #new>ul { display: none; position: fixed; - min-width: 7em; + min-width: 112px; z-index: 10; - padding: .5em; + padding: 8px; padding-bottom: 0; margin-top: 14px; margin-left: -1px; @@ -43,7 +43,7 @@ border-top-left-radius: 0; box-shadow:0 2px 7px rgba(170,170,170,.4); } -#new>ul>li { height:36px; margin:.3em; padding-left:3em; padding-bottom:0.1em; +#new>ul>li { height:36px; margin:5px; padding-left:48px; padding-bottom:2px; background-repeat:no-repeat; cursor:pointer; } #new>ul>li>p { cursor:pointer; padding-top: 7px; padding-bottom: 7px;} @@ -56,7 +56,7 @@ top: 44px; width: 100%; } -#filestable tbody tr { background-color:#fff; height:2.5em; } +#filestable tbody tr { background-color:#fff; height:40px; } #filestable tbody tr:hover, tbody tr:active { background-color: rgb(240,240,240); } @@ -71,7 +71,7 @@ span.extension, span.uploading, td.date { color:#999; } span.extension { text-transform:lowercase; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; } tr:hover span.extension { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; color:#777; } table tr.mouseOver td { background-color:#eee; } -table th { height:2em; padding:0 .5em; color:#999; } +table th { height:24px; padding:0 8px; color:#999; } table th .name { position: absolute; left: 55px; @@ -94,15 +94,15 @@ table th#headerName { height: 50px; } table th#headerSize, table td.filesize { - min-width: 3em; - padding: 0 1em; + min-width: 48px; + padding: 0 16px; text-align: right; } table th#headerDate, table td.date { -moz-box-sizing: border-box; box-sizing: border-box; position: relative; - min-width: 11em; + min-width: 176px; display: block; height: 51px; } @@ -173,8 +173,8 @@ table td.filename .nametext { text-overflow: ellipsis; max-width: 800px; } -table td.filename .uploadtext { font-weight:normal; margin-left:.5em; } -table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; } +table td.filename .uploadtext { font-weight:normal; margin-left:8px; } +table td.filename form { font-size:.85em; margin-left:48px; margin-right:48px; } /* File checkboxes */ @@ -247,7 +247,7 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; } box-shadow: -5px 0 7px rgba(230,230,230,.9); } -#fileList img.move2trash { display:inline; margin:-.5em 0; padding:1em .5em 1em .5em !important; float:right; } +#fileList img.move2trash { display:inline; margin:-.5em 0; padding:16px 8px 16px 8px !important; float:right; } #fileList a.action.delete { position: absolute; right: 0; @@ -271,13 +271,13 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; } } .selectedActions a img { position:relative; - top:.3em; + top:5px; } #fileList a.action { display: inline; - margin: -.5em 0; + margin: -8px 0; padding: 18px 8px !important; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter: alpha(opacity=0); diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css index ef04356909..ddd2a67b81 100644 --- a/apps/files/css/upload.css +++ b/apps/files/css/upload.css @@ -5,7 +5,7 @@ height: 36px; width: 39px; padding: 0 !important; /* override default control bar button padding */ - margin-left: .2em; + margin-left: 3px; overflow: hidden; vertical-align: top; } @@ -33,7 +33,7 @@ height: 44px; margin: -5px -3px; padding: 0; - font-size: 1em; + font-size: 16px; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; z-index: 20; cursor: pointer; From f975fd54996fd994f0fa9628d4eba42d92406792 Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Thu, 16 Jan 2014 14:23:39 +0530 Subject: [PATCH 2/8] 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 @@ -
+
@@ -10,7 +10,7 @@ - +
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 { From 2233aa2a049f0b0fcb3a8f24fe2957d926339a93 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Thu, 16 Jan 2014 12:05:05 +0100 Subject: [PATCH 3/8] Fixed files row height in Firefox/KDE Firefox is using native checkboxes and in KDE the checkboxes have a bigger height which caused the row height to increase and be misaligned with the date column. This fix makes the checkbox absolute to prevent it to influence the row height. --- apps/files/css/files.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 8edca4cd3c..b93cc458dd 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -219,6 +219,11 @@ table td.filename form { font-size:14px; margin-left:48px; margin-right:48px; } width: 50px; z-index: 5; } +#fileList tr td.filename>input[type="checkbox"]{ + /* sometimes checkbox height is bigger (KDE/Qt), so setting to absolute + * to prevent it to increase the height */ + position: absolute; +} #fileList tr td.filename>input[type="checkbox"] + label { left: 0; } From b7b83377c57189d262d3c2f92cdb864b35afc3b1 Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Thu, 16 Jan 2014 21:00:15 +0530 Subject: [PATCH 4/8] Fixes header going down in trash bin app. --- apps/files_trashbin/css/trash.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_trashbin/css/trash.css b/apps/files_trashbin/css/trash.css index a85ee3f5a6..b32c2df591 100644 --- a/apps/files_trashbin/css/trash.css +++ b/apps/files_trashbin/css/trash.css @@ -2,4 +2,4 @@ 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 +.trash-filestable { top: -35px !important; } /* To avoid the clashes with #filestable in files */ \ No newline at end of file From 4f593f99b60ae5a966548d080482a8ce73e2c3f6 Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Thu, 16 Jan 2014 23:35:30 +0530 Subject: [PATCH 5/8] Removes Bogus classes from previous commits. --- apps/files_trashbin/css/trash.css | 4 +--- apps/files_trashbin/templates/index.php | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/files_trashbin/css/trash.css b/apps/files_trashbin/css/trash.css index b32c2df591..434836a2b8 100644 --- a/apps/files_trashbin/css/trash.css +++ b/apps/files_trashbin/css/trash.css @@ -1,5 +1,3 @@ #fileList td a.file, #fileList td a.file span { cursor: default; -} -.trash-controls { top: 45px; } -.trash-filestable { top: -35px !important; } /* To avoid the clashes with #filestable in files */ \ No newline at end of file +} \ No newline at end of file diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php index 45851d7f49..f9264d4352 100644 --- a/apps/files_trashbin/templates/index.php +++ b/apps/files_trashbin/templates/index.php @@ -1,4 +1,4 @@ -
+
@@ -10,7 +10,7 @@ - +
From 9edbd142a2100c05fb0a412f33c9ab37c1674160 Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Sat, 18 Jan 2014 00:46:06 +0530 Subject: [PATCH 6/8] Removes Bogus Styles. --- apps/files/css/files.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index b93cc458dd..16ee2b9bca 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -115,8 +115,6 @@ table th#headerDate, table td.date { box-sizing: border-box; position: relative; min-width: 176px; - display: block; - height: 51px; } /* Multiselect bar */ From ce0cbbd7bc634927bce0b3b4929d0334cf0fe28f Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Sat, 18 Jan 2014 14:22:56 +0100 Subject: [PATCH 7/8] remove comment & add space --- core/css/styles.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 1fe40f987e..c77e7a99d3 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -229,7 +229,6 @@ input[type="submit"].enabled { -webkit-box-sizing: border-box; box-sizing: border-box; position: fixed; - /*top: 45px;*/ right: 0; left: 0; height: 44px; @@ -265,7 +264,7 @@ input[type="submit"].enabled { top: 45px; } #content-wrapper { - position:absolute; height:100%; width:100%; padding-left:80px;padding-top: 45px; + position:absolute; height:100%; width:100%; padding-left:80px; padding-top: 45px; -moz-box-sizing:border-box; box-sizing:border-box; } #leftcontent, .leftcontent { From fea1cc82e87ec46e3b124dbbee6ab2751dc4759f Mon Sep 17 00:00:00 2001 From: kondou Date: Sat, 18 Jan 2014 17:51:41 +0100 Subject: [PATCH 8/8] Keep the EOF-Newline --- apps/files_trashbin/css/trash.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_trashbin/css/trash.css b/apps/files_trashbin/css/trash.css index 434836a2b8..97819f4e80 100644 --- a/apps/files_trashbin/css/trash.css +++ b/apps/files_trashbin/css/trash.css @@ -1,3 +1,3 @@ #fileList td a.file, #fileList td a.file span { cursor: default; -} \ No newline at end of file +}