summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-10-18 19:38:01 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-10-18 19:38:01 +0000
commit2c00d00ec1c39dbea0e0e54265027b5476b78e3c (patch)
tree615b547e97547142732580c73cf36363cb6306be /app/assets/stylesheets/pages
parent60c08db159f7e556820670f35696a90a42198395 (diff)
parent4e386a2c221432ccba32810725fbfefb1d60ec5c (diff)
downloadgitlab-ce-2c00d00ec1c39dbea0e0e54265027b5476b78e3c.tar.gz
Merge branch '19991-triggered-pipeline' into 'master'
Triggered pipelines #### What does this MR do? Separates trigger into its own column #### Screenshots (if relevant) ![Screen_Shot_2016-10-07_at_4.21.54_PM](/uploads/092e8205d329b66b34045fe17c5e6e4f/Screen_Shot_2016-10-07_at_4.21.54_PM.png) ![Screen_Shot_2016-10-17_at_9.13.10_AM](/uploads/7df90e0e2a07a9f282df3605787d3cc2/Screen_Shot_2016-10-17_at_9.13.10_AM.png) ![Screen_Shot_2016-10-17_at_9.15.07_AM](/uploads/b7dc0307c8549e72c3f812c3cd91833a/Screen_Shot_2016-10-17_at_9.15.07_AM.png) #### What are the relevant issue numbers? Closes #19991 See merge request !6753
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss39
1 files changed, 22 insertions, 17 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 75aa44b6cea..e6c3781ab56 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -23,10 +23,17 @@
.table.ci-table {
min-width: 1200px;
- .branch-commit {
- width: 33%;
+ .pipeline-id {
+ color: $black;
}
+ .branch-commit {
+ width: 30%;
+
+ .branch-name {
+ width: 195px
+ }
+ }
}
}
@@ -92,6 +99,15 @@
}
}
+ .avatar {
+ margin-left: 0;
+ float: none;
+ }
+
+ .api {
+ color: $code-color;
+ }
+
.branch-commit {
.branch-name {
@@ -119,7 +135,6 @@
.commit-id {
color: $gl-link-color;
- margin-right: 8px;
}
.commit-title {
@@ -130,10 +145,6 @@
text-overflow: ellipsis;
}
- .avatar {
- margin-left: 0;
- }
-
.label {
margin-right: 4px;
}
@@ -149,17 +160,11 @@
.icon-container {
display: inline-block;
- text-align: right;
- width: 15px;
-
- .fa {
- position: relative;
- right: 3px;
- }
+ width: 10px;
- svg {
- position: relative;
- right: 1px;
+ &.commit-icon {
+ width: 15px;
+ text-align: center;
}
}