From e11abccded148f23b43eb9251431c65a4cf17655 Mon Sep 17 00:00:00 2001 From: Bagera Date: Wed, 14 May 2014 21:16:00 +0200 Subject: [PATCH 1/4] Fix delete action height Fix #8530 and align the all actions in the row --- apps/files/css/files.css | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index e138261b9f..a580728323 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -239,7 +239,7 @@ table td.filename input.filename { 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:3px 8px 8px 3px; } -table td.filename .nametext, .uploadtext, .modified, .column-last>span:first-child { float:left; padding:14px 0; } +table td.filename .nametext, .uploadtext, .modified, .column-last>span:first-child { float:left; padding:15px 0; } .modified, .column-last>span:first-child { position: relative; @@ -257,7 +257,7 @@ table td.filename .nametext, .uploadtext, .modified, .column-last>span:first-chi /* TODO fix usability bug (accidental file/folder selection) */ table td.filename .nametext { position: absolute; - top: 16px; + top: 15px; left: 55px; padding: 0; overflow: hidden; @@ -384,7 +384,7 @@ table td.filename form { font-size:14px; margin-left:48px; margin-right:48px; } /* File actions */ .fileactions { position: absolute; - top: 14px; + top: 15px; right: 0; font-size: 11px; } @@ -393,7 +393,7 @@ table td.filename form { font-size:14px; margin-left:48px; margin-right:48px; } #fileList a.action.delete { position: absolute; right: 0; - padding: 28px 14px 19px !important; + padding: 17px 14px; } #fileList .action.action-share-notification span, #fileList a { @@ -402,6 +402,10 @@ table td.filename form { font-size:14px; margin-left:48px; margin-right:48px; } a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; } +.fileactions a.action > img{ + margin-bottom: -1px; +} + /* Actions for selected files */ .selectedActions { position: absolute; @@ -424,7 +428,6 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; } #fileList a.action { display: inline; - margin: -8px 0; padding: 18px 8px; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter: alpha(opacity=0); From 28f420b337442131ce1ca8de48e65f790c45d3b8 Mon Sep 17 00:00:00 2001 From: Bagera Date: Thu, 15 May 2014 11:48:41 +0200 Subject: [PATCH 2/4] Aligning with line height Remove "top:" in favour of setting "line-height" and fixing the resulting problem with the input field being positioned wrongly. --- apps/files/css/files.css | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index a580728323..404762b761 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -180,7 +180,6 @@ table th#headerName { height: 50px; } table th#headerSize, table td.filesize { - min-width: 48px; text-align: right; padding: 0; } @@ -193,6 +192,7 @@ table th.column-last, table td.column-last { box-sizing: border-box; position: relative; /* this can not be just width, both need to be set … table styling */ + padding: 0 8px; min-width: 176px; max-width: 176px; } @@ -227,14 +227,14 @@ table td.filename a.name { box-sizing: border-box; display: block; height: 50px; - vertical-align: middle; + line-height: 50px; padding: 0; } table tr[data-type="dir"] td.filename a.name span.nametext {font-weight:bold; } table td.filename input.filename { width: 80%; font-size: 14px; - margin-top: 8px; + margin-top: 0; margin-left: 2px; cursor: text; } @@ -257,7 +257,6 @@ table td.filename .nametext, .uploadtext, .modified, .column-last>span:first-chi /* TODO fix usability bug (accidental file/folder selection) */ table td.filename .nametext { position: absolute; - top: 15px; left: 55px; padding: 0; overflow: hidden; @@ -315,7 +314,7 @@ table td.filename .nametext .innernametext { /* for smaller resolutions - see mobile.css */ table td.filename .uploadtext { font-weight:normal; margin-left:8px; } -table td.filename form { font-size:14px; margin-left:48px; margin-right:48px; } +table td.filename form { font-size:14px; margin-left:46px; height: 40px; padding-top: 10px} .ie8 input[type="checkbox"]{ padding: 0; @@ -384,7 +383,6 @@ table td.filename form { font-size:14px; margin-left:48px; margin-right:48px; } /* File actions */ .fileactions { position: absolute; - top: 15px; right: 0; font-size: 11px; } @@ -402,10 +400,6 @@ table td.filename form { font-size:14px; margin-left:48px; margin-right:48px; } a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; } -.fileactions a.action > img{ - margin-bottom: -1px; -} - /* Actions for selected files */ .selectedActions { position: absolute; @@ -429,6 +423,7 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; } #fileList a.action { display: inline; padding: 18px 8px; + line-height: 50px; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter: alpha(opacity=0); opacity: 0; From bc65b25303e392fa5c10062a98425c54c8342292 Mon Sep 17 00:00:00 2001 From: Bagera Date: Fri, 16 May 2014 17:00:39 +0200 Subject: [PATCH 3/4] Aligning in the table header as well Aligning the columns and in the rows --- apps/files/css/files.css | 36 +++++++++++++++++++++--------------- apps/files/css/mobile.css | 5 +++++ 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 404762b761..bf76682f03 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -140,9 +140,8 @@ table.multiselect th a { color: #000; } table th .columntitle { - display: inline-block; + display: block; padding: 15px; - width: 100%; height: 50px; box-sizing: border-box; -moz-box-sizing: border-box; @@ -150,8 +149,8 @@ table th .columntitle { } table th .columntitle.name { padding-left: 5px; + padding-right: 80px; margin-left: 50px; - max-width: 300px; } /* hover effect on sortable column */ table th a.columntitle:hover { @@ -165,6 +164,7 @@ table th .sort-indicator { } table th, table td { border-bottom:1px solid #ddd; text-align:left; font-weight:normal; } table td { + padding: 0 15px; border-bottom: 1px solid #eee; font-style: normal; background-position: 8px center; @@ -181,10 +181,6 @@ table th#headerName { } table th#headerSize, table td.filesize { text-align: right; - padding: 0; -} -table table td.filesize { - padding: 0 16px; } table th#headerDate, table td.date, table th.column-last, table td.column-last { @@ -192,7 +188,6 @@ table th.column-last, table td.column-last { box-sizing: border-box; position: relative; /* this can not be just width, both need to be set … table styling */ - padding: 0 8px; min-width: 176px; max-width: 176px; } @@ -243,7 +238,6 @@ table td.filename .nametext, .uploadtext, .modified, .column-last>span:first-chi .modified, .column-last>span:first-child { position: relative; - padding-left: 15px; overflow: hidden; text-overflow: ellipsis; width: 90%; @@ -368,7 +362,9 @@ table td.filename form { font-size:14px; margin-left:46px; height: 40px; padding #fileList tr td.filename { - position:relative; width:100%; + position: relative; + width: 100%; + padding-left: 0; -webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms; } @@ -398,25 +394,35 @@ table td.filename form { font-size:14px; margin-left:46px; height: 40px; padding cursor: default !important; } -a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; } +a.action>img { + max-height:16px; + max-width:16px; + vertical-align:text-bottom; + margin-bottom: -1px; +} /* Actions for selected files */ .selectedActions { position: absolute; - top: -1px; + top: 0; right: 0; - padding: 15px 8px; } .selectedActions a { display: inline; - padding: 17px 5px; + font-size: 11px; + line-height: 50px; + padding: 18px 5px; +} +.selectedActions a.delete-selected { + padding-right: 15px; } .selectedActions a.hidden { display: none; } .selectedActions a img { position:relative; - top:5px; + vertical-align: text-bottom; + margin-bottom: -1px; } diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css index 5e7d387553..def8224afc 100644 --- a/apps/files/css/mobile.css +++ b/apps/files/css/mobile.css @@ -18,6 +18,11 @@ table td.date { display: none; } +/* remove padding to let border bottom fill the whole width*/ +table td { + padding: 0; +} + /* remove shift for multiselect bar to account for missing navigation */ table.multiselect thead { padding-left: 0; From cbd5e31d33d30c1c68a74e5db2312c86e40f541d Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 26 Jun 2014 16:58:49 +0200 Subject: [PATCH 4/4] fix padding for last cell in summary of trashbin --- apps/files_trashbin/css/trash.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/files_trashbin/css/trash.css b/apps/files_trashbin/css/trash.css index 04b4a175c8..64e462e2e8 100644 --- a/apps/files_trashbin/css/trash.css +++ b/apps/files_trashbin/css/trash.css @@ -11,3 +11,7 @@ #app-content-trashbin tbody tr[data-type="file"] td a.name span { cursor: default; } + +#app-content-trashbin .summary :last-child { + padding: 0; +}