From cfd95cd86aee6003686854f8502c2694c204df60 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Tue, 6 Oct 2020 12:51:54 -0400
Subject: [PATCH 1/3] fix: remove flexbox styles on dropdown

---
 .../rose/addon/styles/rose/components/dropdown/_dropdown.scss   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss b/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss
index d3256071b..b80cd538b 100644
--- a/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss
+++ b/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss
@@ -14,8 +14,6 @@ $chevronWhite: "data:image/svg+xml;utf-8,<svg viewBox='0 0 24 24' fill='%23fffff
     @include type.type(button, semibold);
     cursor: default;
     overflow: hidden;
-    display: flex;
-    align-items: center;
     $yPadding: sizing.rems(xxs) + sizing.rems(xxxs);
     padding: $yPadding sizing.rems(m) $yPadding sizing.rems(l);
     color: var(--stark);

From d28dc9708bf6ef050c816ed1e2e25435b50a9cff Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Tue, 6 Oct 2020 13:38:26 -0400
Subject: [PATCH 2/3] =?UTF-8?q?chore:=20=F0=9F=A4=96=20after=20navigating?=
 =?UTF-8?q?=20to=20a=20project,=20IAM=20should=20not=20appear?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/core/app/routes/scopes/scope.js            | 16 +++++++++++
 .../routes/scopes/scope/projects/project.js   |  2 +-
 ui/core/app/templates/scopes/scope.hbs        | 27 -------------------
 .../app/templates/scopes/scope/-sidebar.hbs   | 26 ++++++++++++++++++
 .../project/{_sidebar.hbs => -sidebar.hbs}    |  0
 5 files changed, 43 insertions(+), 28 deletions(-)
 create mode 100644 ui/core/app/templates/scopes/scope/-sidebar.hbs
 rename ui/core/app/templates/scopes/scope/projects/project/{_sidebar.hbs => -sidebar.hbs} (100%)

diff --git a/ui/core/app/routes/scopes/scope.js b/ui/core/app/routes/scopes/scope.js
index ef8aa1273..58c145667 100644
--- a/ui/core/app/routes/scopes/scope.js
+++ b/ui/core/app/routes/scopes/scope.js
@@ -43,4 +43,20 @@ export default class ScopesScopeRoute extends Route {
     const scope = this.modelFor('scopes.scope');
     this.controllerFor('application').set('scope', scope);
   }
+
+  /**
+   * Renders the scope-specific sidebar template.
+   * @override
+   * @param {object} controller
+   * @param {object} model
+   */
+  renderTemplate(controller, model) {
+    super.renderTemplate(...arguments);
+
+    this.render('scopes/scope/-sidebar', {
+      into: 'scopes/scope',
+      outlet: 'sidebar',
+      model: model,
+    });
+  }
 }
diff --git a/ui/core/app/routes/scopes/scope/projects/project.js b/ui/core/app/routes/scopes/scope/projects/project.js
index bf92852d2..0f3e7dbdb 100644
--- a/ui/core/app/routes/scopes/scope/projects/project.js
+++ b/ui/core/app/routes/scopes/scope/projects/project.js
@@ -22,7 +22,7 @@ export default class ScopesScopeProjectsProjectRoute extends Route {
   renderTemplate(controller, model) {
     super.renderTemplate(...arguments);
 
-    this.render('scopes/scope/projects/project/_sidebar', {
+    this.render('scopes/scope/projects/project/-sidebar', {
       into: 'scopes/scope',
       outlet: 'sidebar',
       model: model,
diff --git a/ui/core/app/templates/scopes/scope.hbs b/ui/core/app/templates/scopes/scope.hbs
index 718ce849e..2d7d21026 100644
--- a/ui/core/app/templates/scopes/scope.hbs
+++ b/ui/core/app/templates/scopes/scope.hbs
@@ -12,33 +12,6 @@
         </nav.link>
       </Rose::Nav::Sidebar>
 
-      <Rose::Nav::Sidebar @title={{t "titles.iam"}} as |nav|>
-        <nav.link @route="scopes.scope.users">
-          <Rose::Icon
-            @name="boundary-icons/users"
-            @size="medium" />
-          {{t "resources.user.title_plural"}}
-        </nav.link>
-        <nav.link @route="scopes.scope.groups">
-          <Rose::Icon
-            @name="boundary-icons/group"
-            @size="medium" />
-          {{t "resources.group.title_plural"}}
-        </nav.link>
-        <nav.link @route="scopes.scope.roles">
-          <Rose::Icon
-            @name="boundary-icons/roles"
-            @size="medium" />
-          {{t "resources.role.title_plural"}}
-        </nav.link>
-        <nav.link @route="scopes.scope.auth-methods">
-          <Rose::Icon
-            @name="boundary-icons/auth-method"
-            @size="medium" />
-          {{t "resources.auth-method.title_plural"}}
-        </nav.link>
-      </Rose::Nav::Sidebar>
-
       {{outlet "sidebar"}}
 
     </sidebarLayout.sidebar>
diff --git a/ui/core/app/templates/scopes/scope/-sidebar.hbs b/ui/core/app/templates/scopes/scope/-sidebar.hbs
new file mode 100644
index 000000000..27852d3ec
--- /dev/null
+++ b/ui/core/app/templates/scopes/scope/-sidebar.hbs
@@ -0,0 +1,26 @@
+<Rose::Nav::Sidebar @title={{t "titles.iam"}} as |nav|>
+  <nav.link @route="scopes.scope.users">
+    <Rose::Icon
+      @name="boundary-icons/users"
+      @size="medium" />
+    {{t "resources.user.title_plural"}}
+  </nav.link>
+  <nav.link @route="scopes.scope.groups">
+    <Rose::Icon
+      @name="boundary-icons/group"
+      @size="medium" />
+    {{t "resources.group.title_plural"}}
+  </nav.link>
+  <nav.link @route="scopes.scope.roles">
+    <Rose::Icon
+      @name="boundary-icons/roles"
+      @size="medium" />
+    {{t "resources.role.title_plural"}}
+  </nav.link>
+  <nav.link @route="scopes.scope.auth-methods">
+    <Rose::Icon
+      @name="boundary-icons/auth-method"
+      @size="medium" />
+    {{t "resources.auth-method.title_plural"}}
+  </nav.link>
+</Rose::Nav::Sidebar>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/_sidebar.hbs b/ui/core/app/templates/scopes/scope/projects/project/-sidebar.hbs
similarity index 100%
rename from ui/core/app/templates/scopes/scope/projects/project/_sidebar.hbs
rename to ui/core/app/templates/scopes/scope/projects/project/-sidebar.hbs

From c1177ec7f57cdf43d732ca375311408c2cfb7b4c Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Tue, 6 Oct 2020 13:39:45 -0400
Subject: [PATCH 3/3] chore: style lint cleanup

---
 ui/core/.sasslintrc         | 7 +++++++
 ui/core/app/styles/app.scss | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 ui/core/.sasslintrc

diff --git a/ui/core/.sasslintrc b/ui/core/.sasslintrc
new file mode 100644
index 000000000..fbccde1bf
--- /dev/null
+++ b/ui/core/.sasslintrc
@@ -0,0 +1,7 @@
+files:
+  include: 'app/styles/**/*.s+(a|c)ss'
+rules:
+  leading-zero: 0
+  mixins-before-declarations: 0
+  nesting-depth: 0
+  placeholder-in-extend: 0
diff --git a/ui/core/app/styles/app.scss b/ui/core/app/styles/app.scss
index 8a45265fa..ba376f696 100644
--- a/ui/core/app/styles/app.scss
+++ b/ui/core/app/styles/app.scss
@@ -95,7 +95,7 @@
 
 .copyable {
   white-space: nowrap;
-  
+
   .copyable-button {
     margin: 0;
     padding: 0 sizing.rems(xxs);
@@ -104,9 +104,10 @@
   }
 
   mark {
-    color: inherit;
-    background-color: transparent;
     animation: fadeBackground 0.75s linear;
+    background-color: transparent;
+    color: inherit;
+
     @keyframes fadeBackground {
       0%   { background-color: var(--action-subtler-1); }
       100% { background-color: transparent; }