Bootstrap: commits page + tree
This commit is contained in:
parent
bef29f0797
commit
d4ad362387
|
@ -101,6 +101,7 @@ $blue_link: "#2fa0bb";
|
|||
width: 140px;
|
||||
border-right: 1px solid $border_color;
|
||||
height:100%;
|
||||
min-height:450px;
|
||||
}
|
||||
|
||||
.container-fluid > .content {
|
||||
|
@ -111,6 +112,7 @@ $blue_link: "#2fa0bb";
|
|||
@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: "#2fa0bb";
|
|||
//@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";
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
.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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
- @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) }
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
- content_for(:body_class, "project-page commits-page")
|
||||
- if current_user.private_token
|
||||
= content_for :rss_icon do
|
||||
.rss-icon
|
||||
|
@ -6,10 +5,13 @@
|
|||
= image_tag "Rss-UI.PNG", :width => 22, :title => "feed"
|
||||
|
||||
- if params[:path]
|
||||
%h2
|
||||
%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)}
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
- content_for(:body_class, "project-page commits-page")
|
||||
.commit
|
||||
%span.commit-info
|
||||
= link_to tree_project_ref_path(@project, @commit.id) do
|
||||
|
|
|
@ -1,38 +1,27 @@
|
|||
.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
|
||||
%div.alert-message.block-message.error
|
||||
%ul
|
||||
- @user.errors.full_messages.each do |msg|
|
||||
%li= msg
|
||||
|
||||
.form-row
|
||||
.clearfix
|
||||
= f.label :name
|
||||
%br
|
||||
= f.text_field :name
|
||||
.form-row
|
||||
.input= f.text_field :name
|
||||
.clearfix
|
||||
= f.label :email
|
||||
%br
|
||||
= f.text_field :email
|
||||
.form-row
|
||||
.input= f.text_field :email
|
||||
.clearfix
|
||||
= f.label :skype
|
||||
%br
|
||||
= f.text_field :skype
|
||||
.form-row
|
||||
.input= f.text_field :skype
|
||||
.clearfix
|
||||
= f.label :linkedin
|
||||
%br
|
||||
= f.text_field :linkedin
|
||||
.form-row
|
||||
.input= f.text_field :linkedin
|
||||
.clearfix
|
||||
= f.label :twitter
|
||||
%br
|
||||
= f.text_field :twitter
|
||||
.input= f.text_field :twitter
|
||||
|
||||
.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"
|
||||
= 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
|
||||
|
|
Loading…
Reference in a new issue