summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-01 14:55:30 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-01 14:55:30 +0300
commitf90c5655447233cf2228223b7625c78f6e3bdb62 (patch)
tree550574557f0b910c76c530287cb0793631266196 /app
parente6affad928cfcc8f5c8b031bf791b65377eeb25f (diff)
downloadgitlab-ce-f90c5655447233cf2228223b7625c78f6e3bdb62.tar.gz
UI changes: removed box shadow for ui-box and file-holder
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/blocks.scss3
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/files.scss6
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/lists.scss1
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/tables.scss9
-rw-r--r--app/assets/stylesheets/sections/issues.scss5
-rw-r--r--app/assets/stylesheets/sections/nav.scss4
-rw-r--r--app/assets/stylesheets/themes/ui_mars.scss4
7 files changed, 11 insertions, 21 deletions
diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
index 053c275c3bb..16840184d2a 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
@@ -10,11 +10,10 @@
*
*/
.ui-box {
- background: #F9F9F9;
+ background: #FFF;
margin-bottom: 20px;
border: 1px solid #CCC;
word-wrap: break-word;
- @include solid-shade;
&.ui-box-show {
margin:20px 0;
diff --git a/app/assets/stylesheets/gitlab_bootstrap/files.scss b/app/assets/stylesheets/gitlab_bootstrap/files.scss
index ec03fd0d844..a0d6682eb8f 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/files.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/files.scss
@@ -3,18 +3,18 @@
*
*/
.file-holder {
- border: 1px solid #BBB;
+ border: 1px solid #CCC;
margin-bottom: 1em;
- @include solid-shade;
.file-title {
border-bottom: 1px solid #bbb;
@include bg-dark-gray-gradient;
+ text-shadow: 0 1px 1px #fff;
margin: 0;
font-weight: normal;
font-weight: bold;
text-align: left;
- color: #666;
+ color: $style_color;
padding: 9px 10px;
height: 18px;
diff --git a/app/assets/stylesheets/gitlab_bootstrap/lists.scss b/app/assets/stylesheets/gitlab_bootstrap/lists.scss
index cc7084d27d5..d23323979bc 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/lists.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/lists.scss
@@ -6,7 +6,6 @@
margin: 0;
list-style: none;
li {
- background-color: #FFF;
padding: 10px;
min-height: 20px;
border-bottom: 1px solid #eee;
diff --git a/app/assets/stylesheets/gitlab_bootstrap/tables.scss b/app/assets/stylesheets/gitlab_bootstrap/tables.scss
index f46ae91b6ab..a1a5139cda9 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/tables.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/tables.scss
@@ -1,8 +1,7 @@
table {
@extend .table;
@extend .table-striped;
- @include solid-shade;
- border: 1px solid #bbb;
+ border: 1px solid #CCC;
width: 100%;
&.low {
@@ -20,7 +19,7 @@ table {
th {
font-weight: bold;
vertical-align: middle;
- border-bottom: 1px solid #bbb;
+ border-bottom: 1px solid #CCC;
text-shadow: 0 1px 1px #fff;
@include bg-dark-gray-gradient;
@@ -46,11 +45,11 @@ table {
}
&:first-child {
- border-left: 1px solid #bbb;
+ border-left: 1px solid #CCC;
}
&:last-child {
- border-right: 1px solid #bbb;
+ border-right: 1px solid #CCC;
}
}
diff --git a/app/assets/stylesheets/sections/issues.scss b/app/assets/stylesheets/sections/issues.scss
index ed7902fec3a..6ebb9b47c90 100644
--- a/app/assets/stylesheets/sections/issues.scss
+++ b/app/assets/stylesheets/sections/issues.scss
@@ -88,14 +88,11 @@ input.check_all_issues {
}
.update_selected_issues {
- position: relative;
- top:5px;
margin-left: 4px;
- float: left;
}
.update_issues_text {
- padding: 3px;
+ padding: 5px;
line-height: 28px;
float: left;
color: #479;
diff --git a/app/assets/stylesheets/sections/nav.scss b/app/assets/stylesheets/sections/nav.scss
index 77ed57a6cfc..54263523e85 100644
--- a/app/assets/stylesheets/sections/nav.scss
+++ b/app/assets/stylesheets/sections/nav.scss
@@ -7,7 +7,7 @@
ul {
margin: auto;
- height: 42px;
+ height: 40px;
overflow: hidden;
.count {
font-weight: normal;
@@ -74,7 +74,7 @@
text-align: center;
font-weight: normal;
height: 38px;
- line-height: 36px;
+ line-height: 34px;
color: #777;
text-shadow: 0 1px 1px white;
padding: 0 10px;
diff --git a/app/assets/stylesheets/themes/ui_mars.scss b/app/assets/stylesheets/themes/ui_mars.scss
index 44649ea037c..a2b8c21ea11 100644
--- a/app/assets/stylesheets/themes/ui_mars.scss
+++ b/app/assets/stylesheets/themes/ui_mars.scss
@@ -31,8 +31,4 @@
border-left: 1px solid #666;
}
}
-
- .main-nav {
- box-shadow: 0 -1px 0 white inset;
- }
}