diff --git a/app/modules/attachments/attachments.scss b/app/modules/attachments/attachments.scss index f715d93e..fc1bfac8 100644 --- a/app/modules/attachments/attachments.scss +++ b/app/modules/attachments/attachments.scss @@ -20,7 +20,7 @@ .attachments-header { align-content: center; align-items: center; - background: $whitish; + background: $mass-white; display: flex; justify-content: space-between; min-height: 36px; diff --git a/app/modules/discover/components/discover-search-list-header/discover-search-list-header.scss b/app/modules/discover/components/discover-search-list-header/discover-search-list-header.scss index 2633faed..3a88d3d2 100644 --- a/app/modules/discover/components/discover-search-list-header/discover-search-list-header.scss +++ b/app/modules/discover/components/discover-search-list-header/discover-search-list-header.scss @@ -35,9 +35,9 @@ } .discover-search-subfilter { - @include arrow('bottom', $whitish, $whitish, 1, 8); + @include arrow('bottom', $mass-white, $mass-white, 1, 8); align-items: center; - background: $whitish; + background: $mass-white; display: flex; justify-content: space-between; position: relative; @@ -80,7 +80,7 @@ } &.active { background: $primary-light; - color: $whitish; + color: $white; } } } diff --git a/app/modules/home/home.scss b/app/modules/home/home.scss index c1fd038a..5d1d28f4 100644 --- a/app/modules/home/home.scss +++ b/app/modules/home/home.scss @@ -14,7 +14,7 @@ @include font-type(light); @include font-size(larger); align-content: center; - background: $whitish; + background: $mass-white; display: flex; margin: 0 0 .5rem; padding: .9rem 1rem; diff --git a/app/modules/home/working-on/empty.scss b/app/modules/home/working-on/empty.scss index aa10d7a3..848ffebd 100644 --- a/app/modules/home/working-on/empty.scss +++ b/app/modules/home/working-on/empty.scss @@ -31,7 +31,7 @@ } .line { - background: $whitish; + background: $mass-white; height: 1rem; margin-bottom: 1rem; width: 40vw; diff --git a/app/modules/profile/profile-contacts/profile-contacts.jade b/app/modules/profile/profile-contacts/profile-contacts.jade index 30306343..c4dc8b71 100644 --- a/app/modules/profile/profile-contacts/profile-contacts.jade +++ b/app/modules/profile/profile-contacts/profile-contacts.jade @@ -11,12 +11,6 @@ section.profile-contacts div(ng-if="vm.isCurrentUser") p(translate="USER.PROFILE.CURRENT_USER_CONTACTS_EMPTY") 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") a.list-itemtype-avatar(tg-nav="user-profile:username=contact.get('username')", title="{{::contact.get('name')}}") diff --git a/app/modules/profile/styles/profile-contacts.scss b/app/modules/profile/styles/profile-contacts.scss index 4479f9f7..a50fd678 100644 --- a/app/modules/profile/styles/profile-contacts.scss +++ b/app/modules/profile/styles/profile-contacts.scss @@ -3,20 +3,3 @@ display: flex; 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; - } - } -} diff --git a/app/modules/profile/styles/profile-sidebar.scss b/app/modules/profile/styles/profile-sidebar.scss index edfba05a..6ff361db 100644 --- a/app/modules/profile/styles/profile-sidebar.scss +++ b/app/modules/profile/styles/profile-sidebar.scss @@ -1,7 +1,7 @@ .profile-sidebar { h4 { @include font-type(bold); - background: $whitish; + background: $mass-white; color: $gray; margin-bottom: .5rem; padding: .5rem; @@ -19,7 +19,4 @@ a { color: $primary; } - .trans-button { - margin-bottom: 1rem; - } } diff --git a/app/modules/projects/listing/styles/project-list.scss b/app/modules/projects/listing/styles/project-list.scss index 4fa8d390..2bbf058f 100644 --- a/app/modules/projects/listing/styles/project-list.scss +++ b/app/modules/projects/listing/styles/project-list.scss @@ -2,7 +2,7 @@ position: relative; .project-list-title { align-items: center; - background: $whitish; + background: $mass-white; display: flex; justify-content: space-between; margin: 2rem 0 1rem; diff --git a/app/partials/contrib/main.jade b/app/partials/contrib/main.jade index 5ed1fd83..b1ffdf7b 100644 --- a/app/partials/contrib/main.jade +++ b/app/partials/contrib/main.jade @@ -1,6 +1,9 @@ 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 sidebar.menu-secondary.sidebar.settings-nav(tg-admin-navigation="contrib") diff --git a/app/partials/issue/issues-filters.jade b/app/partials/issue/issues-filters.jade index 95763e72..5c26bdd5 100644 --- a/app/partials/issue/issues-filters.jade +++ b/app/partials/issue/issues-filters.jade @@ -15,8 +15,7 @@ <% } %> <% }) %> span(class="new") -input( - class="hidden my-filter-name" +input.hidden.my-filter-name( type="text" placeholder="{{'ISSUES.PLACEHOLDER_FILTER_NAME' | translate}}" ) diff --git a/app/partials/issue/issues.jade b/app/partials/issue/issues.jade index 70f2f701..2e6adb2b 100644 --- a/app/partials/issue/issues.jade +++ b/app/partials/issue/issues.jade @@ -1,6 +1,10 @@ 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 sidebar.menu-secondary.extrabar.filters-bar(tg-issues-filters) include ../includes/modules/issues-filters diff --git a/app/styles/components/buttons.scss b/app/styles/components/buttons.scss index f6f95f46..b1f34cfd 100755 --- a/app/styles/components/buttons.scss +++ b/app/styles/components/buttons.scss @@ -33,13 +33,13 @@ } &.disabled, &[disabled] { - background: $whitish; + background: $mass-white; box-shadow: none; color: $gray-light; cursor: not-allowed; opacity: .65; &:hover { - background: $whitish; + background: $mass-white; color: $gray-light; } } diff --git a/app/styles/components/editor-help.scss b/app/styles/components/editor-help.scss index 9cd8c47d..86ffd625 100644 --- a/app/styles/components/editor-help.scss +++ b/app/styles/components/editor-help.scss @@ -1,5 +1,5 @@ .wysiwyg-help { - background: $whitish; + background: $mass-white; display: flex; justify-content: space-between; margin-top: -.5rem; diff --git a/app/styles/components/markitup.scss b/app/styles/components/markitup.scss index 93beffec..59dc99a2 100644 --- a/app/styles/components/markitup.scss +++ b/app/styles/components/markitup.scss @@ -1,6 +1,6 @@ .markItUpHeader { ul { - background: $whitish; + background: $mass-white; padding: .3rem; li { display: inline-block; @@ -30,7 +30,7 @@ .preview { .actions { - background: $whitish; + background: $mass-white; margin-top: .5rem; min-height: 2rem; padding: .3rem; diff --git a/app/styles/components/tag.scss b/app/styles/components/tag.scss index 3148af14..810eb23d 100644 --- a/app/styles/components/tag.scss +++ b/app/styles/components/tag.scss @@ -1,7 +1,7 @@ .tag { @include font-type(light); @include font-size(small); - background: $whitish; // Fallback + background: $mass-white; border-radius: 0 5px 5px 0; color: $grayer; display: inline-block; diff --git a/app/styles/components/track-btn.scss b/app/styles/components/track-btn.scss index 3ed50c71..221d893a 100644 --- a/app/styles/components/track-btn.scss +++ b/app/styles/components/track-btn.scss @@ -13,7 +13,7 @@ position: relative; .track-inner { align-items: center; - background: $whitish; + background: $mass-white; border-radius: 4px 0 0 4px; display: flex; flex: 1; @@ -22,7 +22,7 @@ margin-right: .1rem; min-width: 140px; &:hover { - background: darken($whitish, 5%); + background: darken($mass-white, 5%); transition: background .3s; } } @@ -131,7 +131,7 @@ justify-content: center; margin-right: .3rem; .vote-inner { - background: $whitish; + background: $mass-white; color: $gray-light; display: block; padding: 1rem; @@ -139,7 +139,7 @@ } a { &:hover { - background: darken($whitish, 5%); + background: darken($mass-white, 5%); color: $primary-dark; transition: background .3s; path { diff --git a/app/styles/layout/admin-project-values.scss b/app/styles/layout/admin-project-values.scss index c0863739..cae0e99f 100644 --- a/app/styles/layout/admin-project-values.scss +++ b/app/styles/layout/admin-project-values.scss @@ -40,7 +40,7 @@ .project-values-title { align-content: center; align-items: center; - background: $whitish; + background: $mass-white; display: flex; justify-content: space-between; padding: .8em 1rem; diff --git a/app/styles/layout/backlog.scss b/app/styles/layout/backlog.scss index 340aa1af..ec8c3afb 100644 --- a/app/styles/layout/backlog.scss +++ b/app/styles/layout/backlog.scss @@ -1,5 +1,5 @@ .backlog-menu { - background: $whitish; + background: $mass-white; color: $blackish; display: flex; justify-content: space-between; @@ -7,15 +7,15 @@ .trans-button { color: $blackish; display: inline-block; - padding: .4rem 1.5rem; + padding: .3rem 1.5rem; &.active, &:hover { - background: darken($whitish, 10%); - color: $grayer; + background: $whitish; + color: $gray; } &.active { &:hover { - background: lighten($gray, 30%); + background: darken($whitish, 10%); } } &.move-to-sprint { diff --git a/app/styles/layout/ticket-detail.scss b/app/styles/layout/ticket-detail.scss index 93017208..7021eca6 100644 --- a/app/styles/layout/ticket-detail.scss +++ b/app/styles/layout/ticket-detail.scss @@ -11,7 +11,7 @@ @include font-size(large); @include font-type(text); align-items: flex-start; - background: $whitish; + background: $mass-white; display: flex; flex: 1; flex-direction: column; @@ -217,7 +217,7 @@ transition: all .2s linear; } .editable { - background: $whitish; + background: $mass-white; cursor: pointer; } .no-description { @@ -255,7 +255,7 @@ } .view-description { .edit { - background: $whitish; + background: $mass-white; height: 2rem; left: 0; opacity: 0; diff --git a/app/styles/layout/wiki.scss b/app/styles/layout/wiki.scss index 696267da..6c661125 100644 --- a/app/styles/layout/wiki.scss +++ b/app/styles/layout/wiki.scss @@ -28,7 +28,7 @@ &.editable { &:hover { .wysiwyg { - background: $whitish; + background: $mass-white; cursor: pointer; } } @@ -44,7 +44,7 @@ } .edit { @include svg-size(2rem); - background: $whitish; + background: $mass-white; left: 0; opacity: 0; padding: .2rem .5rem; diff --git a/app/styles/modules/admin/admin-project-export.scss b/app/styles/modules/admin/admin-project-export.scss index 1a02135c..3508321e 100644 --- a/app/styles/modules/admin/admin-project-export.scss +++ b/app/styles/modules/admin/admin-project-export.scss @@ -15,7 +15,7 @@ h3 { @include font-type(bold); @include font-size(large); - background: $whitish; + background: $mass-white; color: $gray; margin: .5rem; padding: .5rem; diff --git a/app/styles/modules/admin/admin-project-profile.scss b/app/styles/modules/admin/admin-project-profile.scss index ed86342f..31060629 100644 --- a/app/styles/modules/admin/admin-project-profile.scss +++ b/app/styles/modules/admin/admin-project-profile.scss @@ -68,7 +68,7 @@ display: none; } label { - background: $whitish; + background: $mass-white; color: $grayer; text-align: center; transition: all .2s linear; @@ -101,13 +101,13 @@ } .privacy-project[disabled] { + label { - background: $whitish; + background: $mass-white; box-shadow: none; color: $gray-light; cursor: not-allowed; opacity: .65; &:hover { - background: $whitish; + background: $mass-white; color: $gray-light; } } diff --git a/app/styles/modules/backlog/backlog-table.scss b/app/styles/modules/backlog/backlog-table.scss index 81288a34..9a9d2b9e 100644 --- a/app/styles/modules/backlog/backlog-table.scss +++ b/app/styles/modules/backlog/backlog-table.scss @@ -183,6 +183,9 @@ } .gu-transit { background: $whitish; + } + .sortable-placeholder { + background: $mass-white; height: 40px; width: 100%; * { diff --git a/app/styles/modules/backlog/taskboard-table.scss b/app/styles/modules/backlog/taskboard-table.scss index 16b5f1f2..54509fbb 100644 --- a/app/styles/modules/backlog/taskboard-table.scss +++ b/app/styles/modules/backlog/taskboard-table.scss @@ -73,7 +73,7 @@ $column-margin: 0 10px 0 0; .task-colum-name { @include font-size(medium); align-items: center; - background: $whitish; + background: $mass-white; border-top: 3px solid $gray-light; color: $gray; display: flex; diff --git a/app/styles/modules/common/custom-fields.scss b/app/styles/modules/common/custom-fields.scss index d0efb714..8c840263 100644 --- a/app/styles/modules/common/custom-fields.scss +++ b/app/styles/modules/common/custom-fields.scss @@ -4,7 +4,7 @@ @include font-type(bold); align-content: space-between; align-items: center; - background: $whitish; + background: $mass-white; display: flex; justify-content: space-between; padding: .5rem 1rem; diff --git a/app/styles/modules/common/history.scss b/app/styles/modules/common/history.scss index 554454a2..52736c9f 100644 --- a/app/styles/modules/common/history.scss +++ b/app/styles/modules/common/history.scss @@ -236,7 +236,7 @@ width: calc(100% - 80px); } .changes { - background: $whitish; + background: $mass-white; .change-entry { display: none; &.active { diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss index 77e9644e..1d64e244 100644 --- a/app/styles/modules/common/lightbox.scss +++ b/app/styles/modules/common/lightbox.scss @@ -23,7 +23,7 @@ } label { @include font-size(xsmall); - background: $whitish; + background: $mass-white; border: 1px solid $gray-light; color: $grayer; cursor: pointer; diff --git a/app/styles/modules/common/related-tasks.scss b/app/styles/modules/common/related-tasks.scss index d34e27db..a2762c97 100644 --- a/app/styles/modules/common/related-tasks.scss +++ b/app/styles/modules/common/related-tasks.scss @@ -6,7 +6,7 @@ .related-tasks-header { align-content: center; align-items: center; - background: $whitish; + background: $mass-white; display: flex; justify-content: space-between; min-height: 36px; diff --git a/app/styles/modules/help/joyride.scss b/app/styles/modules/help/joyride.scss index 945a61cd..7a617736 100644 --- a/app/styles/modules/help/joyride.scss +++ b/app/styles/modules/help/joyride.scss @@ -51,7 +51,7 @@ color: $white; } &.introjs-disabled { - background: $whitish; + background: $mass-white; background-color: none; color: $white; } diff --git a/app/styles/modules/home-project.scss b/app/styles/modules/home-project.scss index 13e869f7..3da70541 100644 --- a/app/styles/modules/home-project.scss +++ b/app/styles/modules/home-project.scss @@ -55,7 +55,7 @@ @include font-type(text); @include font-type(bold); align-content: center; - background: $whitish; + background: $mass-white; display: flex; justify-content: space-between; margin-bottom: .5rem; diff --git a/app/styles/modules/kanban/kanban-table.scss b/app/styles/modules/kanban/kanban-table.scss index 1ea5bf03..8c1930eb 100644 --- a/app/styles/modules/kanban/kanban-table.scss +++ b/app/styles/modules/kanban/kanban-table.scss @@ -61,7 +61,7 @@ $column-margin: 0 10px 0 0; .task-colum-name { @include font-size(medium); align-items: center; - background: $whitish; + background: $mass-white; border-top: 3px solid $gray-light; color: $gray; display: flex; @@ -131,7 +131,7 @@ $column-margin: 0 10px 0 0; } } .kanban-uses-box { - background: $whitish; + background: $mass-white; } } diff --git a/app/themes/high-contrast/variables.scss b/app/themes/high-contrast/variables.scss index cd5ef6e6..1ecd40e2 100755 --- a/app/themes/high-contrast/variables.scss +++ b/app/themes/high-contrast/variables.scss @@ -16,6 +16,9 @@ $primary-light: #212121; $primary: #000; $primary-dark: #000; +// Mass white +$mass-white: #f5f5f5; + //Warning colors $red-light: #ff0062; $red: #ff2400; diff --git a/app/themes/material-design/custom.scss b/app/themes/material-design/custom.scss index 25252a9d..877e2884 100644 --- a/app/themes/material-design/custom.scss +++ b/app/themes/material-design/custom.scss @@ -79,7 +79,7 @@ input[type="date"], input[type="password"], select, textarea { - background: $whitish; + background: $mass-white; border-color: $primary; color: $grayer; @include placeholder { @@ -152,7 +152,7 @@ tg-project-menu { //Taskboard table .taskboard-table-header { .task-colum-name { - background: lighten($primary-light, 20%); + background: $mass-white; border-top: 3px solid $primary; .icon { fill: $primary; @@ -161,7 +161,7 @@ tg-project-menu { } .taskboard-table-body { .taskboard-tasks-box { - background: $whitish; + background: $mass-white; } } diff --git a/app/themes/material-design/variables.scss b/app/themes/material-design/variables.scss index c76c2e0b..f975e2c3 100755 --- a/app/themes/material-design/variables.scss +++ b/app/themes/material-design/variables.scss @@ -11,6 +11,9 @@ $gray-light: #BDBDBD; $whitish: #EEEEEE; $white: #fff; +// Mass white +$mass-white: #f5f5f5; + // Primary colors $primary-light: #8c9eff; $primary: #3f51b5; diff --git a/app/themes/taiga/custom.scss b/app/themes/taiga/custom.scss index 40fca1f4..c57561e0 100644 --- a/app/themes/taiga/custom.scss +++ b/app/themes/taiga/custom.scss @@ -15,7 +15,7 @@ body { // Secondary panel .menu-secondary { - background: $whitish; + background: $mass-white; } // Tertiary panel @@ -25,7 +25,7 @@ body { // Extra bar panel .extrabar { - background: $whitish; + background: $mass-white; } @@ -61,7 +61,7 @@ input[type="date"], input[type="password"], select, textarea { - background: lighten($whitish, 6%); + background: $mass-white; border-color: $gray-light; color: $grayer; @include placeholder { @@ -82,7 +82,7 @@ textarea { // Blockquote blockquote { - border-left: 5px solid $whitish; + border-left: 5px solid $mass-white; } blockquote, @@ -120,7 +120,7 @@ tg-project-menu { } .main-nav { - svg path { + svg { fill: $white; } } @@ -132,7 +132,7 @@ tg-project-menu { //Taskboard table .taskboard-table-header { .task-colum-name { - background: lighten($whitish, 5%); + background: $mass-white; border-top: 3px solid $gray-light; .icon { fill: $gray-light; @@ -141,7 +141,7 @@ tg-project-menu { } .taskboard-table-body { .taskboard-tasks-box { - background: lighten($whitish, 5%); + background: $mass-white; } } @@ -152,7 +152,7 @@ tg-project-menu { //Kanban table .kanban-table-header { .task-colum-name { - background: lighten($whitish, 5%); + background: $mass-white; border-top: 3px solid $gray-light; .icon { color: $gray-light; @@ -162,6 +162,6 @@ tg-project-menu { .kanban-table-body { .kanban-uses-box { - background: lighten($whitish, 5%); + background: $mass-white; } } diff --git a/app/themes/taiga/variables.scss b/app/themes/taiga/variables.scss index e8d00c10..ebc23064 100755 --- a/app/themes/taiga/variables.scss +++ b/app/themes/taiga/variables.scss @@ -11,6 +11,9 @@ $gray-light: #767676; $whitish: #e4e3e3; $white: #fff; +// Mass white +$mass-white: #f5f5f5; + // Primary colors $primary-light: #9dce0a; $primary: #5b8200;