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
Boxiang Sun
gitlab-ce
Commits
47b57de8
Commit
47b57de8
authored
Jan 02, 2019
by
Lukas Eipert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove top margin in modal header titles
parent
6a8b89d9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
5 deletions
+19
-5
app/assets/stylesheets/bootstrap_migration.scss
app/assets/stylesheets/bootstrap_migration.scss
+14
-1
app/assets/stylesheets/framework/modal.scss
app/assets/stylesheets/framework/modal.scss
+0
-4
changelogs/unreleased/55883-modal-header-titles-have-an-unnecessary-top-margin.yml
...83-modal-header-titles-have-an-unnecessary-top-margin.yml
+5
-0
No files found.
app/assets/stylesheets/bootstrap_migration.scss
View file @
47b57de8
...
@@ -70,6 +70,17 @@ h6,
...
@@ -70,6 +70,17 @@ h6,
margin-bottom
:
10px
;
margin-bottom
:
10px
;
}
}
/* Our adjustments to hx & .hx above add unnecessary margins to modal-title
and page-title in modals, so we set them to 0 in order to have properly
formatted modal headers. */
.modal-header
{
.modal-title
,
.page-title
{
margin-top
:
0
;
margin-bottom
:
0
;
}
}
h5
,
h5
,
.h5
{
.h5
{
font-size
:
$gl-font-size
;
font-size
:
$gl-font-size
;
...
@@ -142,7 +153,9 @@ table {
...
@@ -142,7 +153,9 @@ table {
@include
media-breakpoint-up
(
$breakpoint
)
{
@include
media-breakpoint-up
(
$breakpoint
)
{
$infix
:
breakpoint-infix
(
$breakpoint
,
$grid-breakpoints
);
$infix
:
breakpoint-infix
(
$breakpoint
,
$grid-breakpoints
);
.d
#{
$infix
}
-table-header-group
{
display
:
table-header-group
!
important
;
}
.d
#{
$infix
}
-table-header-group
{
display
:
table-header-group
!
important
;
}
}
}
}
}
...
...
app/assets/stylesheets/framework/modal.scss
View file @
47b57de8
...
@@ -29,10 +29,6 @@
...
@@ -29,10 +29,6 @@
padding-right
:
28px
;
padding-right
:
28px
;
}
}
}
}
.page-title
{
margin-top
:
0
;
}
}
}
.modal-body
{
.modal-body
{
...
...
changelogs/unreleased/55883-modal-header-titles-have-an-unnecessary-top-margin.yml
0 → 100644
View file @
47b57de8
---
title
:
Remove top margin in modal header titles
merge_request
:
24108
author
:
type
:
fixed
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