From 48bc4fc214934160af39958c70f3adb6d7e00b5a Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sun, 12 Feb 2012 19:47:37 +0200 Subject: [PATCH] fixed flash message. better tree css --- app/assets/stylesheets/common.scss | 3 ++- app/assets/stylesheets/notes.css.scss | 3 ++- app/assets/stylesheets/tree.scss | 15 +++++++++++++++ app/views/layouts/_flash.html.haml | 5 ++--- app/views/refs/_tree.html.haml | 2 +- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index d8d27965..2ad61721 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 3e0d141e..c493c487 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 90cdcb0d..cacdaa66 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 5139aed4..2e40f0a6 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 74d194d3..d1fcc295 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