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
d58fffb2
Commit
d58fffb2
authored
Dec 16, 2016
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix margin on alert stripes within ":flash_message" block
parent
b1120fc3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
app/assets/stylesheets/framework/layout.scss
app/assets/stylesheets/framework/layout.scss
+8
-0
app/views/layouts/_page.html.haml
app/views/layouts/_page.html.haml
+4
-3
No files found.
app/assets/stylesheets/framework/layout.scss
View file @
d58fffb2
...
...
@@ -32,6 +32,14 @@ body {
}
}
.alert-wrapper
{
margin-bottom
:
$gl-padding
;
.alert
{
margin-bottom
:
0
;
}
}
/* The following prevents side effects related to iOS Safari's implementation of -webkit-overflow-scrolling: touch,
which is applied to the body by jquery.nicescroling plugin to force hardware acceleration for momentum scrolling. Side
...
...
app/views/layouts/_page.html.haml
View file @
d58fffb2
...
...
@@ -22,9 +22,10 @@
=
render
"layouts/nav/
#{
nav
}
"
.content-wrapper
{
class:
"#{layout_nav_class}"
}
=
yield
:sub_nav
=
render
"layouts/broadcast"
=
render
"layouts/flash"
=
yield
:flash_message
.alert-wrapper
=
render
"layouts/broadcast"
=
render
"layouts/flash"
=
yield
:flash_message
%div
{
class:
"#{(container_class unless @no_container)} #{@content_class}"
}
.content
{
id:
"content-body"
}
=
yield
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