From 67581a01e5e00de14c46b89bbcb35ee2a870d155 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 30 Sep 2020 15:31:55 -0400 Subject: [PATCH 1/3] =?UTF-8?q?chore:=20=F0=9F=A4=96=20add=20initial=20bou?= =?UTF-8?q?ndary-icons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/core/app/templates/application.hbs | 2 +- ui/core/app/templates/scopes/scope.hbs | 15 +++++++++++++++ .../scopes/scope/projects/project/_sidebar.hbs | 9 +++++++++ ui/core/public/boundary-icons/action-session.svg | 4 ++++ ui/core/public/boundary-icons/auth-method.svg | 4 ++++ ui/core/public/boundary-icons/gear.svg | 4 ++++ ui/core/public/boundary-icons/group.svg | 3 +++ ui/core/public/boundary-icons/host-catalogs.svg | 3 +++ ui/core/public/boundary-icons/org.svg | 3 +++ ui/core/public/boundary-icons/project.svg | 3 +++ ui/core/public/boundary-icons/roles.svg | 3 +++ ui/core/public/boundary-icons/target.svg | 3 +++ ui/core/public/boundary-icons/user-profile.svg | 3 +++ ui/core/public/boundary-icons/users.svg | 3 +++ 14 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 ui/core/public/boundary-icons/action-session.svg create mode 100644 ui/core/public/boundary-icons/auth-method.svg create mode 100644 ui/core/public/boundary-icons/gear.svg create mode 100644 ui/core/public/boundary-icons/group.svg create mode 100644 ui/core/public/boundary-icons/host-catalogs.svg create mode 100644 ui/core/public/boundary-icons/org.svg create mode 100644 ui/core/public/boundary-icons/project.svg create mode 100644 ui/core/public/boundary-icons/roles.svg create mode 100644 ui/core/public/boundary-icons/target.svg create mode 100644 ui/core/public/boundary-icons/user-profile.svg create mode 100644 ui/core/public/boundary-icons/users.svg diff --git a/ui/core/app/templates/application.hbs b/ui/core/app/templates/application.hbs index b38e02f4d..f8de5b3f9 100644 --- a/ui/core/app/templates/application.hbs +++ b/ui/core/app/templates/application.hbs @@ -17,7 +17,7 @@ {{t 'actions.change-password'}} diff --git a/ui/core/app/templates/scopes/scope.hbs b/ui/core/app/templates/scopes/scope.hbs index 04b437e4d..718ce849e 100644 --- a/ui/core/app/templates/scopes/scope.hbs +++ b/ui/core/app/templates/scopes/scope.hbs @@ -5,21 +5,36 @@ + {{t "resources.project.title_plural"}} + {{t "resources.user.title_plural"}} + {{t "resources.group.title_plural"}} + {{t "resources.role.title_plural"}} + {{t "resources.auth-method.title_plural"}} diff --git a/ui/core/app/templates/scopes/scope/projects/project/_sidebar.hbs b/ui/core/app/templates/scopes/scope/projects/project/_sidebar.hbs index b9d440b7c..5f7845697 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/_sidebar.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/_sidebar.hbs @@ -1,11 +1,20 @@ + {{t "resources.session.title_plural"}} + {{t "resources.target.title_plural"}} + {{t "resources.host-catalog.title_plural"}} diff --git a/ui/core/public/boundary-icons/action-session.svg b/ui/core/public/boundary-icons/action-session.svg new file mode 100644 index 000000000..6a9d8ca21 --- /dev/null +++ b/ui/core/public/boundary-icons/action-session.svg @@ -0,0 +1,4 @@ + + + + diff --git a/ui/core/public/boundary-icons/auth-method.svg b/ui/core/public/boundary-icons/auth-method.svg new file mode 100644 index 000000000..8e3768084 --- /dev/null +++ b/ui/core/public/boundary-icons/auth-method.svg @@ -0,0 +1,4 @@ + + + + diff --git a/ui/core/public/boundary-icons/gear.svg b/ui/core/public/boundary-icons/gear.svg new file mode 100644 index 000000000..d2bca3dc7 --- /dev/null +++ b/ui/core/public/boundary-icons/gear.svg @@ -0,0 +1,4 @@ + + + + diff --git a/ui/core/public/boundary-icons/group.svg b/ui/core/public/boundary-icons/group.svg new file mode 100644 index 000000000..2d2966c5a --- /dev/null +++ b/ui/core/public/boundary-icons/group.svg @@ -0,0 +1,3 @@ + + + diff --git a/ui/core/public/boundary-icons/host-catalogs.svg b/ui/core/public/boundary-icons/host-catalogs.svg new file mode 100644 index 000000000..18372da0c --- /dev/null +++ b/ui/core/public/boundary-icons/host-catalogs.svg @@ -0,0 +1,3 @@ + + + diff --git a/ui/core/public/boundary-icons/org.svg b/ui/core/public/boundary-icons/org.svg new file mode 100644 index 000000000..238cc8435 --- /dev/null +++ b/ui/core/public/boundary-icons/org.svg @@ -0,0 +1,3 @@ + + + diff --git a/ui/core/public/boundary-icons/project.svg b/ui/core/public/boundary-icons/project.svg new file mode 100644 index 000000000..5b9515d08 --- /dev/null +++ b/ui/core/public/boundary-icons/project.svg @@ -0,0 +1,3 @@ + + + diff --git a/ui/core/public/boundary-icons/roles.svg b/ui/core/public/boundary-icons/roles.svg new file mode 100644 index 000000000..a0b92dd37 --- /dev/null +++ b/ui/core/public/boundary-icons/roles.svg @@ -0,0 +1,3 @@ + + + diff --git a/ui/core/public/boundary-icons/target.svg b/ui/core/public/boundary-icons/target.svg new file mode 100644 index 000000000..1889f89e5 --- /dev/null +++ b/ui/core/public/boundary-icons/target.svg @@ -0,0 +1,3 @@ + + + diff --git a/ui/core/public/boundary-icons/user-profile.svg b/ui/core/public/boundary-icons/user-profile.svg new file mode 100644 index 000000000..f70d94404 --- /dev/null +++ b/ui/core/public/boundary-icons/user-profile.svg @@ -0,0 +1,3 @@ + + + diff --git a/ui/core/public/boundary-icons/users.svg b/ui/core/public/boundary-icons/users.svg new file mode 100644 index 000000000..e086f6503 --- /dev/null +++ b/ui/core/public/boundary-icons/users.svg @@ -0,0 +1,3 @@ + + + From 19cc18c4f69f7974aa5b077fd065a32b80a96a46 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 30 Sep 2020 15:59:57 -0400 Subject: [PATCH 2/3] chore: increase right margin on sidebar icons --- ui/core/app/styles/app.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/core/app/styles/app.scss b/ui/core/app/styles/app.scss index 3acf2edab..c05790a04 100644 --- a/ui/core/app/styles/app.scss +++ b/ui/core/app/styles/app.scss @@ -25,6 +25,10 @@ & + .rose-nav-sidebar { margin-top: 0; } + + .rose-icon { + margin-right: sizing.rems(xs); + } } .rose-form { From a5a69b06742d0879e5f7e021e0e40c7ca5b9b7e5 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 30 Sep 2020 16:00:11 -0400 Subject: [PATCH 3/3] chore: remove underline on sidebar nav hover --- addons/rose/addon/styles/rose/components/nav/_sidebar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/rose/addon/styles/rose/components/nav/_sidebar.scss b/addons/rose/addon/styles/rose/components/nav/_sidebar.scss index 90e84159a..010a3bd52 100644 --- a/addons/rose/addon/styles/rose/components/nav/_sidebar.scss +++ b/addons/rose/addon/styles/rose/components/nav/_sidebar.scss @@ -32,7 +32,7 @@ } &:hover { - text-decoration: underline; + //text-decoration: underline; color: var(--action); background-color: var(--action-subtler-1h); }