summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-04-28 20:16:04 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-04-28 20:16:04 +0000
commitbdcba438730bf2dcef29385ba49811fde2e1c17c (patch)
treefd92fd5ff8a506431e10b4b365ef6b46347a6229 /app/assets/stylesheets
parented08bfdc26557b4d364dc18299bb21a8be195be6 (diff)
parent54493b9aaef6b2209889a414cf3a26da131eb0ca (diff)
downloadgitlab-ce-bdcba438730bf2dcef29385ba49811fde2e1c17c.tar.gz
Merge branch 'project-deploy-keys-ui' into 'master'
Project deploy keys updated UI Closes #13992 See merge request !3912
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/pages/projects.scss27
1 files changed, 25 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index fcca9d4faf5..9561ac39050 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -202,8 +202,31 @@
min-width: 200px;
}
-.deploy-project-label {
- margin: 1px;
+.deploy-key-content {
+ @media (min-width: $screen-sm-min) {
+ float: left;
+
+ &:last-child {
+ float: right;
+ }
+ }
+}
+
+.deploy-key-projects {
+ @media (min-width: $screen-sm-min) {
+ line-height: 42px;
+ }
+}
+
+a.deploy-project-label {
+ padding: 5px;
+ margin-right: 5px;
+ color: $gl-gray;
+ background-color: $row-hover;
+
+ &:hover {
+ color: $gl-link-color;
+ }
}
.vs-public {