diff options
author | randx <dmitriy.zaporozhets@gmail.com> | 2012-06-18 20:18:14 +0300 |
---|---|---|
committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-06-18 20:18:14 +0300 |
commit | 2dd17623c9388fb98ae53ba80c904455e0c7f432 (patch) | |
tree | 606d80207bc16cafe3878219e8af57f175422767 | |
parent | 22d6dc2b3b1392341c765932b706bd867c66c5f9 (diff) | |
download | gitlab-ce-2dd17623c9388fb98ae53ba80c904455e0c7f432.tar.gz |
Refactor code themes
-rw-r--r-- | app/assets/stylesheets/common.scss | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/gitlab_bootstrap.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/highlight/dark.scss (renamed from app/assets/stylesheets/highlight.black.scss) | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/highlight/white.scss (renamed from app/assets/stylesheets/highlight.scss) | 7 | ||||
-rw-r--r-- | app/assets/stylesheets/main.scss | 4 |
5 files changed, 7 insertions, 13 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 1507aab2484..82d43d4c83e 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -581,7 +581,8 @@ li.note { /* CHZN reset few styles */ .chzn-container-single .chzn-single { background:#FFF; - border: 1px solid #ccc; + border: 1px solid #bbb; + box-shadow:none; } .chzn-container-active .chzn-single { background:#fff; diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss index 04a55bf963e..8bab17791a0 100644 --- a/app/assets/stylesheets/gitlab_bootstrap.scss +++ b/app/assets/stylesheets/gitlab_bootstrap.scss @@ -165,11 +165,11 @@ a:focus { } .nav-pills a:hover { - background-color:#ccc; + background-color:#888; } .nav-pills .active a { - background-color: #aaa; + background-color: $style_color; } .label { diff --git a/app/assets/stylesheets/highlight.black.scss b/app/assets/stylesheets/highlight/dark.scss index 61a0932775f..97c57835b75 100644 --- a/app/assets/stylesheets/highlight.black.scss +++ b/app/assets/stylesheets/highlight/dark.scss @@ -59,7 +59,7 @@ .highlight .sr{color:orange;} /* Literal.String.Regex */ .highlight .s1{color:orange;} /* Literal.String.Single */ .highlight .ss{color:orange;} /* Literal.String.Symbol */ - .bp { color: #003388 } /* Name.Builtin.Pseudo */ + .bp { color: #D58 } /* Name.Builtin.Pseudo */ .vc { color: #336699 } /* Name.Variable.Class */ .vg { color: #dd7700 } /* Name.Variable.Global */ .vi { color: cyan } diff --git a/app/assets/stylesheets/highlight.scss b/app/assets/stylesheets/highlight/white.scss index 535ec3823db..2b95d4b5dd1 100644 --- a/app/assets/stylesheets/highlight.scss +++ b/app/assets/stylesheets/highlight/white.scss @@ -1,10 +1,3 @@ -@mixin round-borders-all($radius) { - border: 1px solid #eaeaea; - -moz-border-radius: $radius; - -webkit-border-radius: $radius; - border-radius: $radius; -} - table.highlighttable { margin:0px; diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 5a09e564c60..bff24dd68b9 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -152,13 +152,13 @@ $hover: #FDF5D9; * CODE HIGHTLIGHT BASE * */ -@import "highlight.scss"; +@import "highlight/white.scss"; /** * CODE HIGHTLIGHT DARK schema * */ -@import "highlight.black.scss"; +@import "highlight/dark.scss"; /** * JQUERY UI ext |