summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-04-26 13:20:58 -0500
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-05-04 16:45:37 -0500
commitfc20639c8d76b367dc0e0b66ef94033697b28dc7 (patch)
tree8193653258d1f894173ae18fcf5b2cfa41f6d7e5 /app/assets/stylesheets
parent7878eb9fa69123981281c2d71a2964dca1b459ee (diff)
downloadgitlab-ce-fc20639c8d76b367dc0e0b66ef94033697b28dc7.tar.gz
Builds page redesign
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/framework/buttons.scss6
-rw-r--r--app/assets/stylesheets/pages/builds.scss13
-rw-r--r--app/assets/stylesheets/pages/commit.scss18
-rw-r--r--app/assets/stylesheets/pages/status.scss2
4 files changed, 36 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index edb5ee71f98..1f2f9f7754c 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -251,3 +251,9 @@
.btn-file-option {
background: linear-gradient(180deg, $white-light 25%, $gray-light 100%);
}
+
+.btn-refresh {
+ i {
+ color: $gl-icon-color;
+ }
+}
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index 201f3e5ca46..3340cee9643 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -83,3 +83,16 @@
}
}
}
+
+table.builds {
+
+ .build-link {
+ a {
+ color: $gl-dark-link-color;
+ }
+ }
+
+ .btn-refresh {
+ margin-left: 10px;
+ }
+}
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss
index 5c945e2d4c9..c2cd227571f 100644
--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
@@ -35,13 +35,19 @@
font-weight: bold;
}
- .ci-status {
- margin-right: 10px;
+ .time_ago {
+ margin-left: 8px;
}
.fa-clipboard {
color: $dropdown-title-btn-color;
}
+
+ .commit-info {
+ &.branches {
+ margin-left: 8px;
+ }
+ }
}
.commit-box {
@@ -91,6 +97,14 @@
}
}
+.commit-action-buttons {
+ i {
+ color: $gl-icon-color;
+ font-size: 13px;
+ margin-right: 3px;
+ }
+}
+
/*
* Commit message textarea for web editor and
* custom merge request message
diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss
index dbb6daf0d70..2370d35924e 100644
--- a/app/assets/stylesheets/pages/status.scss
+++ b/app/assets/stylesheets/pages/status.scss
@@ -1,7 +1,7 @@
.container-fluid {
.ci-status {
padding: 2px 7px;
- margin-right: 5px;
+ margin-right: 10px;
border: 1px solid #eee;
white-space: nowrap;
@include border-radius(4px);