Download as
Browse Code »

Commit 65696aaa2e1a837d635cba1162c9293da943cbc8

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

Fix form styles 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 3 changed files with 21 additions and 16 deletions   Show diff stats
app/views/projects/deploy_keys/index.html.haml
  Diff comments   View file @65696aa
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 %hr.clearfix 12 %hr.clearfix
13 13
14 .row 14 .row
15 - .col-md-5.enabled-keys 15 + .col-md-6.enabled-keys
16 %h5 16 %h5
17 %strong.cgreen Enabled deploy keys 17 %strong.cgreen Enabled deploy keys
18 for this project 18 for this project
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 - if @enabled_keys.blank? 21 - if @enabled_keys.blank?
22 .light-well 22 .light-well
23 %p.nothing_here_message Create a #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add an existing one 23 %p.nothing_here_message Create a #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add an existing one
24 - .col-md-5.available-keys 24 + .col-md-6.available-keys
25 %h5 25 %h5
26 %strong Deploy keys 26 %strong Deploy keys
27 from projects available to you 27 from projects available to you
app/views/projects/edit.html.haml
  Diff comments   View file @65696aa
@@ -46,8 +46,9 @@ @@ -46,8 +46,9 @@
46 .form-group 46 .form-group
47 = f.label :issues_enabled, "Issues", class: 'control-label' 47 = f.label :issues_enabled, "Issues", class: 'control-label'
48 .col-sm-10 48 .col-sm-10
49 - = f.check_box :issues_enabled  
50 - %span.descr Lightweight issue tracking system for this project 49 + .checkbox
  50 + = f.check_box :issues_enabled
  51 + %span.descr Lightweight issue tracking system for this project
51 52
52 - if Project.issues_tracker.values.count > 1 53 - if Project.issues_tracker.values.count > 1
53 .form-group 54 .form-group
@@ -56,31 +57,35 @@ @@ -56,31 +57,35 @@
56 57
57 .form-group 58 .form-group
58 = f.label :issues_tracker_id, "Project name or id in issues tracker", class: 'control-label' 59 = f.label :issues_tracker_id, "Project name or id in issues tracker", class: 'control-label'
59 - .col-sm-10= f.text_field :issues_tracker_id, disabled: !@project.can_have_issues_tracker_id? 60 + .col-sm-10= f.text_field :issues_tracker_id, disabled: !@project.can_have_issues_tracker_id?, class: 'form-control'
60 61
61 .form-group 62 .form-group
62 = f.label :merge_requests_enabled, "Merge Requests", class: 'control-label' 63 = f.label :merge_requests_enabled, "Merge Requests", class: 'control-label'
63 .col-sm-10 64 .col-sm-10
64 - = f.check_box :merge_requests_enabled  
65 - %span.descr Submit changes to be merged upstream. 65 + .checkbox
  66 + = f.check_box :merge_requests_enabled
  67 + %span.descr Submit changes to be merged upstream.
66 68
67 .form-group 69 .form-group
68 = f.label :wiki_enabled, "Wiki", class: 'control-label' 70 = f.label :wiki_enabled, "Wiki", class: 'control-label'
69 .col-sm-10 71 .col-sm-10
70 - = f.check_box :wiki_enabled  
71 - %span.descr Pages for project documentation 72 + .checkbox
  73 + = f.check_box :wiki_enabled
  74 + %span.descr Pages for project documentation
72 75
73 .form-group 76 .form-group
74 = f.label :wall_enabled, "Wall", class: 'control-label' 77 = f.label :wall_enabled, "Wall", class: 'control-label'
75 .col-sm-10 78 .col-sm-10
76 - = f.check_box :wall_enabled  
77 - %span.descr Simple chat system for broadcasting inside project 79 + .checkbox
  80 + = f.check_box :wall_enabled
  81 + %span.descr Simple chat system for broadcasting inside project
78 82
79 .form-group 83 .form-group
80 = f.label :snippets_enabled, "Snippets", class: 'control-label' 84 = f.label :snippets_enabled, "Snippets", class: 'control-label'
81 .col-sm-10 85 .col-sm-10
82 - = f.check_box :snippets_enabled  
83 - %span.descr Share code pastes with others out of git repository 86 + .checkbox
  87 + = f.check_box :snippets_enabled
  88 + %span.descr Share code pastes with others out of git repository
84 89
85 90
86 .form-actions 91 .form-actions
app/views/projects/team_members/import.html.haml
  Diff comments   View file @65696aa
@@ -3,9 +3,9 @@ @@ -3,9 +3,9 @@
3 %p.light 3 %p.light
4 Only project members will be imported. Group members will be skipped. 4 Only project members will be imported. Group members will be skipped.
5 %hr 5 %hr
6 -= form_tag apply_import_project_team_members_path(@project), method: 'post' do  
7 - .padded  
8 - = label_tag :source_project_id, "Project" 6 += form_tag apply_import_project_team_members_path(@project), method: 'post', class: 'form-horizontal' do
  7 + .form-group
  8 + = label_tag :source_project_id, "Project", class: 'control-label'
9 .col-sm-10= select_tag(:source_project_id, options_from_collection_for_select(current_user.authorized_projects, :id, :name_with_namespace), prompt: "Select project", class: "chosen lg", required: true) 9 .col-sm-10= select_tag(:source_project_id, options_from_collection_for_select(current_user.authorized_projects, :id, :name_with_namespace), prompt: "Select project", class: "chosen lg", required: true)
10 10
11 .form-actions 11 .form-actions