summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuya Noguchi <takninnovationresearch@gmail.com>2017-11-03 09:38:56 +0900
committerTakuya Noguchi <takninnovationresearch@gmail.com>2017-11-03 11:22:59 +0900
commitac547e4112578f62838d2541463ce16418c06e54 (patch)
treed5176de2a19bf23358d332917f4ba76309ba3a80
parent2647d8fbd86bc9b266b4645bc7eedbf7fe1e2f5f (diff)
downloadgitlab-ce-ac547e4112578f62838d2541463ce16418c06e54.tar.gz
Enable MergeableSelector in scss-lint (for !14567)
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss59
1 files changed, 31 insertions, 28 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 09d5a4248b3..2a8cbc61af7 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -475,7 +475,7 @@
top: 5px;
// Action Icons in big pipeline-graph nodes
- .ci-action-icon-wrapper {
+ &.ci-action-icon-wrapper {
height: 30px;
width: 30px;
background: $white-light;
@@ -500,6 +500,14 @@
width: 18px;
height: 18px;
}
+
+ &.play {
+ svg {
+ width: #{$ci-action-icon-size - 8};
+ height: #{$ci-action-icon-size - 8};
+ left: 8px;
+ }
+ }
}
}
@@ -746,6 +754,28 @@ button.mini-pipeline-graph-dropdown-toggle {
left: -3px;
position: relative;
top: -2px;
+
+ &.icon-action-stop,
+ &.icon-action-cancel {
+ width: 12px;
+ height: 12px;
+ top: 1px;
+ left: -1px;
+ }
+
+ &.icon-action-play {
+ width: 11px;
+ height: 11px;
+ top: 1px;
+ left: 1px;
+ }
+
+ &.icon-action-retry {
+ width: 16px;
+ height: 16px;
+ top: 0;
+ left: -3px;
+ }
}
&:hover svg,
@@ -762,27 +792,6 @@ button.mini-pipeline-graph-dropdown-toggle {
}
}
- svg.icon-action-stop,
- svg.icon-action-cancel {
- width: 12px;
- height: 12px;
- top: 1px;
- left: -1px;
- }
-
- svg.icon-action-play {
- width: 11px;
- height: 11px;
- top: 1px;
- left: 1px;
- }
-
- svg.icon-action-retry {
- width: 16px;
- height: 16px;
- top: 0;
- left: -3px;
- }
}
@@ -852,12 +861,6 @@ button.mini-pipeline-graph-dropdown-toggle {
top: -10px;
box-shadow: 0 1px 5px $black-transparent;
- .mini-pipeline-graph-dropdown-item {
- .ci-status-icon {
- top: -1px;
- }
- }
-
/**
* Top arrow in the dropdown in the big pipeline graph
*/