From b631aef22d8c93e4a52ebb82646a0dbd0e6d710a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Fri, 30 Jan 2015 08:16:29 +0100 Subject: [PATCH 1/8] Redesign role points selector --- app/styles/layout/us-detail.scss | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss index 174e1322..67853687 100644 --- a/app/styles/layout/us-detail.scss +++ b/app/styles/layout/us-detail.scss @@ -263,23 +263,27 @@ .points-per-role { display: flex; + flex-wrap: wrap; position: relative; > li { - border-right: 1px solid rgba($grayer, .3); + background: rgba($gray-light, .1); + border-radius: 2px; color: rgba($grayer, .3); - display: inline-block; - flex-basis: 18%; + flex-basis: 80px; flex-grow: 1; - margin: .5rem .1rem; + flex-shrink: 0; + margin: .1rem; + padding: .5rem; position: relative; text-align: center; transition: color .3s linear; - width: 18%; &.active { - color: rgba($green-taiga, 1); + background: rgba($fresh-taiga, .9); + color: $whitish; } &:first-child { - opacity: 1; + background: rgba($grayer, .5); + color: $whitish; } &:last-child { border: 0; @@ -289,15 +293,14 @@ @extend %xlarge; @extend %title; display: block; + margin-bottom: .3rem; text-align: center; } .role { + @include ellipsis(90%); display: inline-block; - max-width: 90%; - overflow: hidden; + line-height: .8rem; text-align: center; - text-overflow: ellipsis; - white-space: nowrap; } .popover { @include popover(200px, $top: 105%, $left: 35%, $arrow-width: 10px, $arrow-top: -5px, $arrow-left: 10px); From 5e4c64a7f055f5c82f96f1ab8950b559359522e6 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Fri, 30 Jan 2015 07:50:01 +0100 Subject: [PATCH 2/8] fix assigned to issues overflow --- app/styles/modules/issues/issues-table.scss | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/styles/modules/issues/issues-table.scss b/app/styles/modules/issues/issues-table.scss index 3e358adf..9ff1a1fc 100644 --- a/app/styles/modules/issues/issues-table.scss +++ b/app/styles/modules/issues/issues-table.scss @@ -52,11 +52,9 @@ width: 75px; } .subject { - flex-basis: 300px; - flex-grow: 7; - flex-shrink: 0; overflow: hidden; padding-right: 1rem; + width: 100%; a { @include ellipsis(100%); display: block; @@ -72,13 +70,17 @@ .assigned-field, .created-field , .assigned-field { - flex-basis: 120px; + flex-basis: 140px; flex-grow: 1; flex-shrink: 0; padding: 0 1rem; position: relative; text-align: left; } + .assigned-field { + flex: 0 0 160px; + max-width: 160px; + } .issue-assignedto { cursor: pointer; position: relative; From f8b4b0130ee8855282a9fab92da0d8860ab34a62 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Fri, 30 Jan 2015 09:36:31 +0100 Subject: [PATCH 3/8] fix paginator margin --- app/styles/components/paginator.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/styles/components/paginator.scss b/app/styles/components/paginator.scss index 6cfaaf04..7d4ec1e3 100644 --- a/app/styles/components/paginator.scss +++ b/app/styles/components/paginator.scss @@ -1,17 +1,17 @@ .paginator { margin: 2rem 0; ul { + display: flex; margin-left: 1rem; } li { - display: inline-block; + margin-right: .4rem; } a, .active span, .dots { background: $gray-light; color: $white; - margin-right: .1rem; padding: .5rem 1rem; transition: all .3s linear; } From fad7819d611195a4637c4b342bdd529bc0387f86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Fri, 30 Jan 2015 12:30:49 +0100 Subject: [PATCH 4/8] Excluded plugins from lint and necessary qualiying elements --- scsslint.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/scsslint.yml b/scsslint.yml index 77f808be..e8543b80 100644 --- a/scsslint.yml +++ b/scsslint.yml @@ -1,3 +1,8 @@ +exclude: + - 'app/styles/components/markitup.scss' + - 'app/styles/bourbon/**' + - 'app/styles/vendor/**' + linters: BorderZero: enabled: true @@ -77,6 +82,15 @@ linters: enabled: true extra_properties: [] + QualifyingElement: + enabled: true + allow_element_with_attribute: true + exclude: + - 'app/styles/components/buttons.scss' + - 'app/styles/layout/forms.scss' + - 'app/styles/components/help-notion-button.scss' + - 'app/styles/components/markdown-help.scss' + SelectorDepth: enabled: true max_depth: 4 From 61c97358bfa450a06137c54e2094bc681ef6b45c Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 30 Jan 2015 12:51:59 +0100 Subject: [PATCH 5/8] Fixing config in navurls --- app/coffee/modules/base/urls.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/coffee/modules/base/urls.coffee b/app/coffee/modules/base/urls.coffee index f6d9e061..c542476a 100644 --- a/app/coffee/modules/base/urls.coffee +++ b/app/coffee/modules/base/urls.coffee @@ -30,7 +30,7 @@ class UrlsService extends taiga.Service constructor: (@config) -> @.urls = {} - @.mainUrl = config.get("api") + @.mainUrl = @config.get("api") update: (urls) -> @.urls = _.merge(@.urls, urls) From ed3536157e9045bc22efd99687317e236df13957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Mon, 2 Feb 2015 14:02:05 +0100 Subject: [PATCH 6/8] Fix line-height and font-size --- app/styles/layout/us-detail.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss index 67853687..4730efae 100644 --- a/app/styles/layout/us-detail.scss +++ b/app/styles/layout/us-detail.scss @@ -297,9 +297,10 @@ text-align: center; } .role { + @extend %small; @include ellipsis(90%); display: inline-block; - line-height: .8rem; + line-height: 1rem; text-align: center; } .popover { From b62978080462aa4f488657e53b7c0eedd7cecb2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Tue, 3 Feb 2015 08:39:41 +0100 Subject: [PATCH 7/8] Fixed width and height --- app/styles/layout/us-detail.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss index 4730efae..ebf4b7e3 100644 --- a/app/styles/layout/us-detail.scss +++ b/app/styles/layout/us-detail.scss @@ -273,6 +273,7 @@ flex-grow: 1; flex-shrink: 0; margin: .1rem; + max-width: 50%; padding: .5rem; position: relative; text-align: center; From 09235a9bc5f49c19047ec784132beb99868f9a82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Tue, 3 Feb 2015 09:04:38 +0100 Subject: [PATCH 8/8] Fix padding --- app/styles/layout/us-detail.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss index ebf4b7e3..bbc26169 100644 --- a/app/styles/layout/us-detail.scss +++ b/app/styles/layout/us-detail.scss @@ -274,7 +274,7 @@ flex-shrink: 0; margin: .1rem; max-width: 50%; - padding: .5rem; + padding: .5rem 0 .1rem; position: relative; text-align: center; transition: color .3s linear;