diff options
| author | Julius Haertl <jus@bitgrid.net> | 2017-03-05 15:36:50 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2017-03-20 12:49:08 +0100 |
| commit | c7de67e44a20780cf3bc03429e251c112c298b86 (patch) | |
| tree | 7f0d7a42c5bfd31337f5ecf7a8cfe87e644aa40f /core/css | |
| parent | 58a9d1b0f2466a8c088d047f3bf6fee8be390a0c (diff) | |
| download | nextcloud-server-c7de67e44a20780cf3bc03429e251c112c298b86.tar.gz nextcloud-server-c7de67e44a20780cf3bc03429e251c112c298b86.zip | |
Merge color tones aaaaaa, bebebe, cccccc in bbbbbb
Signed-off-by: Julius Haertl <jus@bitgrid.net>
Diffstat (limited to 'core/css')
| -rw-r--r-- | core/css/apps.scss | 2 | ||||
| -rw-r--r-- | core/css/inputs.scss | 12 | ||||
| -rw-r--r-- | core/css/styles.scss | 4 | ||||
| -rw-r--r-- | core/css/variables.scss | 3 |
4 files changed, 7 insertions, 14 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss index ef43e9b89e6..31338b086b1 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -324,7 +324,7 @@ em { margin-right: 0; height: 38px; float: left; - border: 1px solid rgba($color-main-old-bebebe, 0.9); + border: 1px solid rgba($color-main-old-bbbbbb, 0.9); } button, input[type='submit'] { diff --git a/core/css/inputs.scss b/core/css/inputs.scss index 26f2e0a6577..54f753c5c72 100644 --- a/core/css/inputs.scss +++ b/core/css/inputs.scss @@ -236,11 +236,10 @@ input { border-color: $color-primary } &:disabled + label:before { - background-color: $color-main-old-cccccc !important; /* override other status */ + border: 1px solid $color-main-old-888888; + background-color: $color-main-old-bbbbbb !important; /* override other status */ } &:checked:disabled + label:before { - box-shadow: inset 0px 0px 0px 2px $color-main-background; - border-color: $color-main-old-aaaaaa; background-color: $color-main-old-bbbbbb; } } @@ -258,9 +257,6 @@ input { &:indeterminate + label:before { background-image: url('../img/actions/checkbox-mixed.svg'); } - &:indeterminate:disabled + label:before { - border-color: $color-main-old-888888; - } } &.radio--white, &.checkbox--white { @@ -297,10 +293,10 @@ input { background-image: url('../img/actions/checkbox-mixed-white.svg'); } &:checked:disabled + label:after { - border-color: $color-main-old-aaaaaa; + border-color: $color-main-old-bbbbbb; } &:indeterminate:disabled + label:after { - background-color: $color-main-old-aaaaaa; + background-color: $color-main-old-bbbbbb; } } } diff --git a/core/css/styles.scss b/core/css/styles.scss index ef9d69636d5..765d4b5233a 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -355,7 +355,7 @@ body { } a { color: $color-primary-text; - border-bottom: 1px solid $color-main-old-aaaaaa; + border-bottom: 1px solid $color-main-old-bbbbbb; } } .infogroup { @@ -444,7 +444,7 @@ body { } .tipsy-inner { font-weight: bold; - color: $color-main-old-cccccc; + color: $color-main-old-bbbbbb; } input { &[type='text'], &[type='password'], &[type='email'] { diff --git a/core/css/variables.scss b/core/css/variables.scss index f87b01b8a12..8a566309894 100644 --- a/core/css/variables.scss +++ b/core/css/variables.scss @@ -25,11 +25,8 @@ $color-main-old-eeeeee: #eee; $color-main-old-dddddd: #ddd; $color-main-old-d3d3d3: #d3d3d3; -$color-main-old-cccccc: #ccc; -$color-main-old-bebebe: rgb(190, 190, 190); $color-main-old-bbbbbb: #bbb; -$color-main-old-aaaaaa: #aaa; $color-main-old-888888: #888; $color-main-old-555555: #555; |