summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/common.scss4
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/common.scss1
-rw-r--r--app/assets/stylesheets/sections/admin.scss9
-rw-r--r--app/assets/stylesheets/sections/projects.scss45
4 files changed, 54 insertions, 5 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 935d24e58ff..ce897292c37 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -365,6 +365,10 @@ table {
&.input-large {
width: 210px;
}
+
+ &.input-clamp {
+ max-width: 100%;
+ }
}
.user-result {
diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss
index b5fd1fce30b..26fe02e4928 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/common.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss
@@ -6,6 +6,7 @@
.cblue { color: #29A }
.cblack { color: #111 }
.cdark { color: #444 }
+.camber { color: #ffc000 }
.cwhite { color: #fff!important }
.bgred { background: #F2DEDE!important }
diff --git a/app/assets/stylesheets/sections/admin.scss b/app/assets/stylesheets/sections/admin.scss
index 82556e91da3..8ad9bc732b2 100644
--- a/app/assets/stylesheets/sections/admin.scss
+++ b/app/assets/stylesheets/sections/admin.scss
@@ -20,6 +20,15 @@
label { width: 110px; }
.controls { margin-left: 130px; }
.form-actions { padding-left: 130px; background: #fff }
+ .visibility-levels {
+ .controls {
+ margin-bottom: 9px;
+ }
+
+ i {
+ color: inherit;
+ }
+ }
}
.broadcast-messages {
diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index e9162b3c167..22bd6fb1807 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -18,6 +18,12 @@
border-bottom: 1px solid #DDD;
padding-bottom: 25px;
margin-bottom: 30px;
+
+ &.empty-project {
+ border-bottom: 0px;
+ padding-bottom: 15px;
+ margin-bottom: 0px;
+ }
.project-home-title {
font-size: 18px;
@@ -45,7 +51,7 @@
}
}
- .public-label {
+ .visibility-level-label {
font-size: 14px;
background: #f1f1f1;
padding: 8px 10px;
@@ -53,6 +59,10 @@
margin-left: 10px;
color: #888;
text-shadow: 0 1px 1px #FFF;
+
+ i {
+ color: inherit;
+ }
}
}
@@ -87,9 +97,33 @@
}
}
-.project-public-holder {
- .help-inline {
- padding-top: 7px;
+.project-visibility-level-holder {
+ .controls {
+ padding-bottom: 9px;
+ }
+
+ .controls {
+ input {
+ float: left;
+ }
+ .descr {
+ display: block;
+ margin-left: 1.5em;
+ &.restricted {
+ color: #888;
+ }
+ }
+ .info {
+ display: block;
+ margin-top: 5px;
+ }
+ strong {
+ display: inline-block;
+ width: 4em;
+ }
+ }
+ i {
+ color: inherit;
}
}
@@ -130,7 +164,8 @@ ul.nav.nav-projects-tabs {
margin: 0px;
}
-.my-projects {
+.my-projects,
+.public-projects {
li {
.project-info {
margin-bottom: 10px;