From 9fafe737bcb633a350a6233d5e01c9ed2920500f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Tue, 5 Sep 2017 18:50:33 +0200 Subject: [PATCH] Removed unneeded bgs and borders. Replaced hard coded colours by variables. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files/css/files.scss | 25 ++++++++----------- .../css/{trash.css => trash.scss} | 0 core/css/apps.scss | 10 ++++---- core/css/header.scss | 10 ++++---- core/css/inputs.scss | 15 +++++------ core/css/styles.scss | 2 +- core/css/variables.scss | 1 + 7 files changed, 30 insertions(+), 33 deletions(-) rename apps/files_trashbin/css/{trash.css => trash.scss} (100%) diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 10f3784058..2d9f71be02 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 similarity index 100% rename from apps/files_trashbin/css/trash.css rename to apps/files_trashbin/css/trash.scss diff --git a/core/css/apps.scss b/core/css/apps.scss index f2255aa53b..f867576caa 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -90,7 +90,7 @@ kbd { -moz-user-select: none; -ms-user-select: none; user-select: none; - border-right: 1px solid nc-darken($color-main-background, 8%); + border-right: 1px solid $color-border; display: flex; flex-direction: column; li { @@ -556,7 +556,7 @@ kbd { min-width: 300px; display: block; background: $color-main-background; - border-left: 1px solid nc-darken($color-main-background, 8%); + border-left: 1px solid $color-border; -webkit-transition: margin-right 300ms; transition: margin-right 300ms; overflow-x: hidden; @@ -590,7 +590,7 @@ kbd { /* restrict height of settings and make scrollable */ max-height: 300px; overflow-y: auto; - border-right: 1px solid nc-darken($color-main-background, 8%); + border-right: 1px solid $color-border; width: 250px; box-sizing: border-box; @@ -606,7 +606,7 @@ kbd { } #app-settings-header { - border-right: 1px solid nc-darken($color-main-background, 8%); + border-right: 1px solid $color-border; width: 250px; box-sizing: border-box; } @@ -735,7 +735,7 @@ kbd { .popovermenu, .popovermenu:after, #app-navigation .app-navigation-entry-menu, #app-navigation .app-navigation-entry-menu:after { - border: 1px solid nc-darken($color-main-background, 8%); + border: 1px solid $color-border; } } diff --git a/core/css/header.scss b/core/css/header.scss index cf430914f8..24cafb4637 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -26,7 +26,7 @@ .menu { position: absolute; top: 45px; - background-color: #fff; + background-color: $color-main-background; box-shadow: 0 1px 10px $color-box-shadow; border-radius: 0 0 3px 3px; display: none; @@ -406,7 +406,7 @@ nav { position: absolute; pointer-events: none; border: 0 solid transparent; - border-bottom-color: white; + border-bottom-color: $color-main-background; border-width: 10px; transform: translateX(-50%); left: 26px; @@ -491,7 +491,7 @@ nav { display: none; position: absolute; overflow: visible; - background-color: rgba(255, 255, 255, .97); + background-color: rgba($color-main-background, .97); white-space: nowrap; border: none; -webkit-border-radius: 3px; @@ -500,7 +500,7 @@ nav { border-top-left-radius: 0; border-top-right-radius: 0; margin-top: 0; - color: rgba(0, 0, 0, .7); + color: rgba($color-main-text, .7); width: auto; left: 50%; top: 45px; @@ -522,7 +522,7 @@ nav { position: absolute; pointer-events: none; border: 0 solid transparent; - border-bottom-color: white; + border-bottom-color: $color-main-background; border-width: 10px; transform: translateX(-50%); left: 50%; diff --git a/core/css/inputs.scss b/core/css/inputs.scss index 5a7da4f50c..766bfe5501 100644 --- a/core/css/inputs.scss +++ b/core/css/inputs.scss @@ -269,8 +269,8 @@ input { } &:checked + label:before { box-shadow: inset 0px 0px 0px 2px $color-main-text; - background-color: nc-darken($color-main-background, 8%); - border-color: nc-darken($color-main-background, 8%) + background-color: $color-border; + border-color: $color-border } &:disabled + label:before { background-color: nc-lighten($color-main-text, 33%) !important; /* override other status */ @@ -320,6 +320,7 @@ input { /* Select2 overriding. Merged to core with vendor stylesheet */ .select2-drop { margin-top: -2px; + background-color: $color-main-background; &.select2-drop-active { border-color: nc-lighten($color-main-text, 86%); } @@ -354,7 +355,7 @@ input { position: relative; display: list-item; padding: 12px; - background-color: $color-main-background; + background-color: transparent; cursor: pointer; color: nc-lighten($color-main-text, 33%); } @@ -362,10 +363,10 @@ input { &.select2-selected { background-color: nc-darken($color-main-background, 3%); } - &.select2-highlighted { + } + .select2-highlighted { background-color: nc-darken($color-main-background, 3%); color: $color-main-text; - } } } } @@ -444,8 +445,8 @@ input { } &.select2-search-choice-focus, &:hover { - background-color: nc-darken($color-main-background, 8%); - border-color: nc-darken($color-main-background, 8%); + background-color: $color-border; + border-color: $color-border; } } .select2-arrow { diff --git a/core/css/styles.scss b/core/css/styles.scss index 0465d137f5..facadad693 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -1124,7 +1124,7 @@ code { .filelist { td { padding: 14px; - border-bottom: 1px solid nc-darken($color-main-background, 8%); + border-bottom: 1px solid $color-border; } tr:last-child td { border-bottom: none; diff --git a/core/css/variables.scss b/core/css/variables.scss index 3a135f91c8..d6974c4839 100644 --- a/core/css/variables.scss +++ b/core/css/variables.scss @@ -21,3 +21,4 @@ $image-login-background: '../img/background.png?v=2'; $color-loading: #969696; $color-loading-dark: #bbbbbb; $color-box-shadow: rgba(nc-lighten($color-main-text, 20%), 0.75); +$color-border: nc-darken($color-main-background, 8%);