diff options
author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-09-05 18:50:33 +0200 |
---|---|---|
committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-09-23 18:15:56 +0200 |
commit | 9fafe737bcb633a350a6233d5e01c9ed2920500f (patch) | |
tree | 3dca9f68297703f39fbb6e799bc1aee9fa7fbd56 /apps | |
parent | e336283a4860b1e4e498968980905105711a6776 (diff) | |
download | nextcloud-server-9fafe737bcb633a350a6233d5e01c9ed2920500f.tar.gz nextcloud-server-9fafe737bcb633a350a6233d5e01c9ed2920500f.zip |
Removed unneeded bgs and borders. Replaced hard coded colours by
variables.
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'apps')
-rw-r--r-- | apps/files/css/files.scss | 25 | ||||
-rw-r--r-- | apps/files_trashbin/css/trash.scss (renamed from apps/files_trashbin/css/trash.css) | 0 |
2 files changed, 10 insertions, 15 deletions
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 10f37840580..2d9f71be02c 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -32,8 +32,8 @@ } .newFileMenu .error, #fileList .error { - color: #e9322d; - border-color: #e9322d; + color: $color-error; + border-color: $color-error; -webkit-box-shadow: 0 0 6px #f8b9b7; -moz-box-shadow: 0 0 6px #f8b9b7; box-shadow: 0 0 6px #f8b9b7; @@ -58,7 +58,6 @@ } #filestable tbody tr { - background-color: #fff; height: 51px; } @@ -134,7 +133,6 @@ #filestable tbody tr { transition: background-color 0.3s ease; - background-color: #fff; height: 40px; } #filestable tbody tr:hover, @@ -147,9 +145,9 @@ #filestable tbody tr.searchresult, table tr.mouseOver td { transition: background-color 0.3s ease; - background-color: #f8f8f8; + background-color: nc-darken($color-main-background, 3%); } -tbody a { color:#000; } +tbody a { color: $color-main-text; } span.conflict-path, span.extension, span.uploading, td.date { color: #999; @@ -220,7 +218,7 @@ table th:focus .sort-indicator.hidden { table th, table td { - border-bottom: 1px solid #eee; + border-bottom: 1px solid $color-border; text-align: left; font-weight: normal; } @@ -270,9 +268,6 @@ table.multiselect thead { left: 250px; /* sidebar */ } -table thead th { - background-color: #fff; -} table.multiselect thead th { background-color: rgba(255, 255, 255, 0.95); /* like controls bar */ color: #000; @@ -702,7 +697,7 @@ table.dragshadow td.size { left: 0; right: 0; bottom: 0; - background-color: #fff; + background-color: $color-main-background; background-repeat: no-repeat no-repeat; background-position: 50%; opacity: 0.7; @@ -734,10 +729,6 @@ table.dragshadow td.size { margin: 2px 0; } -#fileList .popovermenu .action { - color: #000; -} - #filestable .filename .action .icon, #filestable .selectedActions a .icon, #controls .actions .button .icon { @@ -776,7 +767,11 @@ table.dragshadow td.size { margin: 0 !important; border: none; border-radius: 0; + position: fixed !important; + bottom: 44px; + width: inherit !important; background-color: transparent; + border-right: 1px solid $color-border; z-index:1; .quota-container { diff --git a/apps/files_trashbin/css/trash.css b/apps/files_trashbin/css/trash.scss index 2ed57b51918..2ed57b51918 100644 --- a/apps/files_trashbin/css/trash.css +++ b/apps/files_trashbin/css/trash.scss |