summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-09-20 10:28:14 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-09-20 10:28:14 +0100
commit55a7529621515eaeffa1424a281e639cf74be6cf (patch)
treeebee78af26a572ff2f68dec0d251a4080bff9865
parent87de569aabd2274427ae8d0c2168f8bbf8643da7 (diff)
downloadgitlab-ce-55a7529621515eaeffa1424a281e639cf74be6cf.tar.gz
is-active review changes
-rw-r--r--app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue4
-rw-r--r--app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue4
-rw-r--r--app/assets/stylesheets/pages/issuable.scss13
3 files changed, 9 insertions, 12 deletions
diff --git a/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue b/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue
index dfdd00cff47..f2b1099a678 100644
--- a/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue
+++ b/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue
@@ -70,11 +70,11 @@ export default {
:update-confidential-attribute="updateConfidentialAttribute"
/>
<div v-if="!isConfidential" class="no-value sidebar-item-value">
- <i class="fa fa-eye not-active"></i>
+ <i class="fa fa-eye sidebar-item-icon"></i>
Not confidential
</div>
<div v-else class="value sidebar-item-value hide-collapsed">
- <i aria-hidden="true" class="fa fa-eye-slash is-active"></i>
+ <i aria-hidden="true" class="fa fa-eye-slash sidebar-item-icon is-active"></i>
This issue is confidential
</div>
</div>
diff --git a/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue b/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue
index a6a39207648..9021d17dddf 100644
--- a/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue
+++ b/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue
@@ -95,12 +95,12 @@ export default {
/>
<div v-if="isLocked" class="value sidebar-item-value">
- <i aria-hidden="true" class="fa fa-lock is-active"></i>
+ <i aria-hidden="true" class="fa fa-lock sidebar-item-icon is-active"></i>
{{ __('Locked') }}
</div>
<div v-else class="no-value sidebar-item-value hide-collapsed">
- <i aria-hidden="true" class="fa fa-unlock not-active"></i>
+ <i aria-hidden="true" class="fa fa-unlock sidebar-item-icon"></i>
{{ __('Unlocked') }}
</div>
</div>
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index e0083be7be9..a88484d1a9e 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -16,15 +16,12 @@
text-align: center;
}
-.issuable-sidebar-item {
- .not-active,
- .is-active {
- border-radius: $border-radius-default;
- padding: 5px;
- margin: 0 3px 0 -4px;
- }
+.sidebar-item-icon {
+ border-radius: $border-radius-default;
+ padding: 5px;
+ margin: 0 3px 0 -4px;
- .is-active {
+ &.is-active {
color: $orange-600;
background-color: $orange-50;
}