Commit 26556a5c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'improve/scss' of /home/git/repositories/gitlab/gitlabhq

parents 8b1d44f7 d8fc0c3b
...@@ -14,7 +14,7 @@ class Admin ...@@ -14,7 +14,7 @@ class Admin
$('.log-bottom').click (e) -> $('.log-bottom').click (e) ->
e.preventDefault() e.preventDefault()
visible_log = $(".file_content:visible") visible_log = $(".file-content:visible")
visible_log.animate({ scrollTop: visible_log.find('ol').height() }, "fast") visible_log.animate({ scrollTop: visible_log.find('ol').height() }, "fast")
modal = $('.change-owner-holder') modal = $('.change-owner-holder')
......
...@@ -15,7 +15,7 @@ class Dashboard ...@@ -15,7 +15,7 @@ class Dashboard
uiBox.find(".dash-list li").show() uiBox.find(".dash-list li").show()
else else
uiBox.find(".dash-list li").each (index) -> uiBox.find(".dash-list li").each (index) ->
name = $(this).find(".well-title").text() name = $(this).find(".filter-title").text()
if name.toLowerCase().search(terms.toLowerCase()) == -1 if name.toLowerCase().search(terms.toLowerCase()) == -1
$(this).hide() $(this).hide()
......
...@@ -23,12 +23,8 @@ body { ...@@ -23,12 +23,8 @@ body {
.help li { color:$style_color; } .help li { color:$style_color; }
.back_link { .back-link {
text-decoration: underline;
font-size: 14px; font-size: 14px;
font-weight: bold;
padding: 10px 0;
padding-bottom: 0;
} }
table a code { table a code {
...@@ -412,7 +408,7 @@ img.emoji { ...@@ -412,7 +408,7 @@ img.emoji {
} }
.navless-container { .navless-container {
margin-top: 30px; margin-top: 20px;
} }
.description-block { .description-block {
......
...@@ -17,9 +17,6 @@ ...@@ -17,9 +17,6 @@
&.s24 { width: 24px; height: 24px; margin-right: 8px; } &.s24 { width: 24px; height: 24px; margin-right: 8px; }
&.s26 { width: 26px; height: 26px; margin-right: 8px; } &.s26 { width: 26px; height: 26px; margin-right: 8px; }
&.s32 { width: 32px; height: 32px; margin-right: 10px; } &.s32 { width: 32px; height: 32px; margin-right: 10px; }
&.s60 { width: 60px; height: 60px; margin-right: 12px; }
&.s90 { width: 90px; height: 90px; margin-right: 15px; } &.s90 { width: 90px; height: 90px; margin-right: 15px; }
} }
img.lil_av { padding-left: 4px; padding-right: 3px; }
img.small { width: 80px; }
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
*/ */
.ui-box { .ui-box {
background: #F9F9F9; background: #F9F9F9;
margin-bottom: 25px; margin-bottom: 20px;
border: 1px solid #CCC; border: 1px solid #CCC;
word-wrap: break-word; word-wrap: break-word;
@include solid-shade; @include solid-shade;
...@@ -86,10 +86,11 @@ ...@@ -86,10 +86,11 @@
color: #456; color: #456;
font-size: 16px; font-size: 16px;
text-shadow: 0 1px 1px #fff; text-shadow: 0 1px 1px #fff;
padding: 0px 10px; padding: 0 10px;
line-height: 36px;
font-size: 14px; font-size: 14px;
line-height: 40px;
font-weight: normal; font-weight: normal;
margin: 0;
> a { > a {
text-shadow: 0 1px 1px #fff; text-shadow: 0 1px 1px #fff;
...@@ -101,8 +102,7 @@ ...@@ -101,8 +102,7 @@
} }
.btn { .btn {
position: relative; vertical-align: middle;
top: -2px;
} }
.nav-pills { .nav-pills {
...@@ -132,15 +132,6 @@ ...@@ -132,15 +132,6 @@
margin-bottom: 0; margin-bottom: 0;
padding: 5px 20px; padding: 5px 20px;
} }
.middle_title {
background: #f5f5f5;
margin:20px -20px;
padding: 0 20px;
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
font-size: 14px;
color: #777;
}
} }
.row_title { .row_title {
......
...@@ -43,11 +43,8 @@ ...@@ -43,11 +43,8 @@
} }
} }
&.success { &.btn-success {
@extend .btn-success;
&:hover { &:hover {
@extend .btn-success;
background: #51a351; background: #51a351;
} }
...@@ -59,7 +56,7 @@ ...@@ -59,7 +56,7 @@
&.btn-create { &.btn-create {
@extend .wide; @extend .wide;
@extend .success; @extend .btn-success;
} }
&.btn-save { &.btn-save {
......
...@@ -68,10 +68,6 @@ input[type='text'].danger { ...@@ -68,10 +68,6 @@ input[type='text'].danger {
fieldset legend { font-size: 17px; } fieldset legend { font-size: 17px; }
/** PAGINATION **/
.gitlab_pagination {
}
.tab-content { .tab-content {
overflow: visible; overflow: visible;
} }
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
* File content holder * File content holder
* *
*/ */
.file_holder { .file-holder {
border: 1px solid #BBB; border: 1px solid #BBB;
margin-bottom: 1em; margin-bottom: 1em;
@include solid-shade; @include solid-shade;
.file_title { .file-title {
border-bottom: 1px solid #bbb; border-bottom: 1px solid #bbb;
@include bg-dark-gray-gradient; @include bg-dark-gray-gradient;
margin: 0; margin: 0;
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
} }
} }
} }
.file_content { .file-content {
background: #fff; background: #fff;
font-size: 11px; font-size: 11px;
...@@ -48,7 +48,8 @@ ...@@ -48,7 +48,8 @@
&.wiki { &.wiki {
padding: 20px; padding: 20px;
font-size: 13px; font-size: 14px;
line-height: 1.6;
.highlight { .highlight {
margin-bottom: 9px; margin-bottom: 9px;
......
...@@ -70,19 +70,24 @@ ...@@ -70,19 +70,24 @@
@mixin header-font { @mixin header-font {
color: $style_color; color: $style_color;
text-shadow: 0 1px 1px #FFF; text-shadow: 0 1px 1px #FFF;
font-size: 18px; font-size: 16px;
line-height: 40px; line-height: 40px;
font-weight: normal; font-weight: normal;
letter-spacing: -1px;
} }
@mixin md-typography { @mixin md-typography {
code { padding: 0 4px; } code { padding: 0 4px; }
p { font-size: 13px; } h1 { margin-top: 30px;}
h1 { font-size: 26px; line-height: 40px; margin: 10px 0;} h2 { margin-top: 25px;}
h2 { font-size: 22px; line-height: 40px; margin: 10px 0;} h3 { margin-top: 20px;}
h3 { font-size: 18px; line-height: 40px; margin: 10px 0;} h4 { margin-top: 15px;}
h4 { font-size: 16px; line-height: 20px; margin: 10px 0;} }
h5 { font-size: 14px; line-height: 20px; margin: 10px 0;}
h6 { font-size: 12px; line-height: 20px; margin: 10px 0;} @mixin page-title {
color: #456;
font-size: 20px;
font-weight: normal;
line-height: 1.5;
margin-top: 0px;
margin-bottom: 15px;
} }
...@@ -3,15 +3,18 @@ ...@@ -3,15 +3,18 @@
* *
*/ */
h1, h2, h3, h4, h5, h6 { margin: 0; } h1.page-title {
h3, h4, h5, h6 { line-height: 36px; } @include page-title;
h5 { font-size: 14px; } font-size: 28px;
}
h3.page_title {
color: #456; h2.page-title {
font-size: 20px; @include page-title;
font-weight: normal; font-size: 24px;
line-height: 28px; }
h3.page-title {
@include page-title;
} }
h6 { h6 {
...@@ -91,11 +94,10 @@ a:focus { ...@@ -91,11 +94,10 @@ a:focus {
* *
*/ */
.wiki { .wiki {
font-size: 14px;
line-height: 1.6;
@include md-typography; @include md-typography;
font-size: 13px;
line-height: 20px;
.white .highlight pre { background: #f5f5f5; } .white .highlight pre { background: #f5f5f5; }
ul { margin: 0 0 9px 25px !important; } ul { margin: 0 0 9px 25px !important; }
} }
......
...@@ -10,9 +10,6 @@ ...@@ -10,9 +10,6 @@
margin: 0px; margin: 0px;
box-shadow: none; box-shadow: none;
> .title {
padding: 2px 15px;
}
.nav-projects-tabs li { padding: 0; } .nav-projects-tabs li { padding: 0; }
} }
} }
...@@ -33,12 +30,10 @@ ...@@ -33,12 +30,10 @@
.dashboard { .dashboard {
.dash-filter { .dash-filter {
margin: 0; margin: 7px 0;
padding: 4px 6px; padding: 4px 6px;
width: 202px; width: 202px;
float: left; float: left;
margin-top: 3px;
margin-left: -2px;
} }
} }
......
...@@ -31,6 +31,10 @@ ...@@ -31,6 +31,10 @@
* *
*/ */
.event-item { .event-item {
&:first-child {
padding-top: 0;
}
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
.event-title { .event-title {
color: #333; color: #333;
......
...@@ -13,7 +13,7 @@ header { ...@@ -13,7 +13,7 @@ header {
.nav > li > a { .nav > li > a {
color: $style_color; color: $style_color;
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
font-size: 16px; font-size: 14px;
padding: 10px; padding: 10px;
} }
...@@ -45,6 +45,7 @@ header { ...@@ -45,6 +45,7 @@ header {
margin: 0 6px; margin: 0 6px;
h1 { h1 {
margin: 0;
background: url('logo-black.png') no-repeat center 1px; background: url('logo-black.png') no-repeat center 1px;
background-size: 38px; background-size: 38px;
float: left; float: left;
...@@ -68,7 +69,7 @@ header { ...@@ -68,7 +69,7 @@ header {
position: relative; position: relative;
float: left; float: left;
margin: 0; margin: 0;
margin-left: 10px; margin-left: 5px;
@include header-font; @include header-font;
} }
...@@ -92,7 +93,7 @@ header { ...@@ -92,7 +93,7 @@ header {
margin-left: 10px; margin-left: 10px;
.search-input { .search-input {
@extend .span2; @extend .span3;
background-image: url("icon-search.png"); background-image: url("icon-search.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 10px; background-position: 10px;
...@@ -103,7 +104,7 @@ header { ...@@ -103,7 +104,7 @@ header {
box-shadow: none; box-shadow: none;
@include transition(all 0.15s ease-in 0s); @include transition(all 0.15s ease-in 0s);
&:focus { &:focus {
@extend .span3; @extend .span4;
} }
} }
} }
...@@ -160,7 +161,7 @@ header { ...@@ -160,7 +161,7 @@ header {
} }
.project_name { .project_name {
a { a {
color: #DDD; color: #BBB;
&:hover { &:hover {
color: #FFF; color: #FFF;
} }
......
.main-nav { .main-nav {
background: #f5f5f5; background: #f5f5f5;
margin: 30px 0; margin: 20px 0;
margin-top: 0; margin-top: 0;
padding-top: 4px; padding-top: 4px;
border-bottom: 1px solid #E1E1E1; border-bottom: 1px solid #E1E1E1;
ul { ul {
margin: auto; margin: auto;
height: 40px; height: 42px;
overflow: hidden; overflow: hidden;
.count { .count {
font-weight: normal; font-weight: normal;
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
text-align: center; text-align: center;
font-weight: normal; font-weight: normal;
height: 38px; height: 38px;
line-height: 34px; line-height: 36px;
color: #777; color: #777;
text-shadow: 0 1px 1px white; text-shadow: 0 1px 1px white;
padding: 0 10px; padding: 0 10px;
......
.profile_history {
.event_feed {
min-height: 20px;
.avatar {
width: 20px;
}
}
}
.profile_avatar_holder {
float: left;
width: 60px;
height: 60px;
margin-right: 20px;
img {
width: 60px;
height: 60px;
background: #fff;
padding: 1px;
border: 1px solid #ddd;
}
}
.save-status-fixed { .save-status-fixed {
position: fixed; position: fixed;
left: 20px; left: 20px;
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
margin-bottom: 50px; margin-bottom: 50px;
} }
h3 { h3 {
@extend .page_title; @extend .page-title;
} }
} }
......
.snippet.file_holder { .snippet.file-holder {
.file_title { .file-title {
.snippet-file-name { .snippet-file-name {
position: relative; position: relative;
top: -4px; top: -4px;
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
} }
} }
.votes-block { .votes-block {
margin: 14px 6px 6px 0; margin: 6px;
.downvotes { .downvotes {
float: right; float: right;
} }
......
h3.page_title .edit-wiki-header { h3.page-title .edit-wiki-header {
width: 780px; width: 780px;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
......
...@@ -31,4 +31,8 @@ ...@@ -31,4 +31,8 @@
border-left: 1px solid #666; border-left: 1px solid #666;
} }
} }
.main-nav {
box-shadow: 0 -1px 0 white inset;
}
} }
...@@ -134,7 +134,7 @@ module CommitsHelper ...@@ -134,7 +134,7 @@ module CommitsHelper
parts = @path.split('/') parts = @path.split('/')
parts.each_with_index do |part, i| parts.each_with_index do |part, i|
crumbs += content_tag(:span, '/', class: 'divider') crumbs += content_tag(:span, ' / ', class: 'divider')
crumbs += content_tag(:li) do crumbs += content_tag(:li) do
# The text is just the individual part, but the link needs all the parts before it # The text is just the individual part, but the link needs all the parts before it
link_to part, project_commits_path(@project, tree_join(@ref, parts[0..i].join('/'))) link_to part, project_commits_path(@project, tree_join(@ref, parts[0..i].join('/')))
......
%h3.page_title Background Jobs %h3.page-title Background Jobs
%br %br
.ui-box .ui-box
%iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"} %iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"}
.admin_dash.row .admin_dash.row
.span4 .span4
.ui-box .ui-box
%h5.title Projects .title Projects
.data.padded .data.padded
= link_to admin_projects_path do = link_to admin_projects_path do
%h1= Project.count %h1= Project.count
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
= link_to 'New Project', new_project_path, class: "btn btn-small" = link_to 'New Project', new_project_path, class: "btn btn-small"
.span4 .span4
.ui-box .ui-box
%h5.title Users .title Users
.data.padded .data.padded
= link_to admin_users_path do = link_to admin_users_path do
%h1= User.count %h1= User.count
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
= link_to 'New User', new_admin_user_path, class: "btn btn-small" = link_to 'New User', new_admin_user_path, class: "btn btn-small"
.span4 .span4
.ui-box .ui-box
%h5.title Groups .title Groups
.data.padded .data.padded
= link_to admin_groups_path do = link_to admin_groups_path do
%h1= Group.count %h1= Group.count
......
%h3.page_title Edit Group %h3.page-title Edit Group
%hr %hr
= form_for [:admin, @group] do |f| = form_for [:admin, @group] do |f|
- if @group.errors.any? - if @group.errors.any?
......
%h3.page_title %h3.page-title
Groups (#{@groups.total_count}) Groups (#{@groups.total_count})
%small %small
allows you to keep projects organized. allows you to keep projects organized.
......
%h3.page_title New Group %h3.page-title New Group
%hr %hr
= form_for [:admin, @group] do |f| = form_for [:admin, @group] do |f|
- if @group.errors.any? - if @group.errors.any?
......
%h3.page_title %h3.page-title
Group: #{@group.name} Group: #{@group.name}
= link_to edit_admin_group_path(@group), class: "btn btn-small pull-right" do = link_to edit_admin_group_path(@group), class: "btn btn-small pull-right" do
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.row .row
.span6 .span6
.ui-box .ui-box
%h5.title .title
Group info: Group info:
%ul.well-list %ul.well-list
%li %li
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
= @group.created_at.stamp("March 1, 1999") = @group.created_at.stamp("March 1, 1999")
.ui-box .ui-box
%h5.title .title
Projects Projects
%small %small
(#{@group.projects.count}) (#{@group.projects.count})
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
.span6 .span6
.ui-box .ui-box
%h5.title .title
Add user(s) to the group: Add user(s) to the group:
.ui-box-body.form-holder .ui-box-body.form-holder
%p.light %p.light
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
%hr %hr
= submit_tag 'Add users into group', class: "btn btn-create" = submit_tag 'Add users into group', class: "btn btn-create"
.ui-box .ui-box
%h5.title .title
%strong #{@group.name} %strong #{@group.name}
Group Members Group Members
%small %small
......
...@@ -11,57 +11,57 @@ ...@@ -11,57 +11,57 @@
%p.light To prevent performance issues admin logs output the last 2000 lines %p.light To prevent performance issues admin logs output the last 2000 lines
.tab-content .tab-content
.tab-pane.active#githost .tab-pane.active#githost
.file_holder#README .file-holder#README
.file_title .file-title
%i.icon-file %i.icon-file
githost.log githost.log
.pull-right .pull-right
= link_to '#', class: 'log-bottom' do = link_to '#', class: 'log-bottom' do
%i.icon-arrow-down %i.icon-arrow-down
Scroll down Scroll down
.file_content.logs .file-content.logs
%ol %ol
- Gitlab::GitLogger.read_latest.each do |line| - Gitlab::GitLogger.read_latest.each do |line|
%li %li
%p= line %p= line
.tab-pane#application .tab-pane#application
.file_holder#README .file-holder#README
.file_title .file-title
%i.icon-file %i.icon-file
application.log application.log
.pull-right .pull-right
= link_to '#', class: 'log-bottom' do = link_to '#', class: 'log-bottom' do
%i.icon-arrow-down %i.icon-arrow-down
Scroll down Scroll down
.file_content.logs .file-content.logs
%ol %ol
- Gitlab::AppLogger.read_latest.each do |line| - Gitlab::AppLogger.read_latest.each do |line|
%li %li
%p= line %p= line
.tab-pane#production .tab-pane#production
.file_holder#README .file-holder#README
.file_title .file-title
%i.icon-file %i.icon-file
production.log production.log
.pull-right .pull-right
= link_to '#', class: 'log-bottom' do = link_to '#', class: 'log-bottom' do
%i.icon-arrow-down %i.icon-arrow-down
Scroll down Scroll down
.file_content.logs .file-content.logs
%ol %ol
- Gitlab::Logger.read_latest_for('production.log').each do |line| - Gitlab::Logger.read_latest_for('production.log').each do |line|
%li %li
%p= line %p= line
.tab-pane#sidekiq .tab-pane#sidekiq
.file_holder#README .file-holder#README
.file_title .file-title
%i.icon-file %i.icon-file
sidekiq.log sidekiq.log
.pull-right .pull-right
= link_to '#', class: 'log-bottom' do = link_to '#', class: 'log-bottom' do
%i.icon-arrow-down %i.icon-arrow-down
Scroll down Scroll down
.file_content.logs .file-content.logs
%ol %ol
- Gitlab::Logger.read_latest_for('sidekiq.log').each do |line| - Gitlab::Logger.read_latest_for('sidekiq.log').each do |line|
%li %li
......
%h3.page_title %h3.page-title
Projects Projects
= link_to 'New Project', new_project_path, class: "btn btn-small pull-right" = link_to 'New Project', new_project_path, class: "btn btn-small pull-right"
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
= link_to "Reset", admin_projects_path, class: "btn" = link_to "Reset", admin_projects_path, class: "btn"
.span8 .span8
.ui-box .ui-box
%h5.title .title
Projects (#{@projects.total_count}) Projects (#{@projects.total_count})
%ul.well-list %ul.well-list
- @projects.each do |project| - @projects.each do |project|
......
%h3.page_title %h3.page-title
Project: #{@project.name_with_namespace} Project: #{@project.name_with_namespace}
= link_to edit_project_path(@project), class: "btn pull-right" do = link_to edit_project_path(@project), class: "btn pull-right" do
%i.icon-edit %i.icon-edit
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.row .row
.span6 .span6
.ui-box .ui-box
%h5.title .title
Project info: Project info:
%ul.well-list %ul.well-list
%li %li
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
.span6 .span6
- if @group - if @group
.ui-box .ui-box
%h5.title .title
%strong #{@group.name} Group %strong #{@group.name} Group
members (#{@group.users_groups.count}) members (#{@group.users_groups.count})
.pull-right .pull-right
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
= render 'users_groups/users_group', member: member, show_controls: false = render 'users_groups/users_group', member: member, show_controls: false
.ui-box .ui-box
%h5.title .title
Team Team
%small %small
(#{@project.users.count}) (#{@project.users.count})
......
%h3.page_title %h3.page-title
#{@user.name} → #{@user.name} →
%i.icon-edit %i.icon-edit
Edit user Edit user
......
%h3.page_title %h3.page-title
Users Users
= link_to 'New User', new_admin_user_path, class: "btn btn-small pull-right" = link_to 'New User', new_admin_user_path, class: "btn btn-small pull-right"
%br %br
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
.span9 .span9
.ui-box .ui-box
%h5.title .title
Users (#{@users.total_count}) Users (#{@users.total_count})
%ul.well-list %ul.well-list
- @users.each do |user| - @users.each do |user|
......
%h3.page_title %h3.page-title
%i.icon-plus %i.icon-plus
New user New user
%hr %hr
......
%h3.page_title %h3.page-title
User: User:
= @user.name = @user.name
- if @user.blocked? - if @user.blocked?
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
.row .row
.span6 .span6
.ui-box .ui-box
%h5.title .title
Account: Account:
.pull-right .pull-right
= image_tag gravatar_icon(@user.email, 32), class: "avatar s32" = image_tag gravatar_icon(@user.email, 32), class: "avatar s32"
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
- if @user.users_groups.present? - if @user.users_groups.present?
.ui-box .ui-box
%h5.title Groups: .title Groups:
%ul.well-list %ul.well-list
- @user.users_groups.each do |user_group| - @user.users_groups.each do |user_group|
- group = user_group.group - group = user_group.group
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
.span6 .span6
.ui-box .ui-box
%h5.title Projects (#{@projects.count}) .title Projects (#{@projects.count})
%ul.well-list %ul.well-list
- @projects.sort_by(&:name_with_namespace).each do |project| - @projects.sort_by(&:name_with_namespace).each do |project|
- tm = project.team.find_tm(@user.id) - tm = project.team.find_tm(@user.id)
......
.ui-box .ui-box
%h5.title.clearfix .title.clearfix
= search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter' = search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter'
- if current_user.can_create_group? - if current_user.can_create_group?
%span.pull-right %span.pull-right
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
- groups.each do |group| - groups.each do |group|
%li.group-row %li.group-row
= link_to group_path(id: group.path), class: dom_class(group) do = link_to group_path(id: group.path), class: dom_class(group) do
%span.group-name %span.group-name.filter-title
= truncate(group.name, length: 35) = truncate(group.name, length: 35)
%span.arrow %span.arrow
%i.icon-angle-right %i.icon-angle-right
......
.ui-box .ui-box
%h5.title.clearfix .title.clearfix
= search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter' = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter'
- if current_user.can_create_project? - if current_user.can_create_project?
%span.pull-right %span.pull-right
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
- if project.namespace - if project.namespace
= project.namespace.human_name = project.namespace.human_name
\/ \/
%span.project-name %span.project-name.filter-title
= truncate(project.name, length: 25) = truncate(project.name, length: 25)
%span.arrow %span.arrow
%i.icon-angle-right %i.icon-angle-right
......
%h3.page_title %h3.page-title
Issues Issues
%span.light %span.light
– –
Assigned to you Assigned to you
%span.pull-right #{@issues.total_count} issues %span.pull-right #{@issues.total_count} issues
%br
.row .row
.span3 .span3
= render 'filter', entity: 'issue' = render 'filter', entity: 'issue'
...@@ -15,7 +13,7 @@ ...@@ -15,7 +13,7 @@
- @issues.group_by(&:project).each do |group| - @issues.group_by(&:project).each do |group|
%div.ui-box %div.ui-box
- project = group[0] - project = group[0]
%h5.title .title
= link_to_project project = link_to_project project
   
%i.icon-angle-right %i.icon-angle-right
......
%h3.page_title %h3.page-title
Merge Requests Merge Requests
%span.light %span.light
– –
Authored by or assigned to you Authored by or assigned to you
%span.pull-right #{@merge_requests.total_count} merge requests %span.pull-right #{@merge_requests.total_count} merge requests
%br
.row .row
.span3 .span3
= render 'filter', entity: 'merge_request' = render 'filter', entity: 'merge_request'
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
.span9 .span9
.ui-box .ui-box
%h5.title .title
Projects (#{@projects.total_count}) Projects (#{@projects.total_count})
.pull-right.light .pull-right.light
%small Last activity %small Last activity
......
= form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f| = form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f|
%h3.page_title Reset password %h3.page-title Reset password
%br %br
= devise_error_messages! = devise_error_messages!
= f.email_field :email, placeholder: "Email", class: "text" = f.email_field :email, placeholder: "Email", class: "text"
......
= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: "login-box" }) do |f| = form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: "login-box" }) do |f|
%h3.page_title Sign Up %h3.page-title Sign Up
%br %br
= devise_error_messages! = devise_error_messages!
%div %div
......
.login-box .login-box
%h3.page_title Sign in %h3.page-title Sign in
%br %br
- if ldap_enabled? - if ldap_enabled?
%ul.nav.nav-tabs %ul.nav.nav-tabs
......
%h1.http_status_code 403 %h1.http_status_code 403
%h3.page_title Access Denied %h3.page-title Access Denied
%hr %hr
%p You are not allowed to access this page. %p You are not allowed to access this page.
%p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"} %p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"}
%h1.http_status_code 500 %h1.http_status_code 500
%h3.page_title Encoding Error %h3.page-title Encoding Error
%hr %hr
%p Page can't be loaded because of an encoding error. %p Page can't be loaded because of an encoding error.
%h1.http_status_code 404 %h1.http_status_code 404
%h3.page_title Git Resource Not found %h3.page-title Git Resource Not found
%hr %hr
%p %p
Application can't get access to some branch or commit in your repository. It Application can't get access to some branch or commit in your repository. It
......
%h1.http_status_code 404 %h1.http_status_code 404
%h3.page_title The resource you were looking for doesn't exist. %h3.page-title The resource you were looking for doesn't exist.
%hr %hr
%p You may have mistyped the address or the page may have moved. %p You may have mistyped the address or the page may have moved.
= form_tag group_filter_path(entity), method: 'get' do = form_tag group_filter_path(entity), method: 'get' do
%fieldset.dashboard-search-filter
= search_field_tag "search", params[:search], { placeholder: 'Search', class: 'search-text-input' }
= button_tag type: 'submit', class: 'btn' do
%i.icon-search
%fieldset %fieldset
%legend Status:
%ul.nav.nav-pills.nav-stacked %ul.nav.nav-pills.nav-stacked
%li{class: ("active" if !params[:status])} %li{class: ("active" if !params[:status])}
= link_to group_filter_path(entity, status: nil) do = link_to group_filter_path(entity, status: nil) do
......
.ui-box .ui-box
%h5.title .title
Projects (#{projects.count}) Projects (#{projects.count})
- if can? current_user, :manage_group, @group - if can? current_user, :manage_group, @group
%span.pull-right %span.pull-right
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
.tab-content .tab-content
.tab-pane.active#tab-edit .tab-pane.active#tab-edit
.ui-box .ui-box
%h5.title .title
%strong= @group.name %strong= @group.name
Group Settings: Group Settings:
%div.form-holder %div.form-holder
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
.tab-pane#tab-projects .tab-pane#tab-projects
.ui-box .ui-box
%h5.title .title
%strong= @group.name %strong= @group.name
Projects: Projects:
- if can? current_user, :manage_group, @group - if can? current_user, :manage_group, @group
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
.tab-pane#tab-transfer .tab-pane#tab-transfer
.ui-box.ui-box-danger .ui-box.ui-box-danger
%h5.title Transfer group .title Transfer group
.ui-box-body .ui-box-body
%p %p
Transferring group will cause loss of admin control over group and all child projects Transferring group will cause loss of admin control over group and all child projects
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
.tab-pane#tab-remove .tab-pane#tab-remove
.ui-box.ui-box-danger .ui-box.ui-box-danger
%h5.title Remove group .title Remove group
.ui-box-body .ui-box-body
%p %p
Remove of group will cause removing all child projects and resources. Remove of group will cause removing all child projects and resources.
......
%h3.page_title %h3.page-title
Issues Issues
%small (assigned to you) %small (assigned to you)
%small.pull-right #{@issues.total_count} issues %small.pull-right #{@issues.total_count} issues
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
- @issues.group_by(&:project).each do |group| - @issues.group_by(&:project).each do |group|
%div.ui-box %div.ui-box
- project = group[0] - project = group[0]
%h5.title .title
= link_to_project project = link_to_project project
%ul.well-list.issues-list %ul.well-list.issues-list
- group[1].each do |issue| - group[1].each do |issue|
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
Only group owners can manage group members Only group owners can manage group members
.span6 .span6
.ui-box .ui-box
%h5.title .title
%strong #{@group.name} %strong #{@group.name}
Group Members Group Members
%small %small
......
%h3.page_title %h3.page-title
Merge Requests Merge Requests
%small (authored by or assigned to you) %small (authored by or assigned to you)
%small.pull-right #{@merge_requests.total_count} merge requests %small.pull-right #{@merge_requests.total_count} merge requests
......
= render layout: 'help/api_layout' do = render layout: 'help/api_layout' do
%h3.page_title %h3.page-title
%span.light API %span.light API
%span %span
\/ \/
= @category.titleize = @category.titleize
%br %br
.file_holder .file-holder
.file_title .file-title
%i.icon-file %i.icon-file
= @category = @category
.file_content.wiki .file-content.wiki
= preserve do = preserve do
= markdown File.read(Rails.root.join("doc", "api", "#{@category}.md")) = markdown File.read(Rails.root.join("doc", "api", "#{@category}.md"))
%h3.page_title %h2.page-title
GITLAB GitLab
.pull-right .pull-right
%span= Gitlab::VERSION %span= Gitlab::VERSION
%small= Gitlab::REVISION %small= Gitlab::REVISION
%hr %p.slead
%p.lead
Self Hosted Git Management Self Hosted Git Management
%br %br
Fast, secure and stable solution based on Ruby on Rails. Fast, secure and stable solution based on Ruby on Rails.
...@@ -15,7 +14,7 @@ ...@@ -15,7 +14,7 @@
.span4 .span4
.ui-box .ui-box
.title .title
%h5 Quick help Quick help
%ul.well-list %ul.well-list
%li %li
Email your Email your
...@@ -39,7 +38,7 @@ ...@@ -39,7 +38,7 @@
.span4 .span4
.ui-box .ui-box
.title .title
%h5 User documentation User documentation
%ul.well-list %ul.well-list
%li %li
%strong= link_to "Workflow", help_workflow_path %strong= link_to "Workflow", help_workflow_path
...@@ -68,7 +67,7 @@ ...@@ -68,7 +67,7 @@
.span4 .span4
.ui-box .ui-box
.title .title
%h5 Admin documentation Admin documentation
%ul.well-list %ul.well-list
%li %li
......
= render layout: 'help/layout' do = render layout: 'help/layout' do
%h3.page_title GitLab Flavored Markdown %h3.page-title GitLab Flavored Markdown
%br %br
.help_body .help_body
......
= render layout: 'help/layout' do = render layout: 'help/layout' do
%h3.page_title Permissions %h3.page-title Permissions
%br %br
%fieldset %fieldset
......
= render layout: 'help/layout' do = render layout: 'help/layout' do
%h3.page_title Public Access %h3.page-title Public Access
%br %br
%p %p
......
= render layout: 'help/layout' do = render layout: 'help/layout' do
%h3.page_title GitLab Rake Tasks %h3.page-title GitLab Rake Tasks
%br %br
%p.slead %p.slead
...@@ -19,46 +19,46 @@ ...@@ -19,46 +19,46 @@
.tab-content .tab-content
.tab-pane.active#features .tab-pane.active#features
.file_holder .file-holder
.file_title .file-title
%i.icon-file %i.icon-file
Features Features
.file_content.wiki .file-content.wiki
= preserve do = preserve do
= markdown File.read(Rails.root.join("doc", "raketasks", "features.md")) = markdown File.read(Rails.root.join("doc", "raketasks", "features.md"))
.tab-pane#maintenance .tab-pane#maintenance
.file_holder .file-holder
.file_title .file-title
%i.icon-file %i.icon-file
Maintenance Maintenance
.file_content.wiki .file-content.wiki
= preserve do = preserve do
= markdown File.read(Rails.root.join("doc", "raketasks", "maintenance.md")) = markdown File.read(Rails.root.join("doc", "raketasks", "maintenance.md"))
.tab-pane#user_management .tab-pane#user_management
.file_holder .file-holder
.file_title .file-title
%i.icon-file %i.icon-file
User Management User Management
.file_content.wiki .file-content.wiki
= preserve do = preserve do
= markdown File.read(Rails.root.join("doc", "raketasks", "user_management.md")) = markdown File.read(Rails.root.join("doc", "raketasks", "user_management.md"))
.tab-pane#cleanup .tab-pane#cleanup
.file_holder .file-holder
.file_title .file-title
%i.icon-file %i.icon-file
Cleanup Cleanup
.file_content.wiki .file-content.wiki
= preserve do = preserve do
= markdown File.read(Rails.root.join("doc", "raketasks", "cleanup.md")) = markdown File.read(Rails.root.join("doc", "raketasks", "cleanup.md"))
.tab-pane#backup_restore .tab-pane#backup_restore
.file_holder .file-holder
.file_title .file-title
%i.icon-file %i.icon-file
Backup & Restore Backup & Restore
.file_content.wiki .file-content.wiki
= preserve do = preserve do
= markdown File.read(Rails.root.join("doc", "raketasks", "backup_restore.md")) = markdown File.read(Rails.root.join("doc", "raketasks", "backup_restore.md"))
= render layout: 'help/layout' do = render layout: 'help/layout' do
%h3.page_title SSH Keys %h3.page-title SSH Keys
%br %br
%p.slead %p.slead
......
= render layout: 'help/layout' do = render layout: 'help/layout' do
%h3.page_title System hooks %h3.page-title System hooks
%br %br
%p.slead %p.slead
......
= render layout: 'help/layout' do = render layout: 'help/layout' do
%h3.page_title Web hooks %h3.page-title Web hooks
%br %br
%p.slead %p.slead
......
= render layout: 'help/layout' do = render layout: 'help/layout' do
%h3.page_title Workflow %h3.page-title Workflow
%br %br
%ol.help %ol.help
......
- if content_for?(:page_title) - if content_for?(:page-title)
= yield :page_title = yield :page-title
.ui-box .ui-box
%h5.title .title
%strong Groups %strong Groups
(#{@groups.count}) (#{@groups.count})
- if current_user.can_create_group? - if current_user.can_create_group?
......
%h3.page_title
SSH Keys
= link_to "Add SSH Key", new_profile_key_path, class: "btn pull-right btn-primary"
%br
%p.light %p.light
SSH key allows you to establish a secure connection between your computer and GitLab SSH key allows you to establish a secure connection between your computer and GitLab
%p.light %p.light
...@@ -12,9 +7,10 @@ ...@@ -12,9 +7,10 @@
.ui-box .ui-box
%h5.title .title
SSH Keys (#{@keys.count}) SSH Keys (#{@keys.count})
.pull-right .pull-right
= link_to "Add SSH Key", new_profile_key_path, class: "btn btn-small btn-primary"
%ul.well-list#keys-table %ul.well-list#keys-table
= render @keys = render @keys
- if @keys.blank? - if @keys.blank?
......
%h3.page_title Add an SSH Key %h3.page-title Add an SSH Key
%hr %hr
= render 'form' = render 'form'
......
.row .row
.span4 .span4
.ui-box .ui-box
%h5.title .title
SSH Key SSH Key
%ul.well-list %ul.well-list
%li %li
......
%h3.page_title Setup your notification level %h3.page-title Setup your notification level
%br
%p.light %p.light
%strong Disabled %strong Disabled
......
.profile_avatar_holder = image_tag gravatar_icon(@user.email, 60), alt: '', class: 'avatar s60'
= image_tag gravatar_icon(@user.email, 90), alt: '' %h3.page-title
%h3.page_title
= @user.name = @user.name
%br %br
%small %small
......
...@@ -11,14 +11,14 @@ ...@@ -11,14 +11,14 @@
%li= link %li= link
.clear .clear
.file_holder .file-holder
.file_title .file-title
%i.icon-file %i.icon-file
%span.file_name %span.file_name
= @blob.name = @blob.name
%small= number_to_human_size @blob.size %small= number_to_human_size @blob.size
%span.options= render "projects/blob/actions" %span.options= render "projects/blob/actions"
.file_content.blame .file-content.blame
%table %table
- current_line = 1 - current_line = 1
- @blame.each do |commit, lines| - @blame.each do |commit, lines|
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
= link_to title, '#' = link_to title, '#'
%div#tree-content-holder.tree-content-holder %div#tree-content-holder.tree-content-holder
.file_holder .file-holder
.file_title .file-title
%i.icon-file %i.icon-file
%span.file_name %span.file_name
= blob.name = blob.name
......
.file_content.blob_file .file-content.blob_file
%center %center
= link_to project_blob_path(@project, @id) do = link_to project_blob_path(@project, @id) do
%div.padded %div.padded
......
.file_content.image_file .file-content.image_file
%img{ src: "data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}"} %img{ src: "data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}"}
- if gitlab_markdown?(blob.name) - if gitlab_markdown?(blob.name)
.file_content.wiki .file-content.wiki
= preserve do = preserve do
= markdown(blob.data) = markdown(blob.data)
- elsif markup?(blob.name) - elsif markup?(blob.name)
.file_content.wiki .file-content.wiki
= raw GitHub::Markup.render(blob.name, blob.data) = raw GitHub::Markup.render(blob.name, blob.data)
- else - else
.file_content.code .file-content.code
- unless blob.empty? - unless blob.empty?
%div{class: user_color_scheme_class} %div{class: user_color_scheme_class}
= raw blob.colorize(formatter: :gitlab) = raw blob.colorize(formatter: :gitlab)
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
%li= link_to "Plain Diff", project_commit_path(@project, @commit, format: :diff) %li= link_to "Plain Diff", project_commit_path(@project, @commit, format: :diff)
= link_to project_tree_path(@project, @commit), class: "btn btn-primary grouped" do = link_to project_tree_path(@project, @commit), class: "btn btn-primary grouped" do
%span Browse Code » %span Browse Code »
%h3.commit-title.page_title %h3.commit-title.page-title
= gfm escape_once(@commit.title) = gfm escape_once(@commit.title)
- if @commit.description.present? - if @commit.description.present?
%pre.commit-description %pre.commit-description
......
- @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits| - @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits|
%div.ui-box %div.ui-box
%h5.title .title
%i.icon-calendar %i.icon-calendar
%span= day.stamp("28 Aug, 2010") %span= day.stamp("28 Aug, 2010")
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
- if @path.present? - if @path.present?
%ul.breadcrumb %ul.breadcrumb
%li.light
History for
= commits_breadcrumbs = commits_breadcrumbs
%div{id: dom_id(@project)} %div{id: dom_id(@project)}
......
= render "projects/commits/head" = render "projects/commits/head"
%h3.page_title %h3.page-title
Compare View Compare View
%hr
= render "form" = render "form"
= render "projects/commits/head" = render "projects/commits/head"
%h3.page_title %h3.page-title
Compare View Compare View
%hr
= render "form" = render "form"
...@@ -14,7 +13,7 @@ ...@@ -14,7 +13,7 @@
- if @commits.present? - if @commits.present?
%div.ui-box %div.ui-box
%h5.title .title
Commits (#{@commits.count}) Commits (#{@commits.count})
%ul.well-list= render Commit.decorate(@commits) %ul.well-list= render Commit.decorate(@commits)
......
%h3.page_title New Deploy key %h3.page-title New Deploy key
%hr %hr
= render 'form' = render 'form'
%h3.page_title %h3.page-title
Deploy key: Deploy key:
= @key.title = @key.title
%small %small
created at created at
= @key.created_at.stamp("Aug 21, 2011") = @key.created_at.stamp("Aug 21, 2011")
.back_link .back-link
= link_to project_deploy_keys_path(@project) do = link_to project_deploy_keys_path(@project) do
← To keys list ← To keys list
%hr %hr
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.project-edit-errors .project-edit-errors
.project-edit-content .project-edit-content
.ui-box.white .ui-box.white
%h5.title .title
%strong= @project.name %strong= @project.name
Project Settings: Project Settings:
.form-holder .form-holder
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
- if can?(current_user, :change_namespace, @project) - if can?(current_user, :change_namespace, @project)
.ui-box.ui-box-danger .ui-box.ui-box-danger
%h5.title Transfer project .title Transfer project
.errors-holder .errors-holder
.form-holder .form-holder
= form_for(@project, url: transfer_project_path(@project), remote: true, html: { class: 'transfer-project' }) do |f| = form_for(@project, url: transfer_project_path(@project), remote: true, html: { class: 'transfer-project' }) do |f|
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
%p.nothing_here_message Only project owner can transfer a project %p.nothing_here_message Only project owner can transfer a project
.ui-box.ui-box-danger .ui-box.ui-box-danger
%h5.title Rename repository .title Rename repository
.errors-holder .errors-holder
.form-holder .form-holder
= form_for(@project) do |f| = form_for(@project) do |f|
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
- if can?(current_user, :remove_project, @project) - if can?(current_user, :remove_project, @project)
.ui-box.ui-box-danger .ui-box.ui-box-danger
%h5.title Remove project .title Remove project
.ui-box-body .ui-box-body
%p %p
Remove of project will cause removing repository and all related resources like issues, merge requests etc. Remove of project will cause removing repository and all related resources like issues, merge requests etc.
......
.file-editor .file-editor
= form_tag(project_edit_tree_path(@project, @id), method: :put, class: "form-horizontal") do = form_tag(project_edit_tree_path(@project, @id), method: :put, class: "form-horizontal") do
.file_holder .file-holder
.file_title .file-title
%i.icon-file %i.icon-file
%span.file_name %span.file_name
= @path = @path
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
%span.options %span.options
.btn-group.tree-btn-group .btn-group.tree-btn-group
= link_to "Cancel", project_blob_path(@project, @id), class: "btn btn-tiny btn-cancel", confirm: leave_edit_message = link_to "Cancel", project_blob_path(@project, @id), class: "btn btn-tiny btn-cancel", confirm: leave_edit_message
.file_content.code .file-content.code
%pre#editor= @blob.data %pre#editor= @blob.data
.control-group.commit_message-group .control-group.commit_message-group
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
= text_area_tag 'commit_message', '', placeholder: "Update #{@blob.name}", required: true, rows: 3 = text_area_tag 'commit_message', '', placeholder: "Update #{@blob.name}", required: true, rows: 3
.form-actions .form-actions
= hidden_field_tag 'last_commit', @last_commit = hidden_field_tag 'last_commit', @last_commit
= hidden_field_tag 'content', '', id: :file_content = hidden_field_tag 'content', '', id: "file-content"
.commit-button-annotation .commit-button-annotation
= button_tag "Commit changes", class: 'btn commit-btn js-commit-button btn-primary' = button_tag "Commit changes", class: 'btn commit-btn js-commit-button btn-primary'
.message .message
...@@ -40,6 +40,6 @@ ...@@ -40,6 +40,6 @@
disableButtonIfEmptyField("#commit_message", ".js-commit-button"); disableButtonIfEmptyField("#commit_message", ".js-commit-button");
$(".js-commit-button").click(function(){ $(".js-commit-button").click(function(){
$("#file_content").val(editor.getValue()); $("#file-content").val(editor.getValue());
$(".file-editor form").submit(); $(".file-editor form").submit();
}); });
.loading-graph .loading-graph
%center %center
.loading .loading
%h3.page_title Building repository graph. Please wait a moment. %h3.page-title Building repository graph. Please wait a moment.
.stat-graph .stat-graph
.header.clearfix .header.clearfix
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
%option{:value => "commits"} Commits %option{:value => "commits"} Commits
%option{:value => "additions"} Additions %option{:value => "additions"} Additions
%option{:value => "deletions"} Deletions %option{:value => "deletions"} Deletions
%h3#date_header.page_title %h3#date_header.page-title
%input#brush_change{:type => "hidden"} %input#brush_change{:type => "hidden"}
.graphs .graphs
#contributors-master #contributors-master
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
-if @hooks.any? -if @hooks.any?
.ui-box .ui-box
%h5.title .title
Hooks (#{@hooks.count}) Hooks (#{@hooks.count})
%ul.well-list %ul.well-list
- @hooks.each do |hook| - @hooks.each do |hook|
......
%div.issue-form-holder %div.issue-form-holder
%h3.page_title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}" %h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
= form_for [@project, @issue] do |f| = form_for [@project, @issue] do |f|
-if @issue.errors.any? -if @issue.errors.any?
.alert.alert-error .alert.alert-error
......
= render "head" = render "head"
.issues_content .issues_content
%h3.page_title %h3.page-title
Issues Issues
%span (<span class=issue_counter>#{@issues.total_count}</span>) %span (<span class=issue_counter>#{@issues.total_count}</span>)
.pull-right .pull-right
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
= hidden_field_tag :label_name, params[:label_name], id: 'search_label_name' = hidden_field_tag :label_name, params[:label_name], id: 'search_label_name'
= search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search input-xlarge append-right-10 search-text-input' } = search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search input-xlarge append-right-10 search-text-input' }
.clearfix
.row .row
.span3 .span3
= render 'filter', entity: 'issue' = render 'filter', entity: 'issue'
......
%h3.page_title %h3.page-title
Issue ##{@issue.id} Issue ##{@issue.id}
%small %small
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
.pull-right .pull-right
.span3#votes= render 'votes/votes_block', votable: @issue .span3#votes= render 'votes/votes_block', votable: @issue
.back_link .back-link
= link_to project_issues_path(@project) do = link_to project_issues_path(@project) do
&larr; To issues list &larr; To issues list
......
= render "projects/issues/head" = render "projects/issues/head"
%h3.page_title %h3.page-title
Labels Labels
%br %br
......
%h3.page_title %h3.page-title
= "Edit merge request #{@merge_request.id}" = "Edit merge request #{@merge_request.id}"
%hr %hr
= render 'form' = render 'form'
...@@ -2,11 +2,9 @@ ...@@ -2,11 +2,9 @@
= link_to new_project_merge_request_path(@project), class: "pull-right btn btn-primary", title: "New Merge Request" do = link_to new_project_merge_request_path(@project), class: "pull-right btn btn-primary", title: "New Merge Request" do
%i.icon-plus %i.icon-plus
New Merge Request New Merge Request
%h3.page_title %h3.page-title
Merge Requests Merge Requests
%br
.row .row
.span3 .span3
......
%h3.page_title New Merge Request %h3.page-title New Merge Request
%hr %hr
= render 'form' = render 'form'
- if @commits.present? - if @commits.present?
.ui-box .ui-box
%h5.title .title
%i.icon-list %i.icon-list
Commits (#{@commits.count}) Commits (#{@commits.count})
.commits .commits
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
%strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge" %strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge"
for instructions for instructions
.accept_group .accept_group
= f.submit "Accept Merge Request", class: "btn success accept_merge_request" = f.submit "Accept Merge Request", class: "btn btn-success accept_merge_request"
- unless @project.root_ref? @merge_request.source_branch - unless @project.root_ref? @merge_request.source_branch
.remove_branch_holder .remove_branch_holder
= label_tag :should_remove_source_branch, class: "checkbox" do = label_tag :should_remove_source_branch, class: "checkbox" do
......
%h3.page_title %h3.page-title
= "Merge Request ##{@merge_request.id}:" = "Merge Request ##{@merge_request.id}:"
&nbsp; &nbsp;
%span.label-branch= @merge_request.source_branch %span.label-branch= @merge_request.source_branch
...@@ -26,6 +26,6 @@ ...@@ -26,6 +26,6 @@
.pull-right .pull-right
.span3#votes= render 'votes/votes_block', votable: @merge_request .span3#votes= render 'votes/votes_block', votable: @merge_request
.back_link .back-link
= link_to project_merge_requests_path(@project) do = link_to project_merge_requests_path(@project) do
&larr; To merge requests &larr; To merge requests
%h3.page_title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}" %h3.page-title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}"
.back_link .back-link
= link_to project_milestones_path(@project) do = link_to project_milestones_path(@project) do
&larr; To milestones &larr; To milestones
......
.ui-box .ui-box
%h5.title= title .title= title
%ul.well-list %ul.well-list
- issues.each do |issue| - issues.each do |issue|
%li %li
......
= render "projects/issues/head" = render "projects/issues/head"
.milestones_content .milestones_content
%h3.page_title %h3.page-title
Milestones Milestones
- if can? current_user, :admin_milestone, @project - if can? current_user, :admin_milestone, @project
= link_to new_project_milestone_path(@project), class: "pull-right btn btn-primary", title: "New Milestone" do = link_to new_project_milestone_path(@project), class: "pull-right btn btn-primary", title: "New Milestone" do
......
= render "projects/issues/head" = render "projects/issues/head"
.row .row
.span6 .span6
%h3.page_title %h3.page-title
Milestone ##{@milestone.id} Milestone ##{@milestone.id}
%small %small
= @milestone.expires_at = @milestone.expires_at
.back_link .back-link
= link_to project_milestones_path(@project) do = link_to project_milestones_path(@project) do
&larr; To milestones list &larr; To milestones list
.span6 .span6
...@@ -84,13 +84,13 @@ ...@@ -84,13 +84,13 @@
.row .row
.span6 .span6
.ui-box .ui-box
%h5.title Open .title Open
%ul.well-list %ul.well-list
- @merge_requests.opened.each do |merge_request| - @merge_requests.opened.each do |merge_request|
= render 'merge_request', merge_request: merge_request = render 'merge_request', merge_request: merge_request
.span6 .span6
.ui-box .ui-box
%h5.title Closed .title Closed
%ul.well-list %ul.well-list
- @merge_requests.closed.each do |merge_request| - @merge_requests.closed.each do |merge_request|
= render 'merge_request', merge_request: merge_request = render 'merge_request', merge_request: merge_request
......
%h3.page_title Project Network Graph %h3.page-title Project Network Graph
%hr %hr
.clearfix .clearfix
......
%h3.page_title %h3.page-title
- if @service.activated? - if @service.activated?
%span.cgreen %span.cgreen
%i.icon-circle %i.icon-circle
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
%p= @service.description %p= @service.description
.back_link .back-link
= link_to project_services_path(@project) do = link_to project_services_path(@project) do
&larr; to services &larr; to services
......
%h3.page_title Services %h3.page-title Services
%br
%ul.bordered-list %ul.bordered-list
- @services.each do |service| - @services.each do |service|
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.loading.hide .loading.hide
.span3 .span3
.light-well .light-well
%h3.page_title %h3.page-title
= @project.name = @project.name
- if @project.description.present? - if @project.description.present?
%p.light= @project.description %p.light= @project.description
......
.file_holder .file-holder
.file_title .file-title
%i.icon-file %i.icon-file
%strong= @snippet.file_name %strong= @snippet.file_name
%span.options %span.options
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
- if can?(current_user, :admin_project_snippet, @project) || @snippet.author == current_user - if can?(current_user, :admin_project_snippet, @project) || @snippet.author == current_user
= link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-tiny", title: 'Edit Snippet' = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-tiny", title: 'Edit Snippet'
= link_to "raw", raw_project_snippet_path(@project, @snippet), class: "btn btn-tiny", target: "_blank" = link_to "raw", raw_project_snippet_path(@project, @snippet), class: "btn btn-tiny", target: "_blank"
.file_content.code .file-content.code
- unless @snippet.content.empty? - unless @snippet.content.empty?
%div{class: user_color_scheme_class} %div{class: user_color_scheme_class}
= raw @snippet.colorize(formatter: :gitlab) = raw @snippet.colorize(formatter: :gitlab)
......
%h3.page_title %h3.page-title
= @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}" = @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}"
%hr %hr
.snippet-form-holder .snippet-form-holder
...@@ -19,10 +19,10 @@ ...@@ -19,10 +19,10 @@
.file-editor .file-editor
= f.label :file_name, "File" = f.label :file_name, "File"
.input .input
.file_holder.snippet .file-holder.snippet
.file_title .file-title
= f.text_field :file_name, placeholder: "example.rb", class: 'snippet-file-name', required: true = f.text_field :file_name, placeholder: "example.rb", class: 'snippet-file-name', required: true
.file_content.code .file-content.code
%pre#editor= @snippet.content %pre#editor= @snippet.content
= f.hidden_field :content, class: 'snippet-file-content' = f.hidden_field :content, class: 'snippet-file-content'
......
%h3.page_title %h3.page-title
Snippets Snippets
%small share code pastes with others out of git repository %small share code pastes with others out of git repository
......
%h3.page_title %h3.page-title
%i.icon-lock.cgreen %i.icon-lock.cgreen
= @snippet.title = @snippet.title
...@@ -8,6 +8,5 @@ ...@@ -8,6 +8,5 @@
by by
= image_tag gravatar_icon(@snippet.author_email), class: "avatar avatar-inline s16" = image_tag gravatar_icon(@snippet.author_email), class: "avatar avatar-inline s16"
= @snippet.author_name = @snippet.author_name
%br
%div= render 'projects/snippets/blob' %div= render 'projects/snippets/blob'
%div#notes= render "projects/notes/notes_with_form" %div#notes= render "projects/notes/notes_with_form"
%h3.page_title %h3.page-title
= "New Team member(s)" = "New Team member(s)"
%hr
= form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f| = form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f|
-if @user_project_relation.errors.any? -if @user_project_relation.errors.any?
.alert.alert-error .alert.alert-error
......
.ui-box .ui-box
%h5.title .title
%strong #{@group.name} Group %strong #{@group.name} Group
members (#{@group.users_groups.count}) members (#{@group.users_groups.count})
.pull-right .pull-right
......
.team-table .team-table
- can_admin_project = (can? current_user, :admin_project, @project) - can_admin_project = (can? current_user, :admin_project, @project)
.ui-box .ui-box
%h5.title .title
%strong #{@project.name} Project %strong #{@project.name} Project
members (#{members.count}) members (#{members.count})
%ul.well-list %ul.well-list
......
%h3.page_title %h3.page-title
= "Import team from another project" = "Import team from another project"
%hr %hr
%p.slead %p.slead
......
%h3.page_title %h3.page-title
Users with access to this project Users with access to this project
- if can? current_user, :admin_team_member, @project - if can? current_user, :admin_team_member, @project
......
.file_holder#README .file-holder#README
.file_title .file-title
%i.icon-file %i.icon-file
= readme.name = readme.name
.file_content.wiki .file-content.wiki
- if gitlab_markdown?(readme.name) - if gitlab_markdown?(readme.name)
= preserve do = preserve do
= markdown(readme.data) = markdown(readme.data)
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.ui-box.ui-box-show .ui-box.ui-box-show
.ui-box-head .ui-box-head
%h3.page_title %h3.page-title
.edit-wiki-header .edit-wiki-header
= @wiki.title.titleize = @wiki.title.titleize
= f.hidden_field :title, value: @wiki.title = f.hidden_field :title, value: @wiki.title
......
%div#modal-new-wiki.modal.hide %div#modal-new-wiki.modal.hide
.modal-header .modal-header
%a.close{href: "#"} × %a.close{href: "#"} ×
%h3.page_title New Wiki Page %h3.page-title New Wiki Page
.modal-body .modal-body
= label_tag :new_wiki_path do = label_tag :new_wiki_path do
%span Page slug %span Page slug
......
= render 'nav' = render 'nav'
%h3.page_title %h3.page-title
Editing page Editing page
= render 'main_links' = render 'main_links'
= render 'form' = render 'form'
......
%h3.page_title Empty page %h3.page-title Empty page
%hr %hr
.error_message .error_message
You are not allowed to create wiki pages You are not allowed to create wiki pages
= render 'nav' = render 'nav'
%h3.page_title %h3.page-title
Git Access Git Access
%strong= @gollum_wiki.path_with_namespace %strong= @gollum_wiki.path_with_namespace
= render 'main_links' = render 'main_links'
......
= render 'nav' = render 'nav'
%h3.page_title %h3.page-title
%span.light History for %span.light History for
= @wiki.title.titleize = @wiki.title.titleize
= render 'main_links' = render 'main_links'
......
= render 'nav' = render 'nav'
%h3.page_title %h3.page-title
All Pages All Pages
= render 'main_links' = render 'main_links'
%br %br
......
= render 'nav' = render 'nav'
%h3.page_title %h3.page-title
= @wiki.title.titleize = @wiki.title.titleize
= render 'main_links' = render 'main_links'
%br %br
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
This is an old version of this page. This is an old version of this page.
You can view the #{link_to "most recent version", project_wiki_path(@project, @wiki)} or browse the #{link_to "history", history_project_wiki_path(@project, @wiki)}. You can view the #{link_to "most recent version", project_wiki_path(@project, @wiki)} or browse the #{link_to "history", history_project_wiki_path(@project, @wiki)}.
.file_holder .file-holder
.file_content.wiki .file-content.wiki
= preserve do = preserve do
= render_wiki_content(@wiki) = render_wiki_content(@wiki)
......
.row .row
.span6 .span6
%h3.page_title %h3.page-title
Projects (#{@projects.total_count}) Projects (#{@projects.total_count})
%small with read-only access %small with read-only access
.span6 .span6
......
%li %li
.file_holder .file-holder
.file_title .file-title
= link_to project_blob_path(@project, tree_join(blob.ref, blob.filename), :anchor => "L" + blob.startline.to_s) do = link_to project_blob_path(@project, tree_join(blob.ref, blob.filename), :anchor => "L" + blob.startline.to_s) do
%i.icon-file %i.icon-file
%strong %strong
= blob.filename = blob.filename
.file_content.code.term .file-content.code.term
%div{class: user_color_scheme_class} %div{class: user_color_scheme_class}
= raw blob.colorize( formatter: :gitlab, options: { first_line_number: blob.startline } ) = raw blob.colorize( formatter: :gitlab, options: { first_line_number: blob.startline } )
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- @merge_requests.group_by(&:project).each do |group| - @merge_requests.group_by(&:project).each do |group|
.ui-box .ui-box
- project = group[0] - project = group[0]
%h5.title .title
= link_to_project project = link_to_project project
%ul.well-list.mr-list %ul.well-list.mr-list
- group[1].each do |merge_request| - group[1].each do |merge_request|
......
.file_holder .file-holder
.file_title .file-title
%i.icon-file %i.icon-file
%strong= @snippet.file_name %strong= @snippet.file_name
%span.options %span.options
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
= link_to "Edit", edit_snippet_path(@snippet), class: "btn btn-tiny", title: 'Edit Snippet' = link_to "Edit", edit_snippet_path(@snippet), class: "btn btn-tiny", title: 'Edit Snippet'
= link_to "Delete", snippet_path(@snippet), method: :delete, confirm: "Are you sure?", class: "btn btn-tiny", title: 'Delete Snippet' = link_to "Delete", snippet_path(@snippet), method: :delete, confirm: "Are you sure?", class: "btn btn-tiny", title: 'Delete Snippet'
= link_to "Raw", raw_snippet_path(@snippet), class: "btn btn-tiny", target: "_blank" = link_to "Raw", raw_snippet_path(@snippet), class: "btn btn-tiny", target: "_blank"
.file_content.code .file-content.code
- unless @snippet.content.empty? - unless @snippet.content.empty?
%div{class: user_color_scheme_class} %div{class: user_color_scheme_class}
= raw @snippet.colorize(formatter: :gitlab) = raw @snippet.colorize(formatter: :gitlab)
......
%h3.page_title %h3.page-title
= @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}" = @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}"
%hr %hr
.snippet-form-holder .snippet-form-holder
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
.file-editor .file-editor
= f.label :file_name, "File" = f.label :file_name, "File"
.input .input
.file_holder.snippet .file-holder.snippet
.file_title .file-title
= f.text_field :file_name, placeholder: "example.rb", class: 'snippet-file-name', required: true = f.text_field :file_name, placeholder: "example.rb", class: 'snippet-file-name', required: true
.file_content.code .file-content.code
%pre#editor= @snippet.content %pre#editor= @snippet.content
= f.hidden_field :content, class: 'snippet-file-content' = f.hidden_field :content, class: 'snippet-file-content'
......
%h3.page_title %h3.page-title
My Snippets My Snippets
%small share code pastes with others out of git repository %small share code pastes with others out of git repository
.pull-right .pull-right
......
%h3.page_title %h3.page-title
Public snippets Public snippets
%small share code pastes with others out of git repository %small share code pastes with others out of git repository
......
%h3.page_title %h3.page-title
- if @snippet.private? - if @snippet.private?
%i{:class => "icon-lock cgreen has_bottom_tooltip", "data-original-title" => "Private snippet"} %i{:class => "icon-lock cgreen has_bottom_tooltip", "data-original-title" => "Private snippet"}
- else - else
...@@ -12,5 +12,4 @@ ...@@ -12,5 +12,4 @@
by by
= image_tag gravatar_icon(@snippet.author_email), class: "avatar avatar-inline s16" = image_tag gravatar_icon(@snippet.author_email), class: "avatar avatar-inline s16"
= @snippet.author_name = @snippet.author_name
%br
%div= render 'blob' %div= render 'blob'
%h3.page_title %h3.page-title
= image_tag gravatar_icon(@user.email), class: "avatar s24" = image_tag gravatar_icon(@user.email), class: "avatar s24"
= @user.name = @user.name
%span %span
......
.ui-box .ui-box
%h5.title .title
Profile Profile
%ul.well-list %ul.well-list
%li %li
......
.ui-box .ui-box
%h5.title Projects .title Projects
%ul.well-list %ul.well-list
- @projects.each do |project| - @projects.each do |project|
%li %li
......
.row .row
.span8 .span8
%h3.page_title %h3.page-title
= image_tag gravatar_icon(@user.email, 90), class: "avatar s90", alt: '' = image_tag gravatar_icon(@user.email, 90), class: "avatar s90", alt: ''
= @user.name = @user.name
- if @user == current_user - if @user == current_user
......
...@@ -48,7 +48,7 @@ class ProjectBrowseCommits < Spinach::FeatureSteps ...@@ -48,7 +48,7 @@ class ProjectBrowseCommits < Spinach::FeatureSteps
page.should have_selector('ul.breadcrumb span.divider', count: 3) page.should have_selector('ul.breadcrumb span.divider', count: 3)
page.should have_selector('ul.breadcrumb a', count: 4) page.should have_selector('ul.breadcrumb a', count: 4)
find('ul.breadcrumb li:first a')['href'].should match(/#{@project.path_with_namespace}\/commits\/master\z/) find('ul.breadcrumb li:nth-child(2) a')['href'].should match(/#{@project.path_with_namespace}\/commits\/master\z/)
find('ul.breadcrumb li:last a')['href'].should match(%r{master/app/models/project\.rb\z}) find('ul.breadcrumb li:last a')['href'].should match(%r{master/app/models/project\.rb\z})
end end
......
...@@ -42,7 +42,7 @@ class ProjectSnippets < Spinach::FeatureSteps ...@@ -42,7 +42,7 @@ class ProjectSnippets < Spinach::FeatureSteps
end end
And 'I click link "Edit"' do And 'I click link "Edit"' do
within ".file_title" do within ".file-title" do
click_link "Edit" click_link "Edit"
end end
end end
......
...@@ -13,7 +13,7 @@ class SnippetsFeature < Spinach::FeatureSteps ...@@ -13,7 +13,7 @@ class SnippetsFeature < Spinach::FeatureSteps
end end
And 'I click link "Edit"' do And 'I click link "Edit"' do
within ".file_title" do within ".file-title" do
click_link "Edit" click_link "Edit"
end end
end end
......
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