summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-09-15 15:41:15 +0000
committerRémy Coutable <remy@rymai.me>2016-09-15 15:41:15 +0000
commit7b25add30f7838e1ff9726887cf90dc36406d2a1 (patch)
tree811bcc64d8dcb17931b1cc60332336091f9f3e6e /app/assets
parent247ae1317492ffd36c7a120101ecb242bcdaf93e (diff)
parent2f3dc314f42dbd79813e6251792853bc231e69dd (diff)
downloadgitlab-ce-7b25add30f7838e1ff9726887cf90dc36406d2a1.tar.gz
Merge branch 'group-similar' into 'master'
Group similar builds We group builds by removing from the builds name two numbers which are delimited by whitespace or colon: * `name 0 1` => `name` * `name 0:1` => `name` * `name 0/1` => `name` * `name 0:1 ruby` => `name ruby` * `name 0/1 ruby` => `name ruby` * `0 1 name ruby` => `name ruby` * `0:1 name ruby` => `name ruby` * `0/1 name ruby` => `name ruby` See merge request !6242
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss81
1 files changed, 75 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 2d66ab25da6..cc71b8eb045 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -318,9 +318,17 @@
.build-content {
width: 130px;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+
+ .ci-status-text {
+ width: 110px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ vertical-align: middle;
+ display: inline-block;
+ position: relative;
+ top: -1px;
+ }
a {
color: $layout-link-gray;
@@ -331,13 +339,74 @@
text-decoration: underline;
}
}
+ }
+
+ .dropdown-menu-toggle {
+ border: none;
+ width: auto;
+ padding: 0;
+ color: $layout-link-gray;
+
+ .ci-status-text {
+ width: 80px;
+ }
+ }
+
+ .grouped-pipeline-dropdown {
+ padding: 8px 0;
+ width: 200px;
+ left: auto;
+ right: -214px;
+ top: -9px;
+
+ a:hover {
+ .ci-status-text {
+ text-decoration: none;
+ }
+ }
+
+ .ci-status-text {
+ width: 145px;
+ }
+
+ .arrow {
+ &:before,
+ &:after {
+ content: '';
+ display: inline-block;
+ position: absolute;
+ width: 0;
+ height: 0;
+ border-color: transparent;
+ border-style: solid;
+ top: 18px;
+ }
+
+ &:before {
+ left: -5px;
+ margin-top: -6px;
+ border-width: 7px 5px 7px 0;
+ border-right-color: $border-color;
+ }
+ &:after {
+ left: -4px;
+ margin-top: -9px;
+ border-width: 10px 7px 10px 0;
+ border-right-color: $white-light;
+ }
+ }
+ }
+
+ .badge {
+ background-color: $gray-dark;
+ color: $layout-link-gray;
+ font-weight: normal;
}
}
svg {
- position: relative;
- top: 2px;
+ vertical-align: middle;
margin-right: 5px;
}
@@ -442,7 +511,7 @@
width: 21px;
height: 25px;
position: absolute;
- top: -28.5px;
+ top: -29px;
border-top: 2px solid $border-color;
}