summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-02-23 17:15:53 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-02-23 17:15:53 +0000
commitebc2829added6a1ce61070da5f137d87472c5b12 (patch)
treeb79783afcecee4f2c59f31dd4b5010aaadbd64dd
parent92ac835a7f0799cb53974c4bac43b9811a736849 (diff)
downloadgitlab-ce-ebc2829added6a1ce61070da5f137d87472c5b12.tar.gz
Fix gpg popover box
-rw-r--r--app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue2
-rw-r--r--app/assets/stylesheets/pages/commits.scss10
-rw-r--r--changelogs/unreleased/43315-gpg-popover.yml5
3 files changed, 11 insertions, 6 deletions
diff --git a/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue b/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue
index 63f20a0041d..c53ce0549f5 100644
--- a/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue
+++ b/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue
@@ -98,7 +98,7 @@
};
</script>
<template>
- <div>
+ <div class="realtime-ci-status-wrapper">
<loading-icon
label="Loading pipeline status"
size="3"
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index 17801ed5910..fa676abdc6c 100644
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -196,17 +196,17 @@
@media (min-width: $screen-sm-min) {
font-size: 0;
- div {
+ .realtime-ci-status-wrapper {
display: inline;
+
+ .ci-status-icon {
+ font-size: 6px;
+ }
}
.fa-spinner {
font-size: 12px;
}
-
- span {
- font-size: 6px;
- }
}
.ci-status-link {
diff --git a/changelogs/unreleased/43315-gpg-popover.yml b/changelogs/unreleased/43315-gpg-popover.yml
new file mode 100644
index 00000000000..4b2d197c627
--- /dev/null
+++ b/changelogs/unreleased/43315-gpg-popover.yml
@@ -0,0 +1,5 @@
+---
+title: Fixes gpg popover layout
+merge_request:
+author:
+type: fixed