Download as
Browse Code »

Commit b563312c2f59c04d535aa798e5cdfa8596f22dee

Authored by Dmitriy Zaporozhets
1 parent 1b5510a8
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Style project edit section 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 5 changed files with 20 additions and 17 deletions   Show diff stats
app/assets/stylesheets/generic/selects.scss
  Diff comments   View file @b563312
... ... @@ -56,3 +56,7 @@
56 56 .chosen-compact {
57 57 max-width: 170px !important;
58 58 }
  59 +
  60 +select.select-wide {
  61 + width: 200px;
  62 +}
... ...
app/views/dashboard/show.html.haml
  Diff comments   View file @b563312
... ... @@ -2,7 +2,7 @@
2 2 .dashboard.row
3 3 .activities.col-md-8
4 4 = render 'activities'
5   - .side.col-md-4
  5 + .side.col-md-4.hidden-sm
6 6 = render 'sidebar'
7 7  
8 8 - else
... ...
app/views/profiles/show.html.haml
  Diff comments   View file @b563312
... ... @@ -52,7 +52,7 @@
52 52 = f.text_area :bio, rows: 6, class: "form-control", maxlength: 250
53 53 %span.help-block Tell us about yourself in fewer than 250 characters.
54 54  
55   - .col-md-5.pull-right
  55 + .col-md-5
56 56 .light-well
57 57 = image_tag avatar_icon(@user.email, 160), alt: '', class: 'avatar s160'
58 58  
... ...
app/views/projects/edit.html.haml
  Diff comments   View file @b563312
... ... @@ -7,26 +7,26 @@
7 7 %p.light Some settings, such as "Transfer Project", are hidden inside the danger area below
8 8 %hr
9 9 .form-holder
10   - = form_for(@project, remote: true) do |f|
  10 + = form_for @project, remote: true, html: { class: "edit_project form-horizontal" } do |f|
11 11 %fieldset
12 12 .form-group.project_name_holder
13   - = f.label :name do
  13 + = f.label :name, class: 'control-label' do
14 14 Project name
15 15 .col-sm-10
16   - = f.text_field :name, placeholder: "Example Project", class: "span5"
  16 + = f.text_field :name, placeholder: "Example Project", class: "form-control"
17 17  
18 18  
19 19 .form-group
20   - = f.label :description do
  20 + = f.label :description, class: 'control-label' do
21 21 Project description
22 22 %span.light (optional)
23 23 .col-sm-10
24   - = f.text_area :description, placeholder: "Awesome project", class: "span5", rows: 3, maxlength: 250
  24 + = f.text_area :description, placeholder: "Awesome project", class: "form-control", rows: 3, maxlength: 250
25 25  
26 26 - if @project.repository.exists? && @project.repository.branch_names.any?
27 27 .form-group
28   - = f.label :default_branch, "Default Branch"
29   - .col-sm-10= f.select(:default_branch, @repository.branch_names, {}, {class: 'chosen'})
  28 + = f.label :default_branch, "Default Branch", class: 'control-label'
  29 + .col-sm-10= f.select(:default_branch, @repository.branch_names, {}, {class: 'chosen select-wide'})
30 30  
31 31  
32 32 = 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 @@
37 37 .form-group
38 38 = f.label :label_list, "Labels", class: 'control-label'
39 39 .col-sm-10
40   - = f.text_field :label_list, maxlength: 2000, class: "span5"
  40 + = f.text_field :label_list, maxlength: 2000, class: "form-control"
41 41 %p.hint Separate labels with commas.
42 42  
43 43 %fieldset.features
... ...
app/views/projects/hooks/index.html.haml
  Diff comments   View file @b563312
... ... @@ -7,19 +7,17 @@
7 7  
8 8 %hr.clearfix
9 9  
10   -= form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f|
  10 += form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-horizontal' } do |f|
11 11 -if @hook.errors.any?
12 12 .alert.alert-error
13 13 - @hook.errors.full_messages.each do |msg|
14 14 %p= msg
15 15 .form-group
16   - = f.label :url, "URL"
  16 + = f.label :url, "URL", class: 'control-label'
17 17 .col-sm-10
18   - = f.text_field :url, class: "text_field input-lg input-xpadding", placeholder: 'http://example.com/trigger-ci.json'
19   - &nbsp;
20   - = f.submit "Add Web Hook", class: "btn btn-create"
  18 + = f.text_field :url, class: "form-control", placeholder: 'http://example.com/trigger-ci.json'
21 19 .form-group
22   - = f.label :url, "Trigger"
  20 + = f.label :url, "Trigger", class: 'control-label'
23 21 .col-sm-10
24 22 %div
25 23 = f.check_box :push_events, class: 'pull-left'
... ... @@ -42,7 +40,8 @@
42 40 %strong Merge Request events
43 41 %p.light
44 42 This url will be triggered for created merge requests
45   -%hr
  43 + .form-actions
  44 + = f.submit "Add Web Hook", class: "btn btn-create"
46 45  
47 46 -if @hooks.any?
48 47 .ui-box
... ...