From 71463a2ec2af607a26195e8dc4e952940b0bfc31 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Fri, 3 Nov 2017 15:07:04 +0000 Subject: [PATCH 1/7] Limit tag width in the projects list table. --- services/web/public/stylesheets/app/project-list.less | 8 ++++++-- .../web/public/stylesheets/core/_common-variables.less | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/services/web/public/stylesheets/app/project-list.less b/services/web/public/stylesheets/app/project-list.less index 5e7442e1ce..ceaa09cce8 100644 --- a/services/web/public/stylesheets/app/project-list.less +++ b/services/web/public/stylesheets/app/project-list.less @@ -216,9 +216,9 @@ ul.folders-menu { } } a.tag-name { + position: relative; padding: @folders-tag-padding; display: @folders-tag-display; - position: relative; span.name { padding-left: 0.5em; line-height: @folders-tag-line-height; @@ -345,7 +345,11 @@ ul.project-list { .tag-label-name { padding-right: 0.3em; border-top-right-radius: 0; - border-bottom-right-radius: 0; + border-bottom-right-radius: 0; + max-width: @tag-max-width; + overflow: hidden; + text-overflow: ellipsis; + vertical-align: text-bottom; } .tag-label-remove { padding-left: 0.3em; diff --git a/services/web/public/stylesheets/core/_common-variables.less b/services/web/public/stylesheets/core/_common-variables.less index 3d3cc383a8..13308a0c5c 100644 --- a/services/web/public/stylesheets/core/_common-variables.less +++ b/services/web/public/stylesheets/core/_common-variables.less @@ -889,4 +889,5 @@ // Tags @tag-border-radius : 0.25em; @tag-bg-color : @label-default-bg; +@tag-max-width : 180px; @tag-bg-hover-color : darken(@label-default-bg, 10%); \ No newline at end of file From 81e831de24e1ae38e357535d4664eba2228d0234 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Fri, 3 Nov 2017 15:53:57 +0000 Subject: [PATCH 2/7] Right-align the projects toolbar; limit tags dropdown width. --- .../web/public/stylesheets/app/project-list.less | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/services/web/public/stylesheets/app/project-list.less b/services/web/public/stylesheets/app/project-list.less index ceaa09cce8..a1eee42e07 100644 --- a/services/web/public/stylesheets/app/project-list.less +++ b/services/web/public/stylesheets/app/project-list.less @@ -65,7 +65,7 @@ padding-top: @content-margin-vertical; padding-bottom: @content-margin-vertical; height: 100%; - overflow: hidden; + // overflow: hidden; } .project-header { @@ -81,6 +81,16 @@ .project-tools { display: inline; + float: right; +} + +.js-tags-dropdown-menu { + max-width: 50vw; + + &.dropdown-menu > li > a { + overflow: hidden; + text-overflow: ellipsis; + } } .first-project { From e26c52967ee6b2bcc72772d102267df618f64ed4 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Fri, 3 Nov 2017 16:20:39 +0000 Subject: [PATCH 3/7] Limit tag width a little more. --- services/web/public/stylesheets/core/_common-variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/public/stylesheets/core/_common-variables.less b/services/web/public/stylesheets/core/_common-variables.less index 13308a0c5c..0b5d3bf744 100644 --- a/services/web/public/stylesheets/core/_common-variables.less +++ b/services/web/public/stylesheets/core/_common-variables.less @@ -889,5 +889,5 @@ // Tags @tag-border-radius : 0.25em; @tag-bg-color : @label-default-bg; -@tag-max-width : 180px; +@tag-max-width : 150px; @tag-bg-hover-color : darken(@label-default-bg, 10%); \ No newline at end of file From 3593c4b221d0dbc6a35c763ad1b26466f80ad1a7 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Fri, 3 Nov 2017 16:20:49 +0000 Subject: [PATCH 4/7] Make tag widget non breakable. --- services/web/public/stylesheets/app/project-list.less | 1 + 1 file changed, 1 insertion(+) diff --git a/services/web/public/stylesheets/app/project-list.less b/services/web/public/stylesheets/app/project-list.less index a1eee42e07..792ef25d17 100644 --- a/services/web/public/stylesheets/app/project-list.less +++ b/services/web/public/stylesheets/app/project-list.less @@ -339,6 +339,7 @@ ul.project-list { position: relative; top: -2px; display: inline-block; + white-space: nowrap; } .tag-label-name, .tag-label-remove { From e757bd673e57661e3f858f1ca9dfcf102b0c9136 Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Mon, 6 Nov 2017 13:52:32 +0000 Subject: [PATCH 5/7] Move vertical align to affect label name & remove Fixes issue with Chrome where label was mis-aligned --- services/web/public/stylesheets/app/project-list.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/public/stylesheets/app/project-list.less b/services/web/public/stylesheets/app/project-list.less index 792ef25d17..66b715d37c 100644 --- a/services/web/public/stylesheets/app/project-list.less +++ b/services/web/public/stylesheets/app/project-list.less @@ -348,6 +348,7 @@ ul.project-list { color: #FFF; border-radius: @tag-border-radius; background-color: @tag-bg-color; + vertical-align: text-bottom; &:hover, &:focus { background-color: @tag-bg-hover-color; @@ -360,7 +361,6 @@ ul.project-list { max-width: @tag-max-width; overflow: hidden; text-overflow: ellipsis; - vertical-align: text-bottom; } .tag-label-remove { padding-left: 0.3em; From 888734655fb67535618c1357846e3da26154046b Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Tue, 7 Nov 2017 10:38:18 +0000 Subject: [PATCH 6/7] Remove commented-out code. --- services/web/public/stylesheets/app/project-list.less | 1 - 1 file changed, 1 deletion(-) diff --git a/services/web/public/stylesheets/app/project-list.less b/services/web/public/stylesheets/app/project-list.less index 66b715d37c..8ce69a60c1 100644 --- a/services/web/public/stylesheets/app/project-list.less +++ b/services/web/public/stylesheets/app/project-list.less @@ -65,7 +65,6 @@ padding-top: @content-margin-vertical; padding-bottom: @content-margin-vertical; height: 100%; - // overflow: hidden; } .project-header { From 68336457d82b725a23e6fa474343cb394b1f8fb8 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Tue, 7 Nov 2017 10:54:41 +0000 Subject: [PATCH 7/7] Avoid using js-prefixed classes for styling. --- services/web/app/views/project/list/project-list.pug | 2 +- services/web/public/stylesheets/app/project-list.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/web/app/views/project/list/project-list.pug b/services/web/app/views/project/list/project-list.pug index 2233ad7dfd..fa7b3a080b 100644 --- a/services/web/app/views/project/list/project-list.pug +++ b/services/web/app/views/project/list/project-list.pug @@ -53,7 +53,7 @@ i.fa.fa-folder-open-o | span.caret - ul.dropdown-menu.dropdown-menu-right.js-tags-dropdown-menu( + ul.dropdown-menu.dropdown-menu-right.js-tags-dropdown-menu.tags-dropdown-menu( role="menu" ng-controller="TagListController" ) diff --git a/services/web/public/stylesheets/app/project-list.less b/services/web/public/stylesheets/app/project-list.less index 8ce69a60c1..1568915296 100644 --- a/services/web/public/stylesheets/app/project-list.less +++ b/services/web/public/stylesheets/app/project-list.less @@ -83,7 +83,7 @@ float: right; } -.js-tags-dropdown-menu { +.tags-dropdown-menu { max-width: 50vw; &.dropdown-menu > li > a {