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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
30679c92
Commit
30679c92
authored
Oct 03, 2018
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-03
parents
eff4f3af
42822a7d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
0 deletions
+16
-0
app/assets/stylesheets/framework/modal.scss
app/assets/stylesheets/framework/modal.scss
+11
-0
changelogs/unreleased/feature-flags-mvc.yml
changelogs/unreleased/feature-flags-mvc.yml
+5
-0
No files found.
app/assets/stylesheets/framework/modal.scss
View file @
30679c92
...
...
@@ -19,6 +19,17 @@
}
}
// leave enough space for the close icon
.modal-title
{
&
.mw-100
,
&
.w-100
{
// after upgrading to Bootstrap 4.2 we can use $modal-header-padding-x here
// https://github.com/twbs/bootstrap/pull/26976
margin-right
:
-2rem
;
padding-right
:
2rem
;
}
}
.page-title
{
margin-top
:
0
;
}
...
...
changelogs/unreleased/feature-flags-mvc.yml
0 → 100644
View file @
30679c92
---
title
:
Avoid close icon leaving the modal header
merge_request
:
21904
author
:
type
:
changed
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