summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDimitrie Hoekstra <dimitriehoekstra@gmail.com>2016-12-14 17:53:39 +0100
committerDimitrie Hoekstra <dimitriehoekstra@gmail.com>2016-12-14 17:53:39 +0100
commita0ba72ee28ff666e651d3a9cdef19a9d35c22616 (patch)
tree6d3bcdba5afbbc7e672a097cc375028a097c5cf0 /app/assets
parente138646aad4a836459999a399cdd9eca1e09847d (diff)
downloadgitlab-ce-a0ba72ee28ff666e651d3a9cdef19a9d35c22616.tar.gz
css changes @dimitrieh v1
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss2
-rw-r--r--app/assets/stylesheets/framework/variables.scss2
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss27
3 files changed, 26 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index d5914b900e2..21df80c01f7 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -98,7 +98,7 @@
@extend .dropdown-toggle;
padding-right: 20px;
position: relative;
- width: 160px;
+ width: 163px;
text-overflow: ellipsis;
overflow: hidden;
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 03fbfa5f1bd..3ed19672ec1 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -578,4 +578,4 @@ Pipeline Graph
*/
$stage-hover-bg: #eaf3fc;
$stage-hover-border: #d1e7fc;
-$stage-badge-text: #d4d4d4;
+$stage-badge-text: #e5e5e5;
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 26487b2acf9..ac18c39dfc4 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -460,7 +460,7 @@
border-radius: 30px;
background-color: $white-light;
position: relative;
- padding: 8px 10px 9px;
+ padding: 8px 4px 9px 10px;
width: 186px;
margin-bottom: 10px;
@@ -605,7 +605,7 @@
float: right;
color: $stage-badge-text;
font-weight: 100;
- font-size: 13px;
+ font-size: 15px;
margin-top: 1px;
margin-right: 2px;
}
@@ -629,6 +629,7 @@
ul {
max-height: 245px;
overflow: auto;
+ margin: 5px 0;
li {
padding-top: 2px;
@@ -665,6 +666,18 @@
color: $gl-text-color;
}
+ .ci-action-icon-container {
+ i {
+ width: 25px;
+ height: 25px;
+
+ &:before{
+ top: 1px;
+ left: 1px;
+ }
+ }
+ }
+
.stage {
max-width: 100px;
width: 100px;
@@ -681,7 +694,7 @@
// Action Icons
.ci-action-icon-container .ci-action-icon-wrapper {
float: right;
- margin-top: -1px;
+ margin-top: -4px;
i {
color: $stage-badge-text;
@@ -690,6 +703,14 @@
padding: 5px 6px;
font-size: 13px;
background: $white-light;
+ height: 30px;
+ width: 30px;
+
+ &:before {
+ position: relative;
+ top: 3px;
+ left: 3px;
+ }
&:hover {
color: $gl-text-color;