summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-11-13 17:56:14 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-11-13 17:56:14 +0200
commitc946defb3d9ff2ad87a410f2e25999465c4b9065 (patch)
tree42a4f26e3a9300495d7662fba5abaabda0492eb0 /app
parent9fbe3ac771bfb953fe46c6989333b09600570cad (diff)
downloadgitlab-ce-c946defb3d9ff2ad87a410f2e25999465c4b9065.tar.gz
Restyle ui-box to be more flat
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/blocks.scss9
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/buttons.scss8
-rw-r--r--app/assets/stylesheets/sections/dashboard.scss2
3 files changed, 9 insertions, 10 deletions
diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
index b266fe3f5a2..99d2d27cdcc 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
@@ -34,9 +34,8 @@
&.ui-box-show {
color: #666;
margin:20px 0;
- background: #FFF;
+ background: #FAFAFA;
box-shadow: inset 0 1px 0 #fff, 0 1px 5px #f1f1f1;
- @include linear-gradient(#fafafa, #f1f1f1);
.control-group {
margin-bottom: 0;
@@ -100,9 +99,9 @@
}
.title {
- @include bg-gray-gradient;
- border-bottom: 1px solid #CCC;
- color: #456;
+ background-color: #EEE;
+ border-bottom: 1px solid #DDD;
+ color: #666;
font-size: 16px;
text-shadow: 0 1px 1px #fff;
padding: 0 10px;
diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
index 93f9e5cb8a1..347da1ad680 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
@@ -10,21 +10,21 @@
white-space: nowrap;
padding: 6px 12px;
font-size: 13px;
- line-height: 1.5;
+ line-height: 18px;
border-radius: 4px;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
-o-user-select: none;
user-select: none;
- color: #333333;
+ color: #444444;
background-color: #fff;
border-color: #ccc;
text-shadow: none;
&.hover,
&:hover {
- color: #333333;
+ color: #444444;
text-decoration: none;
background-color: #ebebeb;
border-color: #adadad;
@@ -32,7 +32,7 @@
&.focus,
&:focus {
- color: #333333;
+ color: #444444;
text-decoration: none;
outline: thin dotted #333;
outline: 5px auto -webkit-focus-ring-color;
diff --git a/app/assets/stylesheets/sections/dashboard.scss b/app/assets/stylesheets/sections/dashboard.scss
index 61043147fc1..f70822c0397 100644
--- a/app/assets/stylesheets/sections/dashboard.scss
+++ b/app/assets/stylesheets/sections/dashboard.scss
@@ -51,7 +51,7 @@
li {
&.active {
a {
- @include linear-gradient(#f5f5f5, #eee);
+ background-color: #EEE;
border-bottom: 1px solid #EEE !important;
&:hover {
background: #eee;