From 42264cedafd386d3615801763b33b94eb0050451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Wed, 14 Jan 2015 12:34:44 +0100 Subject: [PATCH 1/3] Fix search result table styles --- .../modules/search/search-result-table.scss | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/app/styles/modules/search/search-result-table.scss b/app/styles/modules/search/search-result-table.scss index 611c0ba2..03c85c59 100644 --- a/app/styles/modules/search/search-result-table.scss +++ b/app/styles/modules/search/search-result-table.scss @@ -7,23 +7,29 @@ } .row { - @include table-flex($align-content: center, $align-items: center); + align-content: center; + align-items: center; + display: flex; padding: .5rem; &:hover { background: lighten($green-taiga, 60%); transition: background .2s ease-in; } .user-stories { - @include table-flex-child(5, 0, 1); + flex-basis: 0; + flex-grow: 10; } .status, .points { - @include table-flex-child(1, 100px, 0); + flex-basis:100px; + flex-grow: 1; padding: 0 1rem; text-align: center; } .assigned-to { - @include table-flex-child(1, 250px, 0); + flex-basis:150px; + flex-grow: 1; + padding: 0 1rem; } } .row-selected { @@ -62,7 +68,7 @@ } .table-main { @extend %small; - border-bottom: 1px solid $gray-light; + border-bottom: 1px solid $whitish; } .status, .points { From 9406ca3a69d228cb57ac08162b35e1e19dca3b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Wed, 14 Jan 2015 12:36:56 +0100 Subject: [PATCH 2/3] Edit color to keep consistency across taiga --- app/styles/modules/search/search-filter.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/styles/modules/search/search-filter.scss b/app/styles/modules/search/search-filter.scss index 0e1a07c4..1e417502 100644 --- a/app/styles/modules/search/search-filter.scss +++ b/app/styles/modules/search/search-filter.scss @@ -12,13 +12,13 @@ @extend %title; opacity: .2; &:hover { - color: $blackish; + color: $gray; opacity: 1; transition: opacity .3s linear; } } .active { - color: $blackish; + color: $gray; opacity: 1; transition : opacity .3s linear; } From a1a118dbccdaa87cdfef944045085f698af6c282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Wed, 14 Jan 2015 12:50:22 +0100 Subject: [PATCH 3/3] Fix lint errors --- app/styles/modules/search/search-filter.scss | 2 +- app/styles/modules/search/search-result-table.scss | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/styles/modules/search/search-filter.scss b/app/styles/modules/search/search-filter.scss index 1e417502..55b88173 100644 --- a/app/styles/modules/search/search-filter.scss +++ b/app/styles/modules/search/search-filter.scss @@ -20,7 +20,7 @@ .active { color: $gray; opacity: 1; - transition : opacity .3s linear; + transition: opacity .3s linear; } .icon { margin-right: .4rem; diff --git a/app/styles/modules/search/search-result-table.scss b/app/styles/modules/search/search-result-table.scss index 03c85c59..80ed56f5 100644 --- a/app/styles/modules/search/search-result-table.scss +++ b/app/styles/modules/search/search-result-table.scss @@ -21,13 +21,13 @@ } .status, .points { - flex-basis:100px; + flex-basis: 100px; flex-grow: 1; padding: 0 1rem; text-align: center; } .assigned-to { - flex-basis:150px; + flex-basis: 150px; flex-grow: 1; padding: 0 1rem; }