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

Merge pull request #966 from taigaio/issue/4105/color-mass 

Move back to previous gray contrast for color masses
stable
Xaviju 2016-06-09 10:29:42 +02:00
parent a98a9a6f7f 459a42e387
commit 1dfd01835f
36 changed files with 76 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/modules/attachments/attachments.scss
View File

@ -20,7 +20,7 @@
.attachments-header { .attachments-header {
align-content: center; align-content: center;
align-items: center; align-items: center;
background: $whitish; background: $mass-white;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
min-height: 36px; min-height: 36px;

6
app/modules/discover/components/discover-search-list-header/discover-search-list-header.scss
View File

@ -35,9 +35,9 @@
} }
.discover-search-subfilter { .discover-search-subfilter {
@include arrow('bottom', $whitish, $whitish, 1, 8); @include arrow('bottom', $mass-white, $mass-white, 1, 8);
align-items: center; align-items: center;
background: $whitish; background: $mass-white;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
position: relative; position: relative;
@ -80,7 +80,7 @@
} }
&.active { &.active {
background: $primary-light; background: $primary-light;
color: $whitish; color: $white;
} }
} }
} }

2
app/modules/home/home.scss
View File

@ -14,7 +14,7 @@
@include font-type(light); @include font-type(light);
@include font-size(larger); @include font-size(larger);
align-content: center; align-content: center;
background: $whitish; background: $mass-white;
display: flex; display: flex;
margin: 0 0 .5rem; margin: 0 0 .5rem;
padding: .9rem 1rem; padding: .9rem 1rem;

2
app/modules/home/working-on/empty.scss
View File

@ -31,7 +31,7 @@
} }
.line { .line {
background: $whitish; background: $mass-white;
height: 1rem; height: 1rem;
margin-bottom: 1rem; margin-bottom: 1rem;
width: 40vw; width: 40vw;

6
app/modules/profile/profile-contacts/profile-contacts.jade
View File

@ -11,12 +11,6 @@ section.profile-contacts
div(ng-if="vm.isCurrentUser") div(ng-if="vm.isCurrentUser")
p(translate="USER.PROFILE.CURRENT_USER_CONTACTS_EMPTY") p(translate="USER.PROFILE.CURRENT_USER_CONTACTS_EMPTY")
p(translate="USER.PROFILE.CURRENT_USER_CONTACTS_EMPTY_EXPLAIN") p(translate="USER.PROFILE.CURRENT_USER_CONTACTS_EMPTY_EXPLAIN")
//-
nav.profile-contact-filters
a.active(href="", title="No Filter") all
a(href="", title="Only show your team") team
a(href="", title="Only show people you follow") following
a(href="", title="Only show people follow you") followers
div.list-itemtype-user(tg-repeat="contact in ::vm.contacts") div.list-itemtype-user(tg-repeat="contact in ::vm.contacts")
a.list-itemtype-avatar(tg-nav="user-profile:username=contact.get('username')", title="{{::contact.get('name')}}") a.list-itemtype-avatar(tg-nav="user-profile:username=contact.get('username')", title="{{::contact.get('name')}}")

17
app/modules/profile/styles/profile-contacts.scss
View File

@ -3,20 +3,3 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.profile-contact-filters {
align-self: center;
display: flex;
a {
border-bottom: 2px solid $white;
color: $gray-light;
display: inline-block;
padding: 1rem 1.5rem;
transition: all .2s linear;
&:hover,
&.active {
border-bottom: 2px solid $gray-light;
color: $primary;
}
}
}

5
app/modules/profile/styles/profile-sidebar.scss
View File

@ -1,7 +1,7 @@
.profile-sidebar { .profile-sidebar {
h4 { h4 {
@include font-type(bold); @include font-type(bold);
background: $whitish; background: $mass-white;
color: $gray; color: $gray;
margin-bottom: .5rem; margin-bottom: .5rem;
padding: .5rem; padding: .5rem;
@ -19,7 +19,4 @@
a { a {
color: $primary; color: $primary;
} }
.trans-button {
margin-bottom: 1rem;
}
} }

2
app/modules/projects/listing/styles/project-list.scss
View File

@ -2,7 +2,7 @@
position: relative; position: relative;
.project-list-title { .project-list-title {
align-items: center; align-items: center;
background: $whitish; background: $mass-white;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin: 2rem 0 1rem; margin: 2rem 0 1rem;

5
app/partials/contrib/main.jade
View File

@ -1,6 +1,9 @@
doctype html doctype html
div.wrapper.roles(ng-init="section='admin'", ng-controller="ContribController as ctrl") div.wrapper.roles(
ng-init="section='admin'"
ng-controller="ContribController as ctrl"
)
tg-project-menu tg-project-menu
sidebar.menu-secondary.sidebar.settings-nav(tg-admin-navigation="contrib") sidebar.menu-secondary.sidebar.settings-nav(tg-admin-navigation="contrib")

3
app/partials/issue/issues-filters.jade
View File

@ -15,8 +15,7 @@
<% } %> <% } %>
<% }) %> <% }) %>
span(class="new") span(class="new")
input( input.hidden.my-filter-name(
class="hidden my-filter-name"
type="text" type="text"
placeholder="{{'ISSUES.PLACEHOLDER_FILTER_NAME' | translate}}" placeholder="{{'ISSUES.PLACEHOLDER_FILTER_NAME' | translate}}"
) )

6
app/partials/issue/issues.jade
View File

@ -1,6 +1,10 @@
doctype html doctype html
div.wrapper.issues.lightbox-generic-form(tg-issues, ng-controller="IssuesController as ctrl", ng-init="section='issues'") div.wrapper.issues.lightbox-generic-form(
tg-issues
ng-controller="IssuesController as ctrl"
ng-init="section='issues'"
)
tg-project-menu tg-project-menu
sidebar.menu-secondary.extrabar.filters-bar(tg-issues-filters) sidebar.menu-secondary.extrabar.filters-bar(tg-issues-filters)
include ../includes/modules/issues-filters include ../includes/modules/issues-filters

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

@ -33,13 +33,13 @@
} }
&.disabled, &.disabled,
&[disabled] { &[disabled] {
background: $whitish; background: $mass-white;
box-shadow: none; box-shadow: none;
color: $gray-light; color: $gray-light;
cursor: not-allowed; cursor: not-allowed;
opacity: .65; opacity: .65;
&:hover { &:hover {
background: $whitish; background: $mass-white;
color: $gray-light; color: $gray-light;
} }
} }

2
app/styles/components/editor-help.scss
View File

@ -1,5 +1,5 @@
.wysiwyg-help { .wysiwyg-help {
background: $whitish; background: $mass-white;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-top: -.5rem; margin-top: -.5rem;

4
app/styles/components/markitup.scss
View File

@ -1,6 +1,6 @@
.markItUpHeader { .markItUpHeader {
ul { ul {
background: $whitish; background: $mass-white;
padding: .3rem; padding: .3rem;
li { li {
display: inline-block; display: inline-block;
@ -30,7 +30,7 @@
.preview { .preview {
.actions { .actions {
background: $whitish; background: $mass-white;
margin-top: .5rem; margin-top: .5rem;
min-height: 2rem; min-height: 2rem;
padding: .3rem; padding: .3rem;

2
app/styles/components/tag.scss
View File

@ -1,7 +1,7 @@
.tag { .tag {
@include font-type(light); @include font-type(light);
@include font-size(small); @include font-size(small);
background: $whitish; // Fallback background: $mass-white;
border-radius: 0 5px 5px 0; border-radius: 0 5px 5px 0;
color: $grayer; color: $grayer;
display: inline-block; display: inline-block;

8
app/styles/components/track-btn.scss
View File

@ -13,7 +13,7 @@
position: relative; position: relative;
.track-inner { .track-inner {
align-items: center; align-items: center;
background: $whitish; background: $mass-white;
border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px;
display: flex; display: flex;
flex: 1; flex: 1;
@ -22,7 +22,7 @@
margin-right: .1rem; margin-right: .1rem;
min-width: 140px; min-width: 140px;
&:hover { &:hover {
background: darken($whitish, 5%); background: darken($mass-white, 5%);
transition: background .3s; transition: background .3s;
} }
} }
@ -131,7 +131,7 @@
justify-content: center; justify-content: center;
margin-right: .3rem; margin-right: .3rem;
.vote-inner { .vote-inner {
background: $whitish; background: $mass-white;
color: $gray-light; color: $gray-light;
display: block; display: block;
padding: 1rem; padding: 1rem;
@ -139,7 +139,7 @@
} }
a { a {
&:hover { &:hover {
background: darken($whitish, 5%); background: darken($mass-white, 5%);
color: $primary-dark; color: $primary-dark;
transition: background .3s; transition: background .3s;
path { path {

2
app/styles/layout/admin-project-values.scss
View File

@ -40,7 +40,7 @@
.project-values-title { .project-values-title {
align-content: center; align-content: center;
align-items: center; align-items: center;
background: $whitish; background: $mass-white;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: .8em 1rem; padding: .8em 1rem;

10
app/styles/layout/backlog.scss
View File

@ -1,5 +1,5 @@
.backlog-menu { .backlog-menu {
background: $whitish; background: $mass-white;
color: $blackish; color: $blackish;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -7,15 +7,15 @@
.trans-button { .trans-button {
color: $blackish; color: $blackish;
display: inline-block; display: inline-block;
padding: .4rem 1.5rem; padding: .3rem 1.5rem;
&.active, &.active,
&:hover { &:hover {
background: darken($whitish, 10%); background: $whitish;
color: $grayer; color: $gray;
} }
&.active { &.active {
&:hover { &:hover {
background: lighten($gray, 30%); background: darken($whitish, 10%);
} }
} }
&.move-to-sprint { &.move-to-sprint {

6
app/styles/layout/ticket-detail.scss
View File

@ -11,7 +11,7 @@
@include font-size(large); @include font-size(large);
@include font-type(text); @include font-type(text);
align-items: flex-start; align-items: flex-start;
background: $whitish; background: $mass-white;
display: flex; display: flex;
flex: 1; flex: 1;
flex-direction: column; flex-direction: column;
@ -217,7 +217,7 @@
transition: all .2s linear; transition: all .2s linear;
} }
.editable { .editable {
background: $whitish; background: $mass-white;
cursor: pointer; cursor: pointer;
} }
.no-description { .no-description {
@ -255,7 +255,7 @@
} }
.view-description { .view-description {
.edit { .edit {
background: $whitish; background: $mass-white;
height: 2rem; height: 2rem;
left: 0; left: 0;
opacity: 0; opacity: 0;

4
app/styles/layout/wiki.scss
View File

@ -28,7 +28,7 @@
&.editable { &.editable {
&:hover { &:hover {
.wysiwyg { .wysiwyg {
background: $whitish; background: $mass-white;
cursor: pointer; cursor: pointer;
} }
} }
@ -44,7 +44,7 @@
} }
.edit { .edit {
@include svg-size(2rem); @include svg-size(2rem);
background: $whitish; background: $mass-white;
left: 0; left: 0;
opacity: 0; opacity: 0;
padding: .2rem .5rem; padding: .2rem .5rem;

2
app/styles/modules/admin/admin-project-export.scss
View File

@ -15,7 +15,7 @@
h3 { h3 {
@include font-type(bold); @include font-type(bold);
@include font-size(large); @include font-size(large);
background: $whitish; background: $mass-white;
color: $gray; color: $gray;
margin: .5rem; margin: .5rem;
padding: .5rem; padding: .5rem;

6
app/styles/modules/admin/admin-project-profile.scss
View File

@ -68,7 +68,7 @@
display: none; display: none;
} }
label { label {
background: $whitish; background: $mass-white;
color: $grayer; color: $grayer;
text-align: center; text-align: center;
transition: all .2s linear; transition: all .2s linear;
@ -101,13 +101,13 @@
} }
.privacy-project[disabled] { .privacy-project[disabled] {
+ label { + label {
background: $whitish; background: $mass-white;
box-shadow: none; box-shadow: none;
color: $gray-light; color: $gray-light;
cursor: not-allowed; cursor: not-allowed;
opacity: .65; opacity: .65;
&:hover { &:hover {
background: $whitish; background: $mass-white;
color: $gray-light; color: $gray-light;
} }
} }

3
app/styles/modules/backlog/backlog-table.scss
View File

@ -183,6 +183,9 @@
} }
.gu-transit { .gu-transit {
background: $whitish; background: $whitish;
}
.sortable-placeholder {
background: $mass-white;
height: 40px; height: 40px;
width: 100%; width: 100%;
* { * {

2
app/styles/modules/backlog/taskboard-table.scss
View File

@ -73,7 +73,7 @@ $column-margin: 0 10px 0 0;
.task-colum-name { .task-colum-name {
@include font-size(medium); @include font-size(medium);
align-items: center; align-items: center;
background: $whitish; background: $mass-white;
border-top: 3px solid $gray-light; border-top: 3px solid $gray-light;
color: $gray; color: $gray;
display: flex; display: flex;

2
app/styles/modules/common/custom-fields.scss
View File

@ -4,7 +4,7 @@
@include font-type(bold); @include font-type(bold);
align-content: space-between; align-content: space-between;
align-items: center; align-items: center;
background: $whitish; background: $mass-white;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: .5rem 1rem; padding: .5rem 1rem;

2
app/styles/modules/common/history.scss
View File

@ -236,7 +236,7 @@
width: calc(100% - 80px); width: calc(100% - 80px);
} }
.changes { .changes {
background: $whitish; background: $mass-white;
.change-entry { .change-entry {
display: none; display: none;
&.active { &.active {

2
app/styles/modules/common/lightbox.scss
View File

@ -23,7 +23,7 @@
} }
label { label {
@include font-size(xsmall); @include font-size(xsmall);
background: $whitish; background: $mass-white;
border: 1px solid $gray-light; border: 1px solid $gray-light;
color: $grayer; color: $grayer;
cursor: pointer; cursor: pointer;

2
app/styles/modules/common/related-tasks.scss
View File

@ -6,7 +6,7 @@
.related-tasks-header { .related-tasks-header {
align-content: center; align-content: center;
align-items: center; align-items: center;
background: $whitish; background: $mass-white;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
min-height: 36px; min-height: 36px;

2
app/styles/modules/help/joyride.scss
View File

@ -51,7 +51,7 @@
color: $white; color: $white;
} }
&.introjs-disabled { &.introjs-disabled {
background: $whitish; background: $mass-white;
background-color: none; background-color: none;
color: $white; color: $white;
} }

2
app/styles/modules/home-project.scss
View File

@ -55,7 +55,7 @@
@include font-type(text); @include font-type(text);
@include font-type(bold); @include font-type(bold);
align-content: center; align-content: center;
background: $whitish; background: $mass-white;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-bottom: .5rem; margin-bottom: .5rem;

4
app/styles/modules/kanban/kanban-table.scss
View File

@ -61,7 +61,7 @@ $column-margin: 0 10px 0 0;
.task-colum-name { .task-colum-name {
@include font-size(medium); @include font-size(medium);
align-items: center; align-items: center;
background: $whitish; background: $mass-white;
border-top: 3px solid $gray-light; border-top: 3px solid $gray-light;
color: $gray; color: $gray;
display: flex; display: flex;
@ -131,7 +131,7 @@ $column-margin: 0 10px 0 0;
} }
} }
.kanban-uses-box { .kanban-uses-box {
background: $whitish; background: $mass-white;
} }
} }

3
app/themes/high-contrast/variables.scss
View File

@ -16,6 +16,9 @@ $primary-light: #212121;
$primary: #000; $primary: #000;
$primary-dark: #000; $primary-dark: #000;
// Mass white
$mass-white: #f5f5f5;
//Warning colors //Warning colors
$red-light: #ff0062; $red-light: #ff0062;
$red: #ff2400; $red: #ff2400;

6
app/themes/material-design/custom.scss
View File

@ -79,7 +79,7 @@ input[type="date"],
input[type="password"], input[type="password"],
select, select,
textarea { textarea {
background: $whitish; background: $mass-white;
border-color: $primary; border-color: $primary;
color: $grayer; color: $grayer;
@include placeholder { @include placeholder {
@ -152,7 +152,7 @@ tg-project-menu {
//Taskboard table //Taskboard table
.taskboard-table-header { .taskboard-table-header {
.task-colum-name { .task-colum-name {
background: lighten($primary-light, 20%); background: $mass-white;
border-top: 3px solid $primary; border-top: 3px solid $primary;
.icon { .icon {
fill: $primary; fill: $primary;
@ -161,7 +161,7 @@ tg-project-menu {
} }
.taskboard-table-body { .taskboard-table-body {
.taskboard-tasks-box { .taskboard-tasks-box {
background: $whitish; background: $mass-white;
} }
} }

3
app/themes/material-design/variables.scss
View File

@ -11,6 +11,9 @@ $gray-light: #BDBDBD;
$whitish: #EEEEEE; $whitish: #EEEEEE;
$white: #fff; $white: #fff;
// Mass white
$mass-white: #f5f5f5;
// Primary colors // Primary colors
$primary-light: #8c9eff; $primary-light: #8c9eff;
$primary: #3f51b5; $primary: #3f51b5;

18
app/themes/taiga/custom.scss
View File

@ -15,7 +15,7 @@ body {
// Secondary panel // Secondary panel
.menu-secondary { .menu-secondary {
background: $whitish; background: $mass-white;
} }
// Tertiary panel // Tertiary panel
@ -25,7 +25,7 @@ body {
// Extra bar panel // Extra bar panel
.extrabar { .extrabar {
background: $whitish; background: $mass-white;
} }
@ -61,7 +61,7 @@ input[type="date"],
input[type="password"], input[type="password"],
select, select,
textarea { textarea {
background: lighten($whitish, 6%); background: $mass-white;
border-color: $gray-light; border-color: $gray-light;
color: $grayer; color: $grayer;
@include placeholder { @include placeholder {
@ -82,7 +82,7 @@ textarea {
// Blockquote // Blockquote
blockquote { blockquote {
border-left: 5px solid $whitish; border-left: 5px solid $mass-white;
} }
blockquote, blockquote,
@ -120,7 +120,7 @@ tg-project-menu {
} }
.main-nav { .main-nav {
svg path { svg {
fill: $white; fill: $white;
} }
} }
@ -132,7 +132,7 @@ tg-project-menu {
//Taskboard table //Taskboard table
.taskboard-table-header { .taskboard-table-header {
.task-colum-name { .task-colum-name {
background: lighten($whitish, 5%); background: $mass-white;
border-top: 3px solid $gray-light; border-top: 3px solid $gray-light;
.icon { .icon {
fill: $gray-light; fill: $gray-light;
@ -141,7 +141,7 @@ tg-project-menu {
} }
.taskboard-table-body { .taskboard-table-body {
.taskboard-tasks-box { .taskboard-tasks-box {
background: lighten($whitish, 5%); background: $mass-white;
} }
} }
@ -152,7 +152,7 @@ tg-project-menu {
//Kanban table //Kanban table
.kanban-table-header { .kanban-table-header {
.task-colum-name { .task-colum-name {
background: lighten($whitish, 5%); background: $mass-white;
border-top: 3px solid $gray-light; border-top: 3px solid $gray-light;
.icon { .icon {
color: $gray-light; color: $gray-light;
@ -162,6 +162,6 @@ tg-project-menu {
.kanban-table-body { .kanban-table-body {
.kanban-uses-box { .kanban-uses-box {
background: lighten($whitish, 5%); background: $mass-white;
} }
} }

3
app/themes/taiga/variables.scss
View File

@ -11,6 +11,9 @@ $gray-light: #767676;
$whitish: #e4e3e3; $whitish: #e4e3e3;
$white: #fff; $white: #fff;
// Mass white
$mass-white: #f5f5f5;
// Primary colors // Primary colors
$primary-light: #9dce0a; $primary-light: #9dce0a;
$primary: #5b8200; $primary: #5b8200;