mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge color tones aaaaaa, bebebe, cccccc in bbbbbb 

Signed-off-by: Julius Haertl <jus@bitgrid.net>
This commit is contained in:
Julius Haertl 2017-03-05 15:36:50 +01:00 committed by Julius Härtl
parent 58a9d1b0f2
commit c7de67e44a
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/css/apps.scss
View File

@ -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'] {

12
core/css/inputs.scss
View File

@ -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;
}
}
}

4
core/css/styles.scss
View File

@ -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'] {

3
core/css/variables.scss
View File

@ -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;