From b563312c2f59c04d535aa798e5cdfa8596f22dee Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 31 Dec 2013 16:16:50 +0200
Subject: [PATCH] Style project edit section
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
app/assets/stylesheets/generic/selects.scss | 4 ++++
app/views/dashboard/show.html.haml | 2 +-
app/views/profiles/show.html.haml | 2 +-
app/views/projects/edit.html.haml | 16 ++++++++--------
app/views/projects/hooks/index.html.haml | 13 ++++++-------
5 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/app/assets/stylesheets/generic/selects.scss b/app/assets/stylesheets/generic/selects.scss
index 8e631951641..44621b6bd16 100644
--- a/app/assets/stylesheets/generic/selects.scss
+++ b/app/assets/stylesheets/generic/selects.scss
@@ -56,3 +56,7 @@
.chosen-compact {
max-width: 170px !important;
}
+
+select.select-wide {
+ width: 200px;
+}
diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml
index e9ca495f224..c4018d4b6d8 100644
--- a/app/views/dashboard/show.html.haml
+++ b/app/views/dashboard/show.html.haml
@@ -2,7 +2,7 @@
.dashboard.row
.activities.col-md-8
= render 'activities'
- .side.col-md-4
+ .side.col-md-4.hidden-sm
= render 'sidebar'
- else
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 4e70820d09d..a97e748da65 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -52,7 +52,7 @@
= f.text_area :bio, rows: 6, class: "form-control", maxlength: 250
%span.help-block Tell us about yourself in fewer than 250 characters.
- .col-md-5.pull-right
+ .col-md-5
.light-well
= image_tag avatar_icon(@user.email, 160), alt: '', class: 'avatar s160'
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 4d365d0af48..c3201dc0049 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -7,26 +7,26 @@
%p.light Some settings, such as "Transfer Project", are hidden inside the danger area below
%hr
.form-holder
- = form_for(@project, remote: true) do |f|
+ = form_for @project, remote: true, html: { class: "edit_project form-horizontal" } do |f|
%fieldset
.form-group.project_name_holder
- = f.label :name do
+ = f.label :name, class: 'control-label' do
Project name
.col-sm-10
- = f.text_field :name, placeholder: "Example Project", class: "span5"
+ = f.text_field :name, placeholder: "Example Project", class: "form-control"
.form-group
- = f.label :description do
+ = f.label :description, class: 'control-label' do
Project description
%span.light (optional)
.col-sm-10
- = f.text_area :description, placeholder: "Awesome project", class: "span5", rows: 3, maxlength: 250
+ = f.text_area :description, placeholder: "Awesome project", class: "form-control", rows: 3, maxlength: 250
- if @project.repository.exists? && @project.repository.branch_names.any?
.form-group
- = f.label :default_branch, "Default Branch"
- .col-sm-10= f.select(:default_branch, @repository.branch_names, {}, {class: 'chosen'})
+ = f.label :default_branch, "Default Branch", class: 'control-label'
+ .col-sm-10= f.select(:default_branch, @repository.branch_names, {}, {class: 'chosen select-wide'})
= render "visibility_level", f: f, visibility_level: @project.visibility_level, can_change_visibility_level: can?(current_user, :change_visibility_level, @project)
@@ -37,7 +37,7 @@
.form-group
= f.label :label_list, "Labels", class: 'control-label'
.col-sm-10
- = f.text_field :label_list, maxlength: 2000, class: "span5"
+ = f.text_field :label_list, maxlength: 2000, class: "form-control"
%p.hint Separate labels with commas.
%fieldset.features
diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml
index 9cfcb20ea8d..5c9705b9427 100644
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@@ -7,19 +7,17 @@
%hr.clearfix
-= form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f|
+= form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-horizontal' } do |f|
-if @hook.errors.any?
.alert.alert-error
- @hook.errors.full_messages.each do |msg|
%p= msg
.form-group
- = f.label :url, "URL"
+ = f.label :url, "URL", class: 'control-label'
.col-sm-10
- = f.text_field :url, class: "text_field input-lg input-xpadding", placeholder: 'http://example.com/trigger-ci.json'
-
- = f.submit "Add Web Hook", class: "btn btn-create"
+ = f.text_field :url, class: "form-control", placeholder: 'http://example.com/trigger-ci.json'
.form-group
- = f.label :url, "Trigger"
+ = f.label :url, "Trigger", class: 'control-label'
.col-sm-10
%div
= f.check_box :push_events, class: 'pull-left'
@@ -42,7 +40,8 @@
%strong Merge Request events
%p.light
This url will be triggered for created merge requests
-%hr
+ .form-actions
+ = f.submit "Add Web Hook", class: "btn btn-create"
-if @hooks.any?
.ui-box
--
GitLab