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/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/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; }
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 @@
-
-
-
- {{t "resources.user.title_plural"}}
-
-
-
- {{t "resources.group.title_plural"}}
-
-
-
- {{t "resources.role.title_plural"}}
-
-
-
- {{t "resources.auth-method.title_plural"}}
-
-
-
{{outlet "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 @@
+
+
+
+ {{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
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