diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-09-06 13:28:00 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-09-23 18:17:44 +0200 |
| commit | 65353af3745d5ab078fd68562efc6bee4291803f (patch) | |
| tree | 613384776f4d79910cc2625ed2977c0afe44ba18 /core/css | |
| parent | a07299476b5e93d5010b3ce4ea7b25c6eb5046d0 (diff) | |
| download | nextcloud-server-65353af3745d5ab078fd68562efc6bee4291803f.tar.gz nextcloud-server-65353af3745d5ab078fd68562efc6bee4291803f.zip | |
Replaced colours by variables
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core/css')
| -rw-r--r-- | core/css/header.scss | 5 | ||||
| -rw-r--r-- | core/css/inputs.scss | 3 | ||||
| -rw-r--r-- | core/css/mobile.scss | 4 | ||||
| -rw-r--r-- | core/css/styles.scss | 4 | ||||
| -rw-r--r-- | core/css/variables.scss | 2 |
5 files changed, 10 insertions, 8 deletions
diff --git a/core/css/header.scss b/core/css/header.scss index 24cafb4637a..fae11a878ec 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -236,7 +236,6 @@ nav { } /* arrow look */ - #expanddiv:after { bottom: 100%; border: solid transparent; @@ -245,8 +244,8 @@ nav { width: 0; position: absolute; pointer-events: none; - border-color: rgba(0, 0, 0, 0); - border-bottom-color: rgba(255, 255, 255, .97); + border-color: transparent; + border-bottom-color: $color-main-background; border-width: 10px; margin-left: -10px; } diff --git a/core/css/inputs.scss b/core/css/inputs.scss index 766bfe55015..5fe65935ec5 100644 --- a/core/css/inputs.scss +++ b/core/css/inputs.scss @@ -409,6 +409,9 @@ input { } .select2-search-field input { line-height: 20px; + &.select2-active { + background: none !important; + } } } } diff --git a/core/css/mobile.scss b/core/css/mobile.scss index b0f8421345c..baf874db8f5 100644 --- a/core/css/mobile.scss +++ b/core/css/mobile.scss @@ -78,7 +78,7 @@ #app-content { width: 100% !important; left: 0 !important; - background-color: #fff; + background-color: $color-main-background; overflow-x: hidden !important; z-index: 1000; } @@ -97,7 +97,7 @@ width: 44px; height: 44px; z-index: 149; - background-color: rgba(255, 255, 255, .7); + background-color: rgba($color-main-background, .7); cursor: pointer; opacity: .6; } diff --git a/core/css/styles.scss b/core/css/styles.scss index facadad693e..ad75c0c2fc6 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -165,7 +165,7 @@ body { } ::-webkit-scrollbar-thumb { - background: nc-lighten($color-main-text, 86%); + background: nc-darken($color-main-background, 14%); border-radius: 3px; } @@ -1213,7 +1213,7 @@ span.ui-icon { position: relative; align-items: center; padding: 3px 3px 3px 10px; - border-bottom: 1px solid #eeeeee; + border-bottom: 1px solid $color-border; :last-of-type { border-bottom: none; diff --git a/core/css/variables.scss b/core/css/variables.scss index d6974c4839a..26fd11a07d7 100644 --- a/core/css/variables.scss +++ b/core/css/variables.scss @@ -20,5 +20,5 @@ $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-box-shadow: rgba(nc-darken($color-main-background, 30%), 0.75); $color-border: nc-darken($color-main-background, 8%); |