From f80c9215686089ee4e385995fee14970042cd16d Mon Sep 17 00:00:00 2001 From: Martin Rojas Miguel Angel Date: Mon, 30 Apr 2018 15:34:49 +0200 Subject: [PATCH] TSK-466 Incorporate new Taskana logo --- .../list/classification-list.component.html | 2 +- .../access-items/access-items.component.html | 2 +- .../dual-list/dual-list.component.scss | 4 +- .../workbasket-information.component.html | 2 +- .../workbasket-list-toolbar.component.html | 2 +- .../list/workbasket-list.component.scss | 12 -- .../components/nav-bar/nav-bar.component.html | 12 +- .../components/nav-bar/nav-bar.component.scss | 19 +- .../components/nav-bar/nav-bar.component.ts | 8 +- web/src/assets/_colors.scss | 6 +- web/src/assets/_site.scss | 21 +- web/src/assets/icons/logo-copy.svg | 178 +++++++++++++++++ web/src/assets/icons/logo.svg | 179 +++++++++++++++++- 13 files changed, 401 insertions(+), 46 deletions(-) create mode 100644 web/src/assets/icons/logo-copy.svg diff --git a/web/src/app/administration/classification/master/list/classification-list.component.html b/web/src/app/administration/classification/master/list/classification-list.component.html index 290caa6fc..b51b06d06 100644 --- a/web/src/app/administration/classification/master/list/classification-list.component.html +++ b/web/src/app/administration/classification/master/list/classification-list.component.html @@ -3,7 +3,7 @@
diff --git a/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.scss b/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.scss index 9a401ae20..db322d461 100644 --- a/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.scss +++ b/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.scss @@ -1,3 +1,5 @@ +$selected-item: #e3f3f5; + .dual-list { min-height: 290px; padding: 0px; @@ -46,7 +48,7 @@ ul>li { border-color: #ddd; } &.list-group-item.selected { - background-color: #e9f2fc; + background-color: $selected-item; } } diff --git a/web/src/app/administration/workbasket/details/information/workbasket-information.component.html b/web/src/app/administration/workbasket/details/information/workbasket-information.component.html index 0169dc4af..ec67813be 100644 --- a/web/src/app/administration/workbasket/details/information/workbasket-information.component.html +++ b/web/src/app/administration/workbasket/details/information/workbasket-information.component.html @@ -5,7 +5,7 @@
diff --git a/web/src/app/administration/workbasket/master/list/workbasket-list.component.scss b/web/src/app/administration/workbasket/master/list/workbasket-list.component.scss index eed93ab90..f3bee29b8 100644 --- a/web/src/app/administration/workbasket/master/list/workbasket-list.component.scss +++ b/web/src/app/administration/workbasket/master/list/workbasket-list.component.scss @@ -39,15 +39,3 @@ li > div.row > dl:first-child { border-top: none; padding: 0px } - -li.list-group-item:hover, { - color: #555; - text-decoration: none; - background-color: #f5f5f5; -} - -li.list-group-item.active:hover, { - color: #fff; - background-color: #337ab7; - border-color: #337ab7; -} diff --git a/web/src/app/components/nav-bar/nav-bar.component.html b/web/src/app/components/nav-bar/nav-bar.component.html index 2a2417291..2154cc188 100644 --- a/web/src/app/components/nav-bar/nav-bar.component.html +++ b/web/src/app/components/nav-bar/nav-bar.component.html @@ -9,10 +9,8 @@
@@ -36,10 +34,8 @@ aria-expanded="true">