summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-03-07 12:26:39 +0000
committerAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-03-07 12:26:39 +0000
commite382611d3b5ea2f8c2bd6b6aa54b0f69702bff21 (patch)
tree3e28d2892d146d0f198f5d8d3c96d9381c28ad95
parent886179246c319f2d3d42cc2ee280d7b5b0e5be49 (diff)
parentf3c814f3e9a21f14a7d648c98039a1080cd872fe (diff)
downloadgitlab-ce-e382611d3b5ea2f8c2bd6b6aa54b0f69702bff21.tar.gz
Merge branch '47869-jobs-tab-border-top-in-pipeline-s-page-is-1px-off' into 'master'
Resolve "Jobs tab border top in pipeline's page is 1px off" Closes #47869 See merge request gitlab-org/gitlab-ce!24878
-rw-r--r--app/assets/stylesheets/framework/tables.scss1
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss10
-rw-r--r--changelogs/unreleased/47869-jobs-tab-border-top-in-pipeline-s-page-is-1px-off.yml5
3 files changed, 11 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/tables.scss b/app/assets/stylesheets/framework/tables.scss
index 295a5b5ee7a..ba406bac50b 100644
--- a/app/assets/stylesheets/framework/tables.scss
+++ b/app/assets/stylesheets/framework/tables.scss
@@ -161,4 +161,3 @@ table {
border-top: 0;
}
}
-
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index acc562f0769..2b6319ddd4f 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -341,13 +341,15 @@
&.builds .ci-table tr {
height: 71px;
}
-}
-.build-failures {
- th {
- border-top: 0;
+ .ci-table {
+ thead th {
+ border-top: 0;
+ }
}
+}
+.build-failures {
.build-state {
padding: 20px 2px;
diff --git a/changelogs/unreleased/47869-jobs-tab-border-top-in-pipeline-s-page-is-1px-off.yml b/changelogs/unreleased/47869-jobs-tab-border-top-in-pipeline-s-page-is-1px-off.yml
new file mode 100644
index 00000000000..e08d2a99369
--- /dev/null
+++ b/changelogs/unreleased/47869-jobs-tab-border-top-in-pipeline-s-page-is-1px-off.yml
@@ -0,0 +1,5 @@
+---
+title: Resolve Jobs tab border top in pipeline's page is 1px off
+merge_request: 24878
+author:
+type: fixed