From 9ad87d07ff3172bc95e15b4acda0156160962927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Tue, 11 Sep 2018 10:10:43 +0200 Subject: [PATCH 1/3] [28474] Add border to selected/checked row https://community.openproject.com/wp/28474 --- app/assets/stylesheets/content/_tables.sass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/assets/stylesheets/content/_tables.sass b/app/assets/stylesheets/content/_tables.sass index ee0f5389f0..d98a0fac02 100644 --- a/app/assets/stylesheets/content/_tables.sass +++ b/app/assets/stylesheets/content/_tables.sass @@ -161,6 +161,11 @@ tr.context-menu-selection, tr.-checked background-color: $table-row-highlighting-color + td + border-top: 1px solid #222 !important + border-bottom: 1px solid #222 !important + + #custom-options-table .custom-option-value display: inline-block From c4dba49cf4168234bc8bf516634b681865ee2ce2 Mon Sep 17 00:00:00 2001 From: Wieland Lindenthal Date: Tue, 11 Sep 2018 17:05:26 +0200 Subject: [PATCH 2/3] use css outline to highlight selected row --- app/assets/stylesheets/content/_tables.sass | 14 +++++++++----- lib/open_project/design.rb | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/content/_tables.sass b/app/assets/stylesheets/content/_tables.sass index d98a0fac02..34def410c5 100644 --- a/app/assets/stylesheets/content/_tables.sass +++ b/app/assets/stylesheets/content/_tables.sass @@ -158,13 +158,17 @@ th.hidden display: none tr.context-menu-selection, -tr.-checked - background-color: $table-row-highlighting-color +tr.-checked, +tr.-checked.-bright-row + background-color: $table-row-highlighting-color !important + outline: $table-row-highlighting-outline-color auto 4px td - border-top: 1px solid #222 !important - border-bottom: 1px solid #222 !important - + border-top: 1px solid $table-row-highlighting-color !important + border-bottom: 1px solid $table-row-highlighting-color !important + color: $body-font-color !important + a + color: $body-font-color !important #custom-options-table .custom-option-value diff --git a/lib/open_project/design.rb b/lib/open_project/design.rb index 7c027bdf41..bfe85da0ba 100644 --- a/lib/open_project/design.rb +++ b/lib/open_project/design.rb @@ -175,6 +175,7 @@ module OpenProject 'relations-save-button--disabled-color' => "$gray-dark", 'table-row-border-color' => "#E7E7E7", 'table-row-highlighting-color' => "#CCE6F7", + 'table-row-highlighting-outline-color' => "#00A6FF", 'table-row-relations-row-background-color' => "rgba(220,235,244, 0.6)", 'table-row-hierarchies-row-font-color' => "#6C7A89", 'table-header-border-color' => "#D7D7D7", From b1ff0167b8cddb6c4ecaaab99e764966514b9e0c Mon Sep 17 00:00:00 2001 From: Wieland Lindenthal Date: Tue, 11 Sep 2018 17:08:26 +0200 Subject: [PATCH 3/3] Add a space between label text and select box --- .../tabs/display-settings-tab.component.html | 2 +- .../configuration-modal/tabs/highlighting-tab.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/components/wp-table/configuration-modal/tabs/display-settings-tab.component.html b/frontend/src/app/components/wp-table/configuration-modal/tabs/display-settings-tab.component.html index 00d6562819..87291957ce 100644 --- a/frontend/src/app/components/wp-table/configuration-modal/tabs/display-settings-tab.component.html +++ b/frontend/src/app/components/wp-table/configuration-modal/tabs/display-settings-tab.component.html @@ -37,7 +37,7 @@ value="grouped" name="display_mode_switch"> - {{ text.label_group_by }} + {{ text.label_group_by }}