Commit d4ad3623 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Bootstrap: commits page + tree

parent bef29f07
...@@ -101,6 +101,7 @@ $blue_link: "#2fa0bb"; ...@@ -101,6 +101,7 @@ $blue_link: "#2fa0bb";
width: 140px; width: 140px;
border-right: 1px solid $border_color; border-right: 1px solid $border_color;
height:100%; height:100%;
min-height:450px;
} }
.container-fluid > .content { .container-fluid > .content {
...@@ -111,6 +112,7 @@ $blue_link: "#2fa0bb"; ...@@ -111,6 +112,7 @@ $blue_link: "#2fa0bb";
@import "top_panel.scss"; @import "top_panel.scss";
@import "projects.css.scss"; @import "projects.css.scss";
@import "commits.css.scss"; @import "commits.css.scss";
@import "tree.scss";
//@import "style.scss"; //@import "style.scss";
//@import "notes.css.scss"; //@import "notes.css.scss";
...@@ -120,11 +122,10 @@ $blue_link: "#2fa0bb"; ...@@ -120,11 +122,10 @@ $blue_link: "#2fa0bb";
//@import "commits.css.scss"; //@import "commits.css.scss";
//@import "dashboard.scss"; //@import "dashboard.scss";
//@import "tree.scss";
//@import "tags.scss"; //@import "tags.scss";
//@import "buttons.scss"; //@import "buttons.scss";
/** CODE HIGHTLIGHT **/ /** CODE HIGHTLIGHT **/
//@import "highlight.css.scss"; @import "highlight.css.scss";
//@import "highlight.black.css.scss"; @import "highlight.black.css.scss";
.black .highlighttable { .black .highlighttable {
background: #333; background: #333;
td.linenos { border:none; }
pre { color: #eee } pre { color: #eee }
.highlight { background: #333; border-left:1px solid #555; } .highlight { background: #333; border-left:1px solid #555; }
......
...@@ -25,7 +25,13 @@ td.linenos{ ...@@ -25,7 +25,13 @@ td.linenos{
padding:10px 0px 0px 10px; padding:10px 0px 0px 10px;
margin-left:0px; margin-left:0px;
} }
.linenodiv pre,
.highlight pre{ .highlight pre{
margin:0;
padding:0;
background:none;
border:none;
} }
.linenodiv pre { .linenodiv pre {
......
...@@ -117,5 +117,6 @@ table.highlighttable .linenodiv pre { ...@@ -117,5 +117,6 @@ table.highlighttable .linenodiv pre {
.tree-item { .tree-item {
&:hover { &:hover {
background: #FFFFCF; background: #FFFFCF;
cursor:pointer;
} }
} }
- @commits.group_by { |c| c.committed_date.to_date }.each do |day, commits| - @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" } %div{ :class => "commits-date ui-box ui-box-small ui-box-big" }
.day-commits-table .day-commits-table
%h3= day.stamp("28 Aug, 2010") %div.alert-message.info
%p= day.stamp("28 Aug, 2010")
.data .data
- commits.each do |commit| - commits.each do |commit|
%a{ :class => "commit", :href => project_commit_path(@project, :id => commit.id) } %a{ :class => "commit", :href => project_commit_path(@project, :id => commit.id) }
......
- content_for(:body_class, "project-page commits-page")
- if current_user.private_token - if current_user.private_token
= content_for :rss_icon do = content_for :rss_icon do
.rss-icon .rss-icon
...@@ -6,10 +5,13 @@ ...@@ -6,10 +5,13 @@
= image_tag "Rss-UI.PNG", :width => 22, :title => "feed" = image_tag "Rss-UI.PNG", :width => 22, :title => "feed"
- if params[:path] - if params[:path]
%h2 %ul.breadcrumb
%li
= link_to project_commits_path(@project) do = link_to project_commits_path(@project) do
= @project.code = @project.code
%span.divider
\/ \/
%li
%a{:href => "#"}= params[:path].split("/").join(" / ") %a{:href => "#"}= params[:path].split("/").join(" / ")
%div{:id => dom_id(@project)} %div{:id => dom_id(@project)}
......
- content_for(:body_class, "project-page commits-page")
.commit .commit
%span.commit-info %span.commit-info
= link_to tree_project_ref_path(@project, @commit.id) do = link_to tree_project_ref_path(@project, @commit.id) do
......
.ui-box.width-100p %h3= @user.name
%h3= @user.name
= form_for @user, :url => profile_update_path, :method => :put do |f| = form_for @user, :url => profile_update_path, :method => :put do |f|
.data
.left
-if @user.errors.any? -if @user.errors.any?
#error_explanation %div.alert-message.block-message.error
%ul %ul
- @user.errors.full_messages.each do |msg| - @user.errors.full_messages.each do |msg|
%li= msg %li= msg
.form-row .clearfix
= f.label :name = f.label :name
%br .input= f.text_field :name
= f.text_field :name .clearfix
.form-row
= f.label :email = f.label :email
%br .input= f.text_field :email
= f.text_field :email .clearfix
.form-row
= f.label :skype = f.label :skype
%br .input= f.text_field :skype
= f.text_field :skype .clearfix
.form-row
= f.label :linkedin = f.label :linkedin
%br .input= f.text_field :linkedin
= f.text_field :linkedin .clearfix
.form-row
= f.label :twitter = f.label :twitter
%br .input= f.text_field :twitter
= f.text_field :twitter
.right = f.submit 'Save', :class => "primary btn"
= 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"
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
= render :partial => "refs/tree_file", :locals => { :name => tree.name, :content => tree.data, :file => tree } = render :partial => "refs/tree_file", :locals => { :name => tree.name, :content => tree.data, :file => tree }
- else - else
- contents = tree.contents - contents = tree.contents
%table#tree-slider.no-borders %table#tree-slider
%thead %thead
%th Name %th Name
%th Last Update %th Last Update
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment