Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
aaaa252e
Commit
aaaa252e
authored
Jul 03, 2017
by
tauriedavis
Committed by
Phil Hughes
Jul 28, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
34060 Simply general project settings to use expanded panels
parent
48c51e20
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
202 additions
and
190 deletions
+202
-190
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+2
-0
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+0
-1
app/assets/stylesheets/pages/settings.scss
app/assets/stylesheets/pages/settings.scss
+13
-2
app/views/projects/_merge_request_settings.html.haml
app/views/projects/_merge_request_settings.html.haml
+1
-6
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+186
-181
No files found.
app/assets/javascripts/dispatcher.js
View file @
aaaa252e
...
...
@@ -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
View file @
aaaa252e
...
...
@@ -36,7 +36,6 @@
}
select
{
background
:
transparent
;
transition
:
background
2s
ease-out
;
&
.highlight-changes
{
...
...
app/assets/stylesheets/pages/settings.scss
View file @
aaaa252e
...
...
@@ -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
View file @
aaaa252e
-
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
app/views/projects/edit.html.haml
View file @
aaaa252e
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment