Commit a16d7558 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

parents ce527b68 0c0beec2
...@@ -61,6 +61,8 @@ $baseLineHeight: 18px !default; ...@@ -61,6 +61,8 @@ $baseLineHeight: 18px !default;
@import "gitlab_bootstrap/typography.scss"; @import "gitlab_bootstrap/typography.scss";
@import "gitlab_bootstrap/buttons.scss"; @import "gitlab_bootstrap/buttons.scss";
@import "gitlab_bootstrap/blocks.scss"; @import "gitlab_bootstrap/blocks.scss";
@import "gitlab_bootstrap/ui_box.scss";
@import "gitlab_bootstrap/issue_box.scss";
@import "gitlab_bootstrap/files.scss"; @import "gitlab_bootstrap/files.scss";
@import "gitlab_bootstrap/lists.scss"; @import "gitlab_bootstrap/lists.scss";
@import "gitlab_bootstrap/forms.scss"; @import "gitlab_bootstrap/forms.scss";
/**
* ===================================
* Contain UI block elements:
* .ui-box - for any block & widgets
* ===================================
*/
/**
* UI Block
*
*/
.ui-box {
background: #FFF;
margin-bottom: 20px;
border: 1px solid #DDD;
word-wrap: break-word;
&.small-box {
margin-bottom: 10px;
.title {
font-size: 13px;
line-height: 30px;
a {
color: #666;
&:hover {
text-decoration: underline;
}
}
}
}
&.ui-box-show {
color: #666;
margin:20px 0;
background: #FAFAFA;
.control-group {
margin-bottom: 0;
}
}
&.ui-box-danger {
background: #f7f7f7;
border: none;
.title {
background: #D65;
color: #fff;
text-shadow: 0 1px 1px #900;
}
}
img { max-width: 100%; }
pre {
code {
background: none !important;
}
}
.ui-box-head,
.ui-box-body,
.ui-box-bottom {
padding: 15px;
.clearfix {
margin: 0;
}
}
.ui-box-head {
.box-title {
font-size: 20px;
font-weight: 500;
line-height: 28px;
margin: 0;
color: #444;
}
h3 {
margin: 0;
}
}
.ui-box-body {
border: none;
background-color: #f5f5f5;
border: none;
border-top: 1px solid #eee;
}
.ui-box-bottom {
border-top: 1px solid #eee;
}
ul {
margin: 0;
}
.title {
background-color: #EEE;
border-bottom: 1px solid #DDD;
color: #666;
font-size: 16px;
text-shadow: 0 1px 1px #fff;
padding: 0 10px;
font-size: 14px;
line-height: 40px;
font-weight: normal;
margin: 0;
> a {
text-shadow: 0 1px 1px #fff;
}
form {
margin-bottom: 0;
margin-top: 0;
}
.btn {
vertical-align: middle;
padding: 4px 12px;
@include box-shadow(0 0px 1px 1px #f2f2f2);
}
.nav-pills {
> li {
> a {
padding: 13px;
margin: 0;
font-size: 13px;
}
&.active {
> a {
background: #D5D5D5;
color: $style_color;
@include border-radius(0);
border-radius: 0;
border-left: 1px solid #CCC;
border-right: 1px solid #CCC;
}
}
}
}
}
&.padded {
h5, .title {
margin: -20px;
margin-bottom: 0;
padding: 5px 20px;
}
}
.row_title {
font-weight: 500;
color: #444;
&:hover {
color: #444;
text-decoration: underline;
}
}
.form-holder {
padding-top: 20px;
form {
margin-bottom: 0;
legend {
text-indent: 10px;
}
.form-actions {
margin-bottom: 0;
}
}
}
}
.tab-pane {
.ui-box {
margin: 3px 3px 25px 3px;
}
}
.light-well { .light-well {
background: #f9f9f9; background: #f9f9f9;
padding: 15px; padding: 15px;
......
/**
* Issue box:
* Huge block (one per page) for storing title, descripion and other information.
* Used for Issue#show page, MergeRequest#show page etc
*
* CLasses:
* .issue-box - Regular box
*/
.issue-box {
color: #666;
margin:20px 0;
background: #FAFAFA;
border: 1px solid #DDD;
.control-group {
margin-bottom: 0;
}
.title {
font-size: 20px;
font-weight: 500;
line-height: 28px;
margin: 0;
color: #444;
}
.context {
border: none;
background-color: #f5f5f5;
border: none;
border-top: 1px solid #eee;
}
.description {
border-top: 1px solid #eee;
}
.title, .context, .description {
padding: 15px;
.clearfix {
margin: 0;
}
}
}
/**
* UI box:
* Block element for separating information on page.
* Used for storing issues lists, grouped data.
* You can have multiple ui boxes on one page
*
* Classes:
* .ui-box - for any block & widgets
* .ui-box.ui-box-small - same but with smaller title
* .ui-box.ui-box-danger - with red title
*
* Ex. 1: List
* .ui-box
* .title
* # title here
* %ul
* # content here
*
* Ex. 2: Block data
* .ui-box
* .title
* # title here
* .body
* # content here
*
*/
.ui-box {
background: #FFF;
margin-bottom: 20px;
border: 1px solid #DDD;
word-wrap: break-word;
img {
max-width: 100%;
}
pre {
code {
background: none !important;
}
}
ul {
margin: 0;
}
.title {
background-color: #EEE;
border-bottom: 1px solid #DDD;
color: #666;
font-size: 16px;
text-shadow: 0 1px 1px #fff;
padding: 0 10px;
font-size: 14px;
line-height: 40px;
font-weight: normal;
margin: 0;
> a {
text-shadow: 0 1px 1px #fff;
}
form {
margin-bottom: 0;
margin-top: 0;
}
.btn {
vertical-align: middle;
padding: 4px 12px;
@include box-shadow(0 0px 1px 1px #f2f2f2);
}
.nav-pills {
> li {
> a {
padding: 13px;
margin: 0;
font-size: 13px;
}
&.active {
> a {
background: #D5D5D5;
color: $style_color;
@include border-radius(0);
border-radius: 0;
border-left: 1px solid #CCC;
border-right: 1px solid #CCC;
}
}
}
}
}
.body {
padding: 10px;
}
&.padded {
h5, .title {
margin: -20px;
margin-bottom: 0;
padding: 5px 20px;
}
}
.row_title {
font-weight: 500;
color: #444;
&:hover {
color: #444;
text-decoration: underline;
}
}
.form-holder {
padding-top: 20px;
form {
margin-bottom: 0;
legend {
text-indent: 10px;
}
.form-actions {
margin-bottom: 0;
}
}
}
}
/*
* Small box
*/
.ui-box.ui-box-small {
margin-bottom: 10px;
.title {
font-size: 13px;
line-height: 30px;
a {
color: #666;
&:hover {
text-decoration: underline;
}
}
}
}
/*
* Danger box
*/
.ui-box.ui-box-danger {
background: #f7f7f7;
border: none;
.title {
background: #D65;
color: #fff;
text-shadow: 0 1px 1px #900;
}
}
/*
* Block under tw-bootstrap tabs
*/
.tab-pane {
.ui-box {
margin: 3px 3px 25px 3px;
}
}
h3.page-title .edit-wiki-header { .title .edit-wiki-header {
width: 780px; width: 780px;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.ui-box .ui-box
.title Sidekiq running processes .title Sidekiq running processes
.ui-box-body .body
- if @sidekiq_processes.empty? - if @sidekiq_processes.empty?
%h4.cred %h4.cred
%i.icon-warning-sign %i.icon-warning-sign
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
.ui-box .ui-box
.title .title
Add user(s) to the group: Add user(s) to the group:
.ui-box-body.form-holder .body.form-holder
%p.light %p.light
Read more about project permissions Read more about project permissions
%strong= link_to "here", help_permissions_path, class: "vlink" %strong= link_to "here", help_permissions_path, class: "vlink"
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
.ui-box .ui-box
.title .title
Transfer project Transfer project
.ui-box-body .body
= form_for @project, url: transfer_admin_project_path(@project), method: :put do |f| = form_for @project, url: transfer_admin_project_path(@project), method: :put do |f|
.control-group .control-group
= f.label :namespace_id, "Namespace" = f.label :namespace_id, "Namespace"
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
.tab-pane#tab-remove .tab-pane#tab-remove
.ui-box.ui-box-danger .ui-box.ui-box-danger
.title Remove group .title Remove group
.ui-box-body .body
%p %p
Removing group will cause all child projects and resources to be removed. Removing group will cause all child projects and resources to be removed.
%p %p
......
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
Unarchive project Unarchive project
- else - else
Archive project Archive project
.ui-box-body .body
- if @project.archived? - if @project.archived?
%p %p
Unarchiving the project will mark its repository as active. Unarchiving the project will mark its repository as active.
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,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
.title Remove project .title Remove project
.ui-box-body .body
%p %p
Removing the project will delete its repository and all related resources including issues, merge requests etc. Removing the project will delete its repository and all related resources including issues, merge requests etc.
%br %br
......
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
- @issue.errors.full_messages.each do |msg| - @issue.errors.full_messages.each do |msg|
%span= msg %span= msg
%br %br
.ui-box.ui-box-show .issue-box
.ui-box-head .title
.control-group .control-group
= f.label :title do = f.label :title do
%strong= "Subject *" %strong= "Subject *"
.controls .controls
= f.text_field :title, maxlength: 255, class: "input-xxlarge js-gfm-input", autofocus: true, required: true = f.text_field :title, maxlength: 255, class: "input-xxlarge js-gfm-input", autofocus: true, required: true
.ui-box-body .context
.control-group .control-group
.issue_assignee.pull-left .issue_assignee.pull-left
= f.label :assignee_id do = f.label :assignee_id do
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
Milestone Milestone
.controls= f.select(:milestone_id, milestone_options(@issue), { include_blank: "Select milestone" }, {class: 'chosen'}) .controls= f.select(:milestone_id, milestone_options(@issue), { include_blank: "Select milestone" }, {class: 'chosen'})
.ui-box-bottom .description
.control-group .control-group
= f.label :label_list do = f.label :label_list do
%i.icon-tag %i.icon-tag
......
...@@ -37,17 +37,16 @@ ...@@ -37,17 +37,16 @@
%span.light Milestone %span.light Milestone
= @issue.milestone.title = @issue.milestone.title
.ui-box.ui-box-show .issue-box
.ui-box-head %h4.title
%h4.box-title
= gfm escape_once(@issue.title) = gfm escape_once(@issue.title)
.ui-box-body .context
%cite.cgray %cite.cgray
= render partial: 'issue_context', locals: { issue: @issue } = render partial: 'issue_context', locals: { issue: @issue }
- if @issue.description.present? - if @issue.description.present?
.ui-box-bottom .description
.wiki .wiki
= preserve do = preserve do
= markdown @issue.description = markdown @issue.description
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
:plain :plain
$("##{dom_id(@issue)}").fadeOut(); $("##{dom_id(@issue)}").fadeOut();
- elsif params[:issue_context] - elsif params[:issue_context]
$('.ui-box-body').html("#{escape_javascript(render partial: 'issue_context', locals: { issue: @issue })}"); $('.issue-box .context').html("#{escape_javascript(render partial: 'issue_context', locals: { issue: @issue })}");
$('.ui-box-body').effect('highlight'); $('.issue-box .context').effect('highlight');
$('.chosen').chosen(); $('.chosen').chosen();
$('.edit-issue.inline-update input[type="submit"]').hide(); $('.edit-issue.inline-update input[type="submit"]').hide();
- if @issue.milestone - if @issue.milestone
......
.ui-box.ui-box-show .issue-box
.ui-box-head %h4.title
%h4.box-title
= gfm escape_once(@merge_request.title) = gfm escape_once(@merge_request.title)
.ui-box-body .context
%div
%cite.cgray %cite.cgray
Created by #{link_to_member(@project, @merge_request.author)}. Created by #{link_to_member(@project, @merge_request.author)}.
- if @merge_request.assignee - if @merge_request.assignee
...@@ -17,25 +15,25 @@ ...@@ -17,25 +15,25 @@
- if @merge_request.description.present? - if @merge_request.description.present?
.ui-box-bottom .description
.wiki .wiki
= preserve do = preserve do
= markdown @merge_request.description = markdown @merge_request.description
- if @merge_request.closed? - if @merge_request.closed?
.ui-box-bottom.alert-error .description.alert-error
%span %span
%i.icon-remove %i.icon-remove
Closed by #{link_to_member(@project, @merge_request.closed_event.author)} Closed by #{link_to_member(@project, @merge_request.closed_event.author)}
#{time_ago_with_tooltip(@merge_request.closed_event.created_at)} ago. #{time_ago_with_tooltip(@merge_request.closed_event.created_at)} ago.
- if @merge_request.merged? - if @merge_request.merged?
.ui-box-bottom.alert-success .description.alert-success
%span %span
%i.icon-ok %i.icon-ok
Merged by #{link_to_member(@project, @merge_request.merge_event.author)} Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
#{time_ago_with_tooltip(@merge_request.merge_event.created_at)} ago. #{time_ago_with_tooltip(@merge_request.merge_event.created_at)} ago.
- if !@closes_issues.empty? && @merge_request.opened? - if !@closes_issues.empty? && @merge_request.opened?
.ui-box-bottom.alert-info .description.alert-info
%span %span
%i.icon-ok %i.icon-ok
Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'} Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'}
......
...@@ -28,13 +28,11 @@ ...@@ -28,13 +28,11 @@
← To milestones list ← To milestones list
.ui-box.ui-box-show .issue-box
.ui-box-head %h4.title
%h4.box-title
= gfm escape_once(@milestone.title) = gfm escape_once(@milestone.title)
.ui-box-body .context
%p %p
Progress: Progress:
#{@milestone.closed_items_count} closed #{@milestone.closed_items_count} closed
...@@ -46,7 +44,7 @@ ...@@ -46,7 +44,7 @@
- if @milestone.description.present? - if @milestone.description.present?
.ui-box-bottom .description
= preserve do = preserve do
= markdown @milestone.description = markdown @milestone.description
......
...@@ -6,15 +6,14 @@ ...@@ -6,15 +6,14 @@
- @wiki.errors.full_messages.each do |msg| - @wiki.errors.full_messages.each do |msg|
%li= msg %li= msg
.ui-box.ui-box-show .issue-box
.ui-box-head %h3.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
= f.select :format, options_for_select(GollumWiki::MARKUPS, {selected: @wiki.format}), {}, class: "pull-right input-medium" = f.select :format, options_for_select(GollumWiki::MARKUPS, {selected: @wiki.format}), {}, class: "pull-right input-medium"
= f.label :format, class: "pull-right", style: "padding-right: 20px;" = f.label :format, class: "pull-right", style: "padding-right: 20px;"
.ui-box-body .context
.controls .controls
%span.cgray %span.cgray
Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
...@@ -22,11 +21,11 @@ ...@@ -22,11 +21,11 @@
%code [Link Title](page-slug) %code [Link Title](page-slug)
\. \.
.ui-box-bottom .description
.control-group .control-group
= f.label :content = f.label :content
.controls= f.text_area :content, class: 'span8 js-gfm-input', rows: 18 .controls= f.text_area :content, class: 'span8 js-gfm-input', rows: 18
.ui-box-bottom .description
.control-group .control-group
= f.label :commit_message = f.label :commit_message
.controls= f.text_field :message, class: 'span8', rows: 18 .controls= f.text_field :message, class: 'span8', rows: 18
......
- if @issues.any? - if @issues.any?
- @issues.group_by(&:project).each do |group| - @issues.group_by(&:project).each do |group|
.ui-box.small-box .ui-box.ui-box-small
- project = group[0] - project = group[0]
.title .title
= link_to_project project = link_to_project project
......
- if @merge_requests.any? - if @merge_requests.any?
- @merge_requests.group_by(&:target_project).each do |group| - @merge_requests.group_by(&:target_project).each do |group|
.ui-box.small-box .ui-box.ui-box-small
- project = group[0] - project = group[0]
.title .title
= link_to_project project = link_to_project project
......
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