Skip to content
Snippets Groups Projects
Commit aaaa252e authored by Taurie Davis's avatar Taurie Davis Committed by Phil Hughes
Browse files

34060 Simply general project settings to use expanded panels

parent 48c51e20
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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':
Loading
Loading
Loading
Loading
@@ -36,7 +36,6 @@
}
 
select {
background: transparent;
transition: background 2s ease-out;
 
&.highlight-changes {
Loading
Loading
Loading
Loading
@@ -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 {
Loading
Loading
@@ -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 {
Loading
Loading
- form = local_assigns.fetch(:form)
 
%fieldset.features.merge-requests-feature.append-bottom-default
%hr
%h5.prepend-top-0
Merge Requests
= render 'projects/merge_request_merge_settings', form: form
= render 'projects/merge_request_merge_settings', form: form
\ No newline at end of file
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment