Download as
Browse Code »

Commit d4ad362387d94e78a4722e070d7a267414bff6b2

Authored by Dmitriy Zaporozhets
1 parent bef29f07
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Bootstrap: commits page + tree

Showing 9 changed files with 47 additions and 47 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @d4ad362
@@ -101,6 +101,7 @@ $blue_link: "#2fa0bb"; @@ -101,6 +101,7 @@ $blue_link: "#2fa0bb";
101 width: 140px; 101 width: 140px;
102 border-right: 1px solid $border_color; 102 border-right: 1px solid $border_color;
103 height:100%; 103 height:100%;
  104 + min-height:450px;
104 } 105 }
105 106
106 .container-fluid > .content { 107 .container-fluid > .content {
@@ -111,6 +112,7 @@ $blue_link: "#2fa0bb"; @@ -111,6 +112,7 @@ $blue_link: "#2fa0bb";
111 @import "top_panel.scss"; 112 @import "top_panel.scss";
112 @import "projects.css.scss"; 113 @import "projects.css.scss";
113 @import "commits.css.scss"; 114 @import "commits.css.scss";
  115 +@import "tree.scss";
114 116
115 //@import "style.scss"; 117 //@import "style.scss";
116 //@import "notes.css.scss"; 118 //@import "notes.css.scss";
@@ -120,11 +122,10 @@ $blue_link: "#2fa0bb"; @@ -120,11 +122,10 @@ $blue_link: "#2fa0bb";
120 //@import "commits.css.scss"; 122 //@import "commits.css.scss";
121 123
122 //@import "dashboard.scss"; 124 //@import "dashboard.scss";
123 -//@import "tree.scss";  
124 //@import "tags.scss"; 125 //@import "tags.scss";
125 //@import "buttons.scss"; 126 //@import "buttons.scss";
126 127
127 /** CODE HIGHTLIGHT **/ 128 /** CODE HIGHTLIGHT **/
128 -//@import "highlight.css.scss";  
129 -//@import "highlight.black.css.scss"; 129 +@import "highlight.css.scss";
  130 +@import "highlight.black.css.scss";
130 131
app/assets/stylesheets/highlight.black.css.scss
  Diff comments   View file @d4ad362
1 .black .highlighttable { 1 .black .highlighttable {
2 background: #333; 2 background: #333;
  3 + td.linenos { border:none; }
3 pre { color: #eee } 4 pre { color: #eee }
4 .highlight { background: #333; border-left:1px solid #555; } 5 .highlight { background: #333; border-left:1px solid #555; }
5 6
app/assets/stylesheets/highlight.css.scss
  Diff comments   View file @d4ad362
@@ -25,7 +25,13 @@ td.linenos{ @@ -25,7 +25,13 @@ td.linenos{
25 padding:10px 0px 0px 10px; 25 padding:10px 0px 0px 10px;
26 margin-left:0px; 26 margin-left:0px;
27 } 27 }
  28 +
  29 +.linenodiv pre,
28 .highlight pre{ 30 .highlight pre{
  31 + margin:0;
  32 + padding:0;
  33 + background:none;
  34 + border:none;
29 } 35 }
30 36
31 .linenodiv pre { 37 .linenodiv pre {
app/assets/stylesheets/tree.scss
  Diff comments   View file @d4ad362
@@ -117,5 +117,6 @@ table.highlighttable .linenodiv pre { @@ -117,5 +117,6 @@ table.highlighttable .linenodiv pre {
117 .tree-item { 117 .tree-item {
118 &:hover { 118 &:hover {
119 background: #FFFFCF; 119 background: #FFFFCF;
  120 + cursor:pointer;
120 } 121 }
121 } 122 }
app/views/commits/_commits.html.haml
  Diff comments   View file @d4ad362
1 - @commits.group_by { |c| c.committed_date.to_date }.each do |day, commits| 1 - @commits.group_by { |c| c.committed_date.to_date }.each do |day, commits|
2 %div{ :class => "commits-date ui-box ui-box-small ui-box-big" } 2 %div{ :class => "commits-date ui-box ui-box-small ui-box-big" }
3 .day-commits-table 3 .day-commits-table
4 - %h3= day.stamp("28 Aug, 2010") 4 + %div.alert-message.info
  5 + %p= day.stamp("28 Aug, 2010")
5 .data 6 .data
6 - commits.each do |commit| 7 - commits.each do |commit|
7 %a{ :class => "commit", :href => project_commit_path(@project, :id => commit.id) } 8 %a{ :class => "commit", :href => project_commit_path(@project, :id => commit.id) }
app/views/commits/index.html.haml
  Diff comments   View file @d4ad362
1 -- content_for(:body_class, "project-page commits-page")  
2 - if current_user.private_token 1 - if current_user.private_token
3 = content_for :rss_icon do 2 = content_for :rss_icon do
4 .rss-icon 3 .rss-icon
@@ -6,11 +5,14 @@ @@ -6,11 +5,14 @@
6 = image_tag "Rss-UI.PNG", :width => 22, :title => "feed" 5 = image_tag "Rss-UI.PNG", :width => 22, :title => "feed"
7 6
8 - if params[:path] 7 - if params[:path]
9 - %h2  
10 - = link_to project_commits_path(@project) do  
11 - = @project.code  
12 - \/  
13 - %a{:href => "#"}= params[:path].split("/").join(" / ") 8 + %ul.breadcrumb
  9 + %li
  10 + = link_to project_commits_path(@project) do
  11 + = @project.code
  12 + %span.divider
  13 + \/
  14 + %li
  15 + %a{:href => "#"}= params[:path].split("/").join(" / ")
14 16
15 %div{:id => dom_id(@project)} 17 %div{:id => dom_id(@project)}
16 #commits_list= render "commits" 18 #commits_list= render "commits"
app/views/commits/show.html.haml
  Diff comments   View file @d4ad362
1 -- content_for(:body_class, "project-page commits-page")  
2 .commit 1 .commit
3 %span.commit-info 2 %span.commit-info
4 = link_to tree_project_ref_path(@project, @commit.id) do 3 = link_to tree_project_ref_path(@project, @commit.id) do
app/views/profile/show.html.haml
  Diff comments   View file @d4ad362
1 -.ui-box.width-100p  
2 - %h3= @user.name  
3 - = form_for @user, :url => profile_update_path, :method => :put do |f|  
4 - .data  
5 - .left  
6 - -if @user.errors.any?  
7 - #error_explanation  
8 - %ul  
9 - - @user.errors.full_messages.each do |msg|  
10 - %li= msg 1 +%h3= @user.name
11 2
12 - .form-row  
13 - = f.label :name  
14 - %br  
15 - = f.text_field :name  
16 - .form-row  
17 - = f.label :email  
18 - %br  
19 - = f.text_field :email  
20 - .form-row  
21 - = f.label :skype  
22 - %br  
23 - = f.text_field :skype  
24 - .form-row  
25 - = f.label :linkedin  
26 - %br  
27 - = f.text_field :linkedin  
28 - .form-row  
29 - = f.label :twitter  
30 - %br  
31 - = f.text_field :twitter 3 += form_for @user, :url => profile_update_path, :method => :put do |f|
  4 + -if @user.errors.any?
  5 + %div.alert-message.block-message.error
  6 + %ul
  7 + - @user.errors.full_messages.each do |msg|
  8 + %li= msg
32 9
33 - .right  
34 - = image_tag gravatar_icon(current_user.email,64), :width => 64, :style => "margin:5px; border:5px solid #eee;"  
35 - .clear  
36 - .buttons  
37 - = f.submit 'Save', :class => "grey-button" 10 + .clearfix
  11 + = f.label :name
  12 + .input= f.text_field :name
  13 + .clearfix
  14 + = f.label :email
  15 + .input= f.text_field :email
  16 + .clearfix
  17 + = f.label :skype
  18 + .input= f.text_field :skype
  19 + .clearfix
  20 + = f.label :linkedin
  21 + .input= f.text_field :linkedin
  22 + .clearfix
  23 + = f.label :twitter
  24 + .input= f.text_field :twitter
  25 +
  26 + = f.submit 'Save', :class => "primary btn"
38 27
app/views/refs/_tree.html.haml
  Diff comments   View file @d4ad362
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 = render :partial => "refs/tree_file", :locals => { :name => tree.name, :content => tree.data, :file => tree } 12 = render :partial => "refs/tree_file", :locals => { :name => tree.name, :content => tree.data, :file => tree }
13 - else 13 - else
14 - contents = tree.contents 14 - contents = tree.contents
15 - %table#tree-slider.no-borders 15 + %table#tree-slider
16 %thead 16 %thead
17 %th Name 17 %th Name
18 %th Last Update 18 %th Last Update