Admin logs improved. Commits list box styled
This commit is contained in:
parent
244a1cad62
commit
2a705c4f40
|
@ -202,6 +202,10 @@ a:focus {
|
|||
color:$style_color;
|
||||
}
|
||||
|
||||
.nav-tabs > .active > a {
|
||||
font-weight:bold;
|
||||
}
|
||||
|
||||
/** COLORS **/
|
||||
.cgray { color:gray; }
|
||||
.cred { color:#D12F19; }
|
||||
|
@ -443,6 +447,13 @@ form {
|
|||
background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
|
||||
background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
|
||||
|
||||
&.small {
|
||||
line-height: 28px;
|
||||
font-size: 14px;
|
||||
line-height:28px;
|
||||
text-shadow: 0 1px 1px white;
|
||||
}
|
||||
|
||||
form {
|
||||
padding:9px 0;
|
||||
margin:0px;
|
||||
|
@ -628,13 +639,6 @@ h3.page_title {
|
|||
line-height: 28px;
|
||||
}
|
||||
|
||||
pre.logs {
|
||||
.log {
|
||||
font-size:12px;
|
||||
line-height:18px;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* File content holder
|
||||
*
|
||||
|
@ -676,10 +680,10 @@ pre.logs {
|
|||
}
|
||||
.file_content {
|
||||
background:#fff;
|
||||
color:#514721;
|
||||
font-size: 11px;
|
||||
|
||||
&.wiki {
|
||||
font-size: 13px;
|
||||
code {
|
||||
padding:0 4px;
|
||||
}
|
||||
|
@ -730,6 +734,33 @@ pre.logs {
|
|||
}
|
||||
}
|
||||
|
||||
&.logs {
|
||||
background:#eee;
|
||||
max-height: 700px;
|
||||
overflow-y: auto;
|
||||
|
||||
ol {
|
||||
margin-left:40px;
|
||||
padding: 10px 0;
|
||||
border-left: 1px solid #CCC;
|
||||
margin-bottom:0;
|
||||
background: white;
|
||||
li {
|
||||
color:#888;
|
||||
p {
|
||||
margin:0;
|
||||
color:#333;
|
||||
line-height:24px;
|
||||
padding-left: 10px;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
background:$hover;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Code file
|
||||
*/
|
||||
|
|
|
@ -1,6 +1,9 @@
|
|||
%h4
|
||||
.file_holder#README
|
||||
.file_title
|
||||
%i.icon-file
|
||||
githost.log
|
||||
%pre.logs
|
||||
.file_content.logs
|
||||
%ol
|
||||
- Gitlab::Logger.read_latest.each do |line|
|
||||
%span.log= line
|
||||
%li
|
||||
%p= line
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
- @commits.group_by { |c| c.committed_date.to_date }.each do |day, commits|
|
||||
%div.ui-box
|
||||
%h5= day.stamp("28 Aug, 2010")
|
||||
%h5.small
|
||||
%i.icon-calendar
|
||||
= day.stamp("28 Aug, 2010")
|
||||
%ul.unstyled= render commits
|
||||
|
|
|
@ -13,12 +13,12 @@
|
|||
%li{:class => "#{branches_tab_class}"}
|
||||
= link_to project_repository_path(@project) do
|
||||
Branches
|
||||
%span.number= @project.repo.branch_count
|
||||
%span.badge= @project.repo.branch_count
|
||||
|
||||
%li{:class => "#{'active' if current_page?(tags_project_repository_path(@project)) }"}
|
||||
= link_to tags_project_repository_path(@project) do
|
||||
Tags
|
||||
%span.number= @project.repo.tag_count
|
||||
%span.badge= @project.repo.tag_count
|
||||
|
||||
|
||||
- if current_page?(project_commits_path(@project)) && current_user.private_token
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
= "..."
|
||||
= text_field_tag :to, params[:to], :placeholder => "aa8b4ef", :class => "xlarge"
|
||||
.actions
|
||||
= submit_tag "Compare", :class => "btn primary"
|
||||
= submit_tag "Compare", :class => "btn btn-primary"
|
||||
|
||||
|
||||
- unless @commits.empty?
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
- if @commits.present?
|
||||
.ui-box
|
||||
%h5 Commits (#{@commits.count})
|
||||
%h5
|
||||
%i.icon-list
|
||||
Commits (#{@commits.count})
|
||||
.merge-request-commits
|
||||
- if @commits.count > 8
|
||||
%ul.first_mr_commits.unstyled
|
||||
|
|
|
@ -8,7 +8,7 @@ module Gitlab
|
|||
|
||||
def self.read_latest
|
||||
path = Rails.root.join("log/githost.log")
|
||||
logs = `tail -n 50 #{path}`.split("\n")
|
||||
logs = File.read(path).split("\n")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue