Unverified Commit 5b2aa853 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Fix compare view and services


Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 2fcc331c9d6a
......@@ -33,3 +33,7 @@ fieldset legend {
label.control-label {
@extend .col-sm-2;
}
.inline-input-group {
width: 250px;
}
......@@ -158,7 +158,8 @@
.title {
background: #D65;
color: #fff;
text-shadow: 0 1px 1px #900;
text-shadow: none;
font-weight: 500;
}
}
......
......@@ -399,8 +399,8 @@
.commits-compare-switch{
background: url("switch_icon.png") no-repeat center center;
width: 22px;
height: 22px;
width: 32px;
height: 32px;
text-indent: -9999px;
float: left;
margin-right: 9px;
......
= form_tag project_compare_index_path(@project), method: :post do
.clearfix
.pull-left
- 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'}
.input-prepend
%span.add-on from
= text_field_tag :from, params[:from], class: "span3 input-xpadding"
= "..."
.input-prepend
%span.add-on to
= text_field_tag :to, params[:to], class: "span3 input-xpadding"
.pull-left
&nbsp;
= submit_tag "Compare", class: "btn btn-create commits-compare-btn"
- if compare_to_mr_button?
= link_to compare_mr_path, class: 'prepend-left-10' do
%strong Make a merge request
= form_tag project_compare_index_path(@project), method: :post, class: 'form-inline' do
.clearfix.append-bottom-20
- 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'}
.form-group
.input-group.inline-input-group
%span.input-group-addon from
= text_field_tag :from, params[:from], class: "form-control"
= "..."
.form-group
.input-group.inline-input-group
%span.input-group-addon to
= text_field_tag :to, params[:to], class: "form-control"
&nbsp;
= submit_tag "Compare", class: "btn btn-create commits-compare-btn"
- if compare_to_mr_button?
= link_to compare_mr_path, class: 'prepend-left-10' do
%strong Make a merge request
:javascript
......
......@@ -6,7 +6,7 @@
= render "form"
- if @commits.size > 100
.alert.alert-block
.alert.alert-warning
%p
%strong Warning! This comparison includes more than 100 commits.
%p To preserve performance the line diff is not shown.
......
......@@ -134,9 +134,9 @@
.title Transfer project
.errors-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
= f.label :namespace_id do
= f.label :namespace_id, class: 'control-label' do
%span Namespace
.col-sm-10
.form-group
......@@ -154,15 +154,15 @@
.title Rename repository
.errors-holder
.form-holder
= form_for(@project) do |f|
= form_for(@project, html: { class: 'form-horizontal' }) do |f|
.form-group
= f.label :path do
= f.label :path, class: 'control-label' do
%span Path
.col-sm-10
.col-sm-9
.form-group
.input-append
= f.text_field :path
%span.add-on .git
.input-group
= f.text_field :path, class: 'form-control'
%span.input-group-addon .git
%ul
%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.
......
......@@ -8,7 +8,7 @@
.col-sm-10
%span.monospace= @path[-1] == "/" ? @path : @path + "/"
&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
&nbsp;
on
......@@ -18,7 +18,7 @@
= label_tag 'commit_message', class: "control-label" do
Commit message
.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-title
......
......@@ -10,7 +10,7 @@
%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?
.alert.alert-danger
%ul
......@@ -32,9 +32,9 @@
= f.label name, class: "control-label"
.col-sm-10
- if type == 'text'
= f.text_field name, class: "input-lg", placeholder: placeholder
= f.text_field name, class: "form-control", placeholder: placeholder
- 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'
= 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