diff options
| author | Julius Haertl <jus@bitgrid.net> | 2017-02-21 16:50:45 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2017-03-20 12:49:06 +0100 |
| commit | 52fdec860051d02522ae7b448d5936ab96b1b1db (patch) | |
| tree | 0506523b97aeebd8711e4e47084afdfc506b36f6 /core | |
| parent | 14d73d07aab75ef36f03651469ea472648551a07 (diff) | |
| download | nextcloud-server-52fdec860051d02522ae7b448d5936ab96b1b1db.tar.gz nextcloud-server-52fdec860051d02522ae7b448d5936ab96b1b1db.zip | |
Merge colors
- #fafafa/#f8f8f8/#f5f5f5 to #f8f8f8
- #f0f0f0/#eeeeee/#e8e8e8 to #eeeeee
Signed-off-by: Julius Haertl <jus@bitgrid.net>
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/apps.scss | 6 | ||||
| -rw-r--r-- | core/css/inputs.scss | 6 | ||||
| -rw-r--r-- | core/css/styles.scss | 2 | ||||
| -rw-r--r-- | core/css/variables.scss | 14 |
4 files changed, 12 insertions, 16 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss index 7824c7e53d3..1a8daa6ca64 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -166,9 +166,9 @@ em { -ms-transform: rotate(0); transform: rotate(0); } - background-image: linear-gradient(top, $color-main-old-eeeeee 0%, $color-main-old-f5f5f5 100%); - background-image: -webkit-linear-gradient(top, $color-main-old-eeeeee 0%, $color-main-old-f5f5f5 100%); - background-image: -ms-linear-gradient(top, $color-main-old-eeeeee 0%, $color-main-old-f5f5f5 100%); + background-image: linear-gradient(top, $color-main-old-eeeeee 0%, $color-main-old-f8f8f8 100%); + background-image: -webkit-linear-gradient(top, $color-main-old-eeeeee 0%, $color-main-old-f8f8f8 100%); + background-image: -ms-linear-gradient(top, $color-main-old-eeeeee 0%, $color-main-old-f8f8f8 100%); } } > { diff --git a/core/css/inputs.scss b/core/css/inputs.scss index 5ee0f2ef49e..be00d009494 100644 --- a/core/css/inputs.scss +++ b/core/css/inputs.scss @@ -128,7 +128,7 @@ input[type='reset'] { min-height: 34px; cursor: pointer; box-sizing: border-box; - background-color: $color-main-old-fafafa; + background-color: $color-main-old-f8f8f8; } /* Buttons */ @@ -433,8 +433,8 @@ input { } &.select2-search-choice-focus, &:hover { - background-color: $color-main-old-f0f0f0; - border-color: $color-main-old-f0f0f0; + background-color: $color-main-old-eeeeee; + border-color: $color-main-old-eeeeee; } } .select2-arrow { diff --git a/core/css/styles.scss b/core/css/styles.scss index 2467812d7de..f6e3a5983d8 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -636,7 +636,7 @@ label.infield { } &.ui-state-hover, &.ui-state-active { color: $color-main-text; - background-color: $color-main-old-e8e8e8; + background-color: $color-main-old-eeeeee; } } } diff --git a/core/css/variables.scss b/core/css/variables.scss index 213e3d08dd8..64d9e3dca1a 100644 --- a/core/css/variables.scss +++ b/core/css/variables.scss @@ -1,30 +1,26 @@ $color-main-text: #000000; -$color-main-text-dimmed: #555555; $color-main-background: #ffffff; -$color-main-background-dimmed: #f0f0f0; - $color-primary: #0082c9; $color-primary-text: #ffffff; $color-error: #e9322d; $color-warning: #ffcc44; $color-success: #46ba61; -$color-box-shadow: rgba(lighten($color-main-text-dimmed, 25%), 0.75); $image-logo: '../img/logo-icon.svg?v=1'; $image-login-background: '../img/background.jpg?v=1'; +$color-main-text-dimmed: #555555; +$color-main-background-dimmed: #f0f0f0; + +$color-box-shadow: rgba(lighten($color-main-text-dimmed, 25%), 0.75); + // need to be reduced/replaced $color-main-old-ff0000: $color-error; $color-main-old-ffdddd: rgba($color-error, .15); -$color-main-old-fafafa: #fafafa; $color-main-old-f8f8f8: #f8f8f8; -$color-main-old-f5f5f5: rgb(245,245,245); -$color-main-old-f0f0f0: f0f0f0; -$color-main-old-eeeeee: rgb(238, 238, 238); $color-main-old-eeeeee: #eee; -$color-main-old-e8e8e8: #e8e8e8; $color-main-old-dddddd: #ddd; $color-main-old-dcdcdc: rgb(220, 220, 200); $color-main-old-d3d3d3: #d3d3d3; |