summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-10-06 13:36:20 +0000
committerDouwe Maan <douwe@gitlab.com>2017-10-06 13:36:20 +0000
commitdd42cb5f8f4724fa899dae929975da78846f0950 (patch)
tree682d393b3e122b5fc988b78d3d188694ef317c12 /app/assets/stylesheets/pages
parent050548032475458a70005ed3f7ff74211084a423 (diff)
parent555f50b3e68e82968ea2eb4916a3f5beeeef7b31 (diff)
downloadgitlab-ce-dd42cb5f8f4724fa899dae929975da78846f0950.tar.gz
Merge branch '36829-gpg-commit-not-verified-if-signed-with-a-subkey' into 'master'
Add support for GPG subkeys in signature verification Closes #36829 See merge request gitlab-org/gitlab-ce!14517
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r--app/assets/stylesheets/pages/profile.scss9
1 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index 6c521bb06ee..eab39f698c3 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -108,6 +108,15 @@
}
}
+.subkeys-list {
+ @include basic-list;
+
+ li {
+ padding: 3px 0;
+ border: none;
+ }
+}
+
.key-list-item {
.key-list-item-info {
@media (min-width: $screen-sm-min) {