Bootstrap: commits page + tree

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