34060 Simply general project settings to use expanded panels

app/assets/javascripts/dispatcher.js

@@ -329,6 +329,8 @@ import GpgBadges from './gpg_badges';
           break;
         case 'projects:edit':
           setupProjectEdit();
+          // Initialize expandable settings panels
+          initSettingsPanels();
           break;
         case 'projects:pipelines:builds':
         case 'projects:pipelines:failures':

app/assets/stylesheets/pages/projects.scss

@@ -36,7 +36,6 @@
   }
 
   select {
-    background: transparent;
     transition: background 2s ease-out;
 
     &.highlight-changes {

app/assets/stylesheets/pages/settings.scss

@@ -54,8 +54,7 @@
 .settings-content {
   max-height: 1px;
   overflow-y: scroll;
-  margin-right: -20px;
-  padding-right: 130px;
+  padding-right: 110px;
   animation: collapseMaxHeight 300ms ease-out;
 
   &.expanded {
@@ -87,6 +86,18 @@
     overflow: hidden;
     margin-top: 20px;
   }
+
+  .sub-section {
+    margin-bottom: 32px;
+    padding: 16px;
+    border: 1px solid $border-color;
+    background-color: $gray-light;
+  }
+
+  .bs-callout,
+  .checkbox:first-child {
+    margin-top: 0;
+  }
 }
 
 .settings-list-icon {

app/views/projects/_merge_request_settings.html.haml

 - form = local_assigns.fetch(:form)
 
-%fieldset.features.merge-requests-feature.append-bottom-default
-  %hr
+= render 'projects/merge_request_merge_settings', form: form
\ No newline at end of file
-  %h5.prepend-top-0
-    Merge Requests
-
-  = render 'projects/merge_request_merge_settings', form: form