From feb7f5a727a102771f8dc41dddb12c6a845c1549 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Thu, 4 Jun 2020 13:46:23 -0400 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Integrate=20tab=20rose?= =?UTF-8?q?=20component=20into=20ui/core?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/rose/addon/styles/rose/components/nav/_tab.scss | 2 +- ui/core/app/styles/app.scss | 8 ++++++++ ui/core/app/templates/orgs/org/projects/project.hbs | 6 +++++- ui/core/translations/en-us.yaml | 4 ++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/addons/rose/addon/styles/rose/components/nav/_tab.scss b/addons/rose/addon/styles/rose/components/nav/_tab.scss index 6eb332810..8bbad4116 100644 --- a/addons/rose/addon/styles/rose/components/nav/_tab.scss +++ b/addons/rose/addon/styles/rose/components/nav/_tab.scss @@ -19,7 +19,7 @@ color: var(--ui-gray-subtler-2); } - &:active { + &:active, &.active { color: var(--action); border-color: var(--action); background-color: var(--subtle); diff --git a/ui/core/app/styles/app.scss b/ui/core/app/styles/app.scss index 667cc9039..56c8e3df1 100644 --- a/ui/core/app/styles/app.scss +++ b/ui/core/app/styles/app.scss @@ -64,4 +64,12 @@ width: 100%; } } + + .tabs { + border-bottom: 2px solid #bac1cc; + display: flex; + flex-wrap: wrap; + flex-direction: row; + margin-bottom: 10px; + } } diff --git a/ui/core/app/templates/orgs/org/projects/project.hbs b/ui/core/app/templates/orgs/org/projects/project.hbs index 4c360b74c..3b20217e0 100644 --- a/ui/core/app/templates/orgs/org/projects/project.hbs +++ b/ui/core/app/templates/orgs/org/projects/project.hbs @@ -7,7 +7,11 @@ {{@model.name}} -

{{@model.name}}

+

{{t "resources.project.settings"}}

+ +
+ +