Merge branch 'project-settings' into 'master'

Project settings UI update

![Screen_Shot_2016-05-16_at_16.42.55](/uploads/2e308cbf26a002fc411c3e84b663a5d1/Screen_Shot_2016-05-16_at_16.42.55.png)![Screen_Shot_2016-05-16_at_16.43.01](/uploads/8d983c43307c65852efe002f6e9482d9/Screen_Shot_2016-05-16_at_16.43.01.png)![Screen_Shot_2016-05-16_at_16.43.16](/uploads/6124e0600cc0e5b309a60b065409d537/Screen_Shot_2016-05-16_at_16.43.16.png)![Screen_Shot_2016-05-16_at_16.43.13](/uploads/177976c2c08034e096e7ebdcad1f369f/Screen_Shot_2016-05-16_at_16.43.13.png)

See merge request !4162

app/assets/stylesheets/pages/profile.scss

@@ -134,14 +134,6 @@
   }
 }
 
-.change-username-title {
-  color: $gl-warning;
-}
-
-.remove-account-title {
-  color: $gl-danger;
-}
-
 .provider-btn-group {
   display: inline-block;
   margin-right: 10px;

app/assets/stylesheets/pages/projects.scss

@@ -10,7 +10,7 @@
   margin-bottom: 0;
 }
 .new_project,
-.edit_project {
+.edit-project {
   fieldset.features {
     .control-label {
       font-weight: normal;

app/assets/stylesheets/pages/settings.scss

@@ -12,3 +12,11 @@
   border: 1px solid $warning-message-border;
   border-radius: $border-radius-base;
 }
+
+.warning-title {
+  color: $gl-warning;
+}
+
+.danger-title {
+  color: $gl-danger;
+}

app/views/profiles/accounts/show.html.haml

@@ -70,7 +70,7 @@
 - if current_user.can_change_username?
   .row.prepend-top-default
     .col-lg-3.profile-settings-sidebar
-      %h4.prepend-top-0.change-username-title
+      %h4.prepend-top-0.warning-title
         Change username
       %p
         Changing your username will change path to all personal projects!
@@ -94,7 +94,7 @@
 - if signup_enabled?
   .row.prepend-top-default
     .col-lg-3.profile-settings-sidebar
-      %h4.prepend-top-0.remove-account-title
+      %h4.prepend-top-0.danger-title
         Remove account
     .col-lg-9
       - if @user.can_be_removed?

app/views/projects/_builds_settings.html.haml

 %fieldset.builds-feature
-  %legend
-    Builds:
-
+  %h5.prepend-top-0
+    Builds
   - unless @repository.gitlab_ci_yml
     .form-group
-      .col-sm-offset-2.col-sm-10
-        %p Builds need to be configured before you can begin using Continuous Integration.
-        = link_to 'Get started with Builds', help_page_path('ci/quick_start', 'README'), class: 'btn btn-info'
-        %hr
-
+      %p Builds need to be configured before you can begin using Continuous Integration.
+      = link_to 'Get started with Builds', help_page_path('ci/quick_start', 'README'), class: 'btn btn-info'
   .form-group
-    .col-sm-offset-2.col-sm-10
-      %p Get recent application code using the following command:
-      .radio
-        = f.label :build_allow_git_fetch_false do
-          = f.radio_button :build_allow_git_fetch, 'false'
-          %strong git clone
-          %br
-          %span.descr Slower but makes sure you have a clean dir before every build
-      .radio
-        = f.label :build_allow_git_fetch_true do
-          = f.radio_button :build_allow_git_fetch, 'true'
-          %strong git fetch
-          %br
-          %span.descr Faster
+    %p Get recent application code using the following command:
+    .radio
+      = f.label :build_allow_git_fetch_false do
+        = f.radio_button :build_allow_git_fetch, 'false'
+        %strong git clone
+        %br
+        %span.descr Slower but makes sure you have a clean dir before every build
+    .radio
+      = f.label :build_allow_git_fetch_true do
+        = f.radio_button :build_allow_git_fetch, 'true'
+        %strong git fetch
+        %br
+        %span.descr Faster
 
   .form-group
-    = f.label :build_timeout_in_minutes, 'Timeout', class: 'control-label'
-    .col-sm-10
-      = f.number_field :build_timeout_in_minutes, class: 'form-control', min: '0'
-      %p.help-block per build in minutes
+    = f.label :build_timeout_in_minutes, 'Timeout', class: 'label-light'
+    = f.number_field :build_timeout_in_minutes, class: 'form-control', min: '0'
+    %p.help-block per build in minutes
   .form-group
-    = f.label :build_coverage_regex, "Test coverage parsing", class: 'control-label'
-    .col-sm-10
-      .input-group
-        %span.input-group-addon /
-        = f.text_field :build_coverage_regex, class: 'form-control', placeholder: '\(\d+.\d+\%\) covered'
-        %span.input-group-addon /
-      %p.help-block
-        We will use this regular expression to find test coverage output in build trace.
-        Leave blank if you want to disable this feature
-      .bs-callout.bs-callout-info
-        %p Below are examples of regex for existing tools:
-        %ul
-          %li
-            Simplecov (Ruby) -
-            %code \(\d+.\d+\%\) covered
-          %li
-            pytest-cov (Python) -
-            %code \d+\%\s*$
-          %li
-            phpunit --coverage-text --colors=never (PHP) -
-            %code ^\s*Lines:\s*\d+.\d+\%
-          %li
-            gcovr (C/C++) -
-            %code ^TOTAL.*\s+(\d+\%)$
-          %li
-            tap --coverage-report=text-summary (Node.js) -
-            %code ^Statements\s*:\s*([^%]+)
+    = f.label :build_coverage_regex, "Test coverage parsing", class: 'label-light'
+    .input-group
+      %span.input-group-addon /
+      = f.text_field :build_coverage_regex, class: 'form-control', placeholder: '\(\d+.\d+\%\) covered'
+      %span.input-group-addon /
+    %p.help-block
+      We will use this regular expression to find test coverage output in build trace.
+      Leave blank if you want to disable this feature
+    .bs-callout.bs-callout-info
+      %p Below are examples of regex for existing tools:
+      %ul
+        %li
+          Simplecov (Ruby) -
+          %code \(\d+.\d+\%\) covered
+        %li
+          pytest-cov (Python) -
+          %code \d+\%\s*$
+        %li
+          phpunit --coverage-text --colors=never (PHP) -
+          %code ^\s*Lines:\s*\d+.\d+\%
+        %li
+          gcovr (C/C++) -
+          %code ^TOTAL.*\s+(\d+\%)$
+        %li
+          tap --coverage-report=text-summary (Node.js) -
+          %code ^Statements\s*:\s*([^%]+)
 
   .form-group
-    .col-sm-offset-2.col-sm-10
-      .checkbox
-        = f.label :public_builds do
-          = f.check_box :public_builds
-          %strong Public builds
-        .help-block Allow everyone to access builds for Public and Internal projects
+    .checkbox
+      = f.label :public_builds do
+        = f.check_box :public_builds
+        %strong Public builds
+      .help-block Allow everyone to access builds for Public and Internal projects
 
-  .form-group
-    = f.label :runners_token, "Runners token", class: 'control-label'
-    .col-sm-10
-      = f.text_field :runners_token, class: "form-control", placeholder: 'xEeFCaDAB89'
-      %p.help-block The secure token used to checkout project.
+  .form-group.append-bottom-0
+    = f.label :runners_token, "Runners token", class: 'label-light'
+    = f.text_field :runners_token, class: "form-control", placeholder: 'xEeFCaDAB89'
+    %p.help-block The secure token used to checkout project.

features/steps/shared/project.rb

@@ -95,7 +95,7 @@ module SharedProject
   step 'I should see project settings' do
     expect(current_path).to eq edit_namespace_project_path(@project.namespace, @project)
     expect(page).to have_content("Project name")
-    expect(page).to have_content("Features:")
+    expect(page).to have_content("Features")
   end
 
   def current_project