Commit 5b2aa853 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix compare view and services

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent d7a48443
...@@ -33,3 +33,7 @@ fieldset legend { ...@@ -33,3 +33,7 @@ fieldset legend {
label.control-label { label.control-label {
@extend .col-sm-2; @extend .col-sm-2;
} }
.inline-input-group {
width: 250px;
}
...@@ -158,7 +158,8 @@ ...@@ -158,7 +158,8 @@
.title { .title {
background: #D65; background: #D65;
color: #fff; color: #fff;
text-shadow: 0 1px 1px #900; text-shadow: none;
font-weight: 500;
} }
} }
......
...@@ -399,8 +399,8 @@ ...@@ -399,8 +399,8 @@
.commits-compare-switch{ .commits-compare-switch{
background: url("switch_icon.png") no-repeat center center; background: url("switch_icon.png") no-repeat center center;
width: 22px; width: 32px;
height: 22px; height: 32px;
text-indent: -9999px; text-indent: -9999px;
float: left; float: left;
margin-right: 9px; margin-right: 9px;
......
= form_tag project_compare_index_path(@project), method: :post do = form_tag project_compare_index_path(@project), method: :post, class: 'form-inline' do
.clearfix .clearfix.append-bottom-20
.pull-left - if params[:to] && params[:from]
- if params[:to] && params[:from] = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'}
= link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has_tooltip', title: 'Switch base of comparison'} .form-group
.input-prepend .input-group.inline-input-group
%span.add-on from %span.input-group-addon from
= text_field_tag :from, params[:from], class: "span3 input-xpadding" = text_field_tag :from, params[:from], class: "form-control"
= "..." = "..."
.input-prepend .form-group
%span.add-on to .input-group.inline-input-group
= text_field_tag :to, params[:to], class: "span3 input-xpadding" %span.input-group-addon to
.pull-left = text_field_tag :to, params[:to], class: "form-control"
&nbsp; &nbsp;
= submit_tag "Compare", class: "btn btn-create commits-compare-btn" = submit_tag "Compare", class: "btn btn-create commits-compare-btn"
- if compare_to_mr_button? - if compare_to_mr_button?
= link_to compare_mr_path, class: 'prepend-left-10' do = link_to compare_mr_path, class: 'prepend-left-10' do
%strong Make a merge request %strong Make a merge request
:javascript :javascript
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
= render "form" = render "form"
- if @commits.size > 100 - if @commits.size > 100
.alert.alert-block .alert.alert-warning
%p %p
%strong Warning! This comparison includes more than 100 commits. %strong Warning! This comparison includes more than 100 commits.
%p To preserve performance the line diff is not shown. %p To preserve performance the line diff is not shown.
......
...@@ -134,9 +134,9 @@ ...@@ -134,9 +134,9 @@
.title Transfer project .title Transfer project
.errors-holder .errors-holder
.form-holder .form-holder
= form_for(@project, url: transfer_project_path(@project), method: :put, remote: true, html: { class: 'transfer-project' }) do |f| = form_for(@project, url: transfer_project_path(@project), method: :put, remote: true, html: { class: 'transfer-project form-horizontal' }) do |f|
.form-group .form-group
= f.label :namespace_id do = f.label :namespace_id, class: 'control-label' do
%span Namespace %span Namespace
.col-sm-10 .col-sm-10
.form-group .form-group
...@@ -154,15 +154,15 @@ ...@@ -154,15 +154,15 @@
.title Rename repository .title Rename repository
.errors-holder .errors-holder
.form-holder .form-holder
= form_for(@project) do |f| = form_for(@project, html: { class: 'form-horizontal' }) do |f|
.form-group .form-group
= f.label :path do = f.label :path, class: 'control-label' do
%span Path %span Path
.col-sm-10 .col-sm-9
.form-group .form-group
.input-append .input-group
= f.text_field :path = f.text_field :path, class: 'form-control'
%span.add-on .git %span.input-group-addon .git
%ul %ul
%li Be careful. Renaming a project's repository can have unintended side effects. %li Be careful. Renaming a project's repository can have unintended side effects.
%li You will need to update your local repositories to point to the new location. %li You will need to update your local repositories to point to the new location.
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.col-sm-10 .col-sm-10
%span.monospace= @path[-1] == "/" ? @path : @path + "/" %span.monospace= @path[-1] == "/" ? @path : @path + "/"
&nbsp; &nbsp;
= text_field_tag 'file_name', params[:file_name], placeholder: "sample.rb", required: true = text_field_tag 'file_name', params[:file_name], placeholder: "sample.rb", required: true, class: 'form-control'
%span %span
&nbsp; &nbsp;
on on
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
= label_tag 'commit_message', class: "control-label" do = label_tag 'commit_message', class: "control-label" do
Commit message Commit message
.col-sm-10 .col-sm-10
= text_area_tag 'commit_message', params[:commit_message], placeholder: "Added new file", required: true, rows: 3 = text_area_tag 'commit_message', params[:commit_message], placeholder: "Added new file", required: true, rows: 3, class: 'form-control'
.file-holder .file-holder
.file-title .file-title
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
%hr %hr
= form_for(@service, as: :service, url: project_service_path(@project, @service.to_param), method: :put) do |f| = form_for(@service, as: :service, url: project_service_path(@project, @service.to_param), method: :put, html: { class: 'form-horizontal' }) do |f|
- if @service.errors.any? - if @service.errors.any?
.alert.alert-danger .alert.alert-danger
%ul %ul
...@@ -32,9 +32,9 @@ ...@@ -32,9 +32,9 @@
= f.label name, class: "control-label" = f.label name, class: "control-label"
.col-sm-10 .col-sm-10
- if type == 'text' - if type == 'text'
= f.text_field name, class: "input-lg", placeholder: placeholder = f.text_field name, class: "form-control", placeholder: placeholder
- elsif type == 'textarea' - elsif type == 'textarea'
= f.text_area name, rows: 5, class: "input-lg", placeholder: placeholder = f.text_area name, rows: 5, class: "form-control", placeholder: placeholder
- elsif type == 'checkbox' - elsif type == 'checkbox'
= f.check_box name = f.check_box name
......
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