taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #331 from taigaio/refactor/2227/color-refactor 

Removed unnecesary colors
stable
Juanfran 2015-02-10 04:48:17 -08:00
parent d68e2e25c8 7da3eec8e7
commit 5f7c1cae6f
11 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/styles/components/buttons.scss
View File

@ -41,7 +41,7 @@ button {
.button-gray, .button-gray,
a.button-gray { a.button-gray {
background: $button-gray; background: $gray;
&:hover { &:hover {
background: $fresh-taiga; background: $fresh-taiga;
color: $white; color: $white;
@ -55,7 +55,7 @@ a.button-blackish {
background: $blackish; background: $blackish;
color: $whitish; color: $whitish;
&:hover { &:hover {
background: $button-gray-hover; background: $blackish;
color: $white; color: $white;
} }
span { span {
@ -74,17 +74,6 @@ a.button-red {
} }
} }
a.button-orange {
background: $orange;
&:hover {
background: lighten($orange, 10%);
color: $white;
}
span {
color: $white;
}
}
a.button-block { a.button-block {
background: $white; background: $white;
color: $red; color: $red;

6
app/styles/components/paginator.scss
View File

@ -17,7 +17,7 @@
} }
a { a {
&:hover { &:hover {
background: $button-gray-hover; background: $blackish;
color: $white; color: $white;
transition: all .3s linear; transition: all .3s linear;
} }
@ -39,7 +39,7 @@
.v-pagination-next, .v-pagination-next,
.v-pagination-previous { .v-pagination-previous {
background-color: $button-gray; background-color: $gray;
color: $whitish; color: $whitish;
display: block; display: block;
padding: .1rem 0; padding: .1rem 0;
@ -47,7 +47,7 @@
visibility: hidden; visibility: hidden;
width: 100%; width: 100%;
&:hover { &:hover {
background-color: $button-gray / 2; background-color: $blackish;
transition: background .3s linear; transition: background .3s linear;
} }
} }

2
app/styles/components/select-color.scss
View File

@ -26,7 +26,7 @@
input { input {
@extend %medium; @extend %medium;
@extend %text; @extend %text;
background-color: $very-light-gray; background-color: $whitish;
width: 243px; width: 243px;
@include placeholder { @include placeholder {
color: $gray; color: $gray;

14
app/styles/dependencies/colors.scss
View File

@ -6,29 +6,15 @@ $grayer: #444;
$gray: #555; $gray: #555;
$gray-light: #b8b8b8; $gray-light: #b8b8b8;
$whitish: #f5f5f5; $whitish: #f5f5f5;
$very-light-gray: #fcfcfc;
$white: #fff; $white: #fff;
$green-taiga: #72a114; $green-taiga: #72a114;
$fresh-taiga: #9dce0a; $fresh-taiga: #9dce0a;
$dark-taiga: #879b89; $dark-taiga: #879b89;
$dry-taiga: #70a87d;
$morning-taiga: #7ab987;
$dark-grayish-lime-green: #8b9e8d;
$red-light: #ff8282; $red-light: #ff8282;
$red: #f00; $red: #f00;
$rgba-red: 240, 15, 0, .8;
$orange: #d98a0b;
$button-green: #699b05;
$button-green-hover: #9dce0a;
$button-gray: #585858;
$button-gray-hover: #879b89;
$postit: #fff8e4; $postit: #fff8e4;
$postit-hover: #f1e8cd; $postit-hover: #f1e8cd;
$postit-dark-hover: #cfc29b; $postit-dark-hover: #cfc29b;

2
app/styles/layout/base.scss
View File

@ -113,7 +113,7 @@ body {
} }
.menu-tertiary { .menu-tertiary {
background-color: $dark-grayish-lime-green; background-color: $dark-taiga;
flex: 0 0 auto; flex: 0 0 auto;
min-height: 100vh; min-height: 100vh;
padding: 2em 1em; padding: 2em 1em;

2
app/styles/modules/admin/admin-membership-table.scss
View File

@ -116,7 +116,7 @@
width: 500px; width: 500px;
z-index: 999; z-index: 999;
+ div { + div {
background-color: $button-gray; background-color: $gray;
height: 25px; height: 25px;
transition: all .2s linear; transition: all .2s linear;
width: 50%; width: 50%;

2
app/styles/modules/admin/admin-roles.scss
View File

@ -65,7 +65,7 @@
width: 500px; width: 500px;
z-index: 999; z-index: 999;
+ div { + div {
background-color: $button-gray; background-color: $gray;
height: 25px; height: 25px;
transition: all .2s linear; transition: all .2s linear;
width: 50%; width: 50%;

2
app/styles/modules/admin/admin-submenu-roles.scss
View File

@ -38,7 +38,7 @@
padding: .5rem 0; padding: .5rem 0;
text-align: center; text-align: center;
&:hover { &:hover {
background-color: darken($button-gray-hover, 15%); background-color: $blackish;
} }
} }
} }

2
app/styles/modules/admin/admin-submenu.scss
View File

@ -34,7 +34,7 @@
padding: .5rem 0; padding: .5rem 0;
text-align: center; text-align: center;
&:hover { &:hover {
background-color: darken($button-gray-hover, 15%); background-color: $blackish;
} }
} }
} }

2
app/styles/modules/common/category-config.scss
View File

@ -50,7 +50,7 @@
} }
.category-item { .category-item {
align-items: center; align-items: center;
border-bottom: 1px solid $very-light-gray; border-bottom: 1px solid $whitish;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: .5rem .5rem .5rem 2rem; padding: .5rem .5rem .5rem 2rem;

2
app/styles/modules/team/team-table.scss
View File

@ -61,7 +61,7 @@
.hero { .hero {
width: 100%; width: 100%;
.row { .row {
background: $very-light-gray; background: $whitish;
border-bottom: 0; border-bottom: 0;
margin: 1rem 0; margin: 1rem 0;
} }