summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-04-28 20:17:41 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-04-28 20:17:41 +0000
commit9bccb4c951de8fc79765f7c42f3536ea54778f59 (patch)
treee1d5afc460714e33ba5b89cb553dd618359add83 /app/assets
parent14c2c573a382437059f538abe088bd51c646dbfc (diff)
parenta3d6b61063b8a3864ba9823166fa08fdeeb9d2d9 (diff)
downloadgitlab-ce-9bccb4c951de8fc79765f7c42f3536ea54778f59.tar.gz
Merge branch 'protected-branches-ui' into 'master'
Protected branches UI ![Screen_Shot_2016-04-26_at_15.50.10](/uploads/4b905db031aab412bc01616e0be36c1b/Screen_Shot_2016-04-26_at_15.50.10.png) ![Screen_Shot_2016-04-26_at_15.50.00](/uploads/b09229b364ec5361fce375299d39d99c/Screen_Shot_2016-04-26_at_15.50.00.png) Closes #14027 See merge request !3929
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/pages/projects.scss17
1 files changed, 11 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 9561ac39050..99108e9bfc4 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -279,12 +279,6 @@ a.deploy-project-label {
}
}
-table.table.protected-branches-list tr.no-border {
- th, td {
- border: 0;
- }
-}
-
.project-import .btn {
float: left;
margin-right: 10px;
@@ -497,3 +491,14 @@ pre.light-well {
color: #fff;
}
}
+
+.protected-branches-list {
+ a {
+ color: $gl-gray;
+ font-weight: 600;
+
+ &:hover {
+ color: $gl-link-color;
+ }
+ }
+}