From 511ccbc61a1abff3511946aee103c20dd9608d0e Mon Sep 17 00:00:00 2001 From: Vokhmin Alexey V Date: Wed, 10 Apr 2013 13:15:53 +0400 Subject: [PATCH] #93: update styles --- app/assets/stylesheets/design/custom.scss | 7 +++ app/assets/stylesheets/design/main.scss | 48 ++++++++++---------- app/views/projects/git/trees/_show.html.haml | 2 +- 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/app/assets/stylesheets/design/custom.scss b/app/assets/stylesheets/design/custom.scss index 894c7097e..075500d6f 100644 --- a/app/assets/stylesheets/design/custom.scss +++ b/app/assets/stylesheets/design/custom.scss @@ -2019,3 +2019,10 @@ article .activity .top { .cm-s-default.md_and_cm p img { max-width: 800px; } + +.tablesorter.project { + .th1 { + width: auto; + } + th { text-align: center; } +} \ No newline at end of file diff --git a/app/assets/stylesheets/design/main.scss b/app/assets/stylesheets/design/main.scss index 0135b0731..29beb1cbf 100644 --- a/app/assets/stylesheets/design/main.scss +++ b/app/assets/stylesheets/design/main.scss @@ -1514,32 +1514,30 @@ div.fork p { /* Project main page */ -table.tablesorter.project .th1 { - width: 130px; - /*padding-left: 17px;*/ -} +.tablesorter.project { -table.tablesorter.project .th2 { - width: 110px; - /*padding-left: 17px;*/ -} - -table.tablesorter.project .th3 { - width: 450px; -} - -table.tablesorter.project .th4 { - /*padding-left: 17px;*/ -} - -table.tablesorter.project div.name { - float: left; - margin-top: 0px; -} - -table.tablesorter.project div.pic { - float: left; - padding-right: 5px; + .th1 { + width: 130px; + /*padding-left: 17px;*/ + } + .th2 { + width: 110px; + /*padding-left: 17px;*/ + } + .th3 { + width: 450px; + } + .th4 { + /*padding-left: 17px;*/ + } + .name { + float: left; + margin-top: 0px; + } + .pic { + float: left; + padding-right: 5px; + } } a.files-see { diff --git a/app/views/projects/git/trees/_show.html.haml b/app/views/projects/git/trees/_show.html.haml index 65333e439..ec36e1e02 100644 --- a/app/views/projects/git/trees/_show.html.haml +++ b/app/views/projects/git/trees/_show.html.haml @@ -32,7 +32,7 @@ .name= link_to(entry.name, tree_path(@project, @treeish, entry_path), :class => 'files-see') = render 'commit_info', :commit => commit - - commit = @project.tree_info(@project.repo.tree(@treeish), @treeish, nil).detect{ |e, c| e.name == '.gitmodules' && c }.last + - commit = @project.tree_info(@project.repo.tree(@treeish), @treeish, nil).detect{ |e, c| e.name == '.gitmodules' && c }.try(:last) - if commit - Grit::Submodule.config(@project.repo).each do |name, options| - folder = options['path'].split('/').last