wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge colors

Browse source 
- #fafafa/#f8f8f8/#f5f5f5 to #f8f8f8
- #f0f0f0/#eeeeee/#e8e8e8 to #eeeeee

Signed-off-by: Julius Haertl <jus@bitgrid.net>
This commit is contained in:
Julius Haertl 2017-02-21 16:50:45 +01:00 committed by Julius Härtl
parent 14d73d07aa
commit 52fdec8600
No known key found for this signature in database
GPG key ID: 4C614C6ED2CDE6DF
4 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/css/apps.scss
View file

@ -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%);
}
}
> {

6
core/css/inputs.scss
View file

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

2
core/css/styles.scss
View file

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

14
core/css/variables.scss
View file

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