Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-02-12 21:47:37 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-02-12 21:47:37 +0400
commit48bc4fc214934160af39958c70f3adb6d7e00b5a (patch)
tree057bdce3848ba97221b977d1da3bc9d065d1012b
parent0cd873c2d3724bc373e1d8b9e5b32c01e32c1927 (diff)
fixed flash message. better tree css
-rw-r--r--app/assets/stylesheets/common.scss3
-rw-r--r--app/assets/stylesheets/notes.css.scss3
-rw-r--r--app/assets/stylesheets/tree.scss15
-rw-r--r--app/views/layouts/_flash.html.haml5
-rw-r--r--app/views/refs/_tree.html.haml2
5 files changed, 22 insertions, 6 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index d8d279655a7..2ad61721553 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -73,7 +73,8 @@ a {
.container {
width:$min_app_width;
- margin-top:62px;
+ margin-top:50px;
+ padding:$app_padding;
}
.container .sidebar {
diff --git a/app/assets/stylesheets/notes.css.scss b/app/assets/stylesheets/notes.css.scss
index 3e0d141e075..c493c487a23 100644
--- a/app/assets/stylesheets/notes.css.scss
+++ b/app/assets/stylesheets/notes.css.scss
@@ -38,7 +38,8 @@
.note span.note-title{margin-bottom: 10px}
.note span.note-author{color: #999; font-weight: normal; font-style: italic;}
.note span.note-author strong{font-weight: bold; font-style: normal;}
-
+.note p { color:$style_color; }
+.note .note-author { color: $style_color;}
.note .note-title { margin-left:55px; }
diff --git a/app/assets/stylesheets/tree.scss b/app/assets/stylesheets/tree.scss
index 90cdcb0df98..cacdaa66570 100644
--- a/app/assets/stylesheets/tree.scss
+++ b/app/assets/stylesheets/tree.scss
@@ -129,3 +129,18 @@ table.highlighttable .linenodiv pre {
}
}
}
+
+.breadcrumb a {
+ color:$style_color;
+ font-weight:bold;
+}
+
+#tree-slider {
+ td {
+ padding:7px;
+ }
+
+ th {
+ background:#f5f5f5;
+ }
+}
diff --git a/app/views/layouts/_flash.html.haml b/app/views/layouts/_flash.html.haml
index 5139aed498c..2e40f0a6281 100644
--- a/app/views/layouts/_flash.html.haml
+++ b/app/views/layouts/_flash.html.haml
@@ -1,9 +1,8 @@
- if alert || notice
- text = alert || notice
%div{:style => "display:none", :id => "flash_container"}
- .container
- %center
- %h4= text
+ %center
+ %h4= text
:javascript
$(function(){
$("#flash_container").slideDown("slow");
diff --git a/app/views/refs/_tree.html.haml b/app/views/refs/_tree.html.haml
index 74d194d32f0..d1fcc2958bf 100644
--- a/app/views/refs/_tree.html.haml
+++ b/app/views/refs/_tree.html.haml
@@ -19,7 +19,7 @@
= render :partial => "refs/tree_file", :locals => { :name => tree.name, :content => tree.data, :file => tree }
- else
- contents = tree.contents
- %table#tree-slider.bordered-table.zebra-striped
+ %table#tree-slider.bordered-table
%thead
%th Name
%th Last Update