BigW Consortium Gitlab

Commit 8ccce9d5 by Alexis Reigel

use existing status-box css class for gpg badge

parent 3729c3a7
...@@ -284,22 +284,24 @@ ...@@ -284,22 +284,24 @@
} }
} }
.gpg-badge { .gpg-status-box {
&.valid { &.valid {
color: $brand-success; color: $brand-success;
border: 1px solid $brand-success;
} }
&.invalid { &.invalid {
color: $gray; color: $gray;
border: 1px solid $gray;
} }
} }
.gpg-badge-popover-title { .gpg-popover-title {
display: inline; display: inline;
font-weight: normal; font-weight: normal;
} }
.gpg-badge-popover-icon { .gpg-popover-icon {
float: left; float: left;
font-size: 35px; font-size: 35px;
line-height: 35px; line-height: 35px;
...@@ -315,12 +317,12 @@ ...@@ -315,12 +317,12 @@
} }
} }
.gpg-badge-popover-user-link { .gpg-popover-user-link {
text-decoration: none; text-decoration: none;
color: $gl-text-color; color: $gl-text-color;
} }
.gpg-badge-popover-avatar { .gpg-popover-avatar {
float: left; float: left;
margin-bottom: $gl-padding; margin-bottom: $gl-padding;
...@@ -329,11 +331,11 @@ ...@@ -329,11 +331,11 @@
} }
} }
.gpg-badge-popover-username { .gpg-popover-username {
font-weight: bold; font-weight: bold;
} }
.commit .gpg-badge-popover-help-link { .commit .gpg-popover-help-link {
display: block; display: block;
color: $link-color; color: $link-color;
} }
- title = capture do - title = capture do
%i{ class: 'fa fa-question-circle gpg-badge-popover-icon invalid', 'aria-hidden' => 'true' } %i{ class: 'fa fa-question-circle gpg-popover-icon invalid', 'aria-hidden' => 'true' }
This commit was signed with an unverified signature. This commit was signed with an unverified signature.
- locals = { signature: signature, title: title, label: 'Unverified', css_classes: ['invalid'] } - locals = { signature: signature, title: title, label: 'Unverified', css_classes: ['invalid'] }
......
- css_classes = %w(btn btn-xs gpg-badge) + css_classes - css_classes = %w(btn status-box gpg-status-box) + css_classes
- title = capture do - title = capture do
.gpg-badge-popover-title .gpg-popover-title
= title = title
- content = capture do - content = capture do
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
GPG key ID: GPG key ID:
= signature.gpg_key_primary_keyid = signature.gpg_key_primary_keyid
= link_to('Learn about signing commits', help_page_path('workflow/gpg_signed_commits/index.md'), class: 'gpg-badge-popover-help-link') = link_to('Learn about signing commits', help_page_path('workflow/gpg_signed_commits/index.md'), class: 'gpg-popover-help-link')
%button{ class: css_classes, data: { toggle: 'popover', html: 'true', placement: 'auto bottom', title: title, content: content } } %button{ class: css_classes, data: { toggle: 'popover', html: 'true', placement: 'auto bottom', title: title, content: content } }
= label = label
- title = capture do - title = capture do
%i{ class: 'fa fa-check-circle gpg-badge-popover-icon valid', 'aria-hidden' => 'true' } %i{ class: 'fa fa-check-circle gpg-popover-icon valid', 'aria-hidden' => 'true' }
This commit was signed with a verified signature. This commit was signed with a verified signature.
- content = capture do - content = capture do
- gpg_key = signature.gpg_key - gpg_key = signature.gpg_key
= link_to user_path(gpg_key.user), class: 'gpg-badge-popover-user-link' do = link_to user_path(gpg_key.user), class: 'gpg-popover-user-link' do
.gpg-badge-popover-avatar .gpg-popover-avatar
= user_avatar_without_link(user: signature.gpg_key.user, size: 32) = user_avatar_without_link(user: signature.gpg_key.user, size: 32)
.gpg-badge-popover-username .gpg-popover-username
= gpg_key.user.username = gpg_key.user.username
%div= gpg_key.user.name %div= gpg_key.user.name
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment