Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.0] Fix content margin if no "top" modules are assigned #17699

Merged
merged 4 commits into from
Aug 25, 2017
Merged

[4.0] Fix content margin if no "top" modules are assigned #17699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1850dc8
Fix top-margin
C-Lodder Aug 24, 2017
18d07d3
Unix line endings
C-Lodder Aug 24, 2017
4a94c4f
revert cause that didn't work
C-Lodder Aug 24, 2017
3689e4b
indendation
C-Lodder Aug 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions templates/aurora/css/template.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
.flying-focus_target::-moz-focus-inner {
border: 0 !important; }

/*!
* Bootstrap v4.0.0-beta (https://getbootstrap.com)
* Copyright 2011-2017 The Bootstrap Authors
* Copyright 2011-2017 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
/*!
* Bootstrap v4.0.0-beta (https://getbootstrap.com)
* Copyright 2011-2017 The Bootstrap Authors
* Copyright 2011-2017 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
@media print {
*,
Expand Down Expand Up @@ -5577,11 +5577,11 @@ a.text-dark:focus, a.text-dark:hover {
.invisible {
visibility: hidden !important; }

/*!
* Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
/*!
* Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/
/* FONT PATH
/* FONT PATH
* -------------------------- */
@font-face {
font-family: 'FontAwesome';
Expand Down Expand Up @@ -5750,7 +5750,7 @@ a.text-dark:focus, a.text-dark:hover {
.fa-inverse {
color: #fff; }

/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
readers do not read off random characters that represent icons */
.fa-glass:before {
content: ""; }
Expand Down Expand Up @@ -8489,7 +8489,7 @@ joomla-alert {
@supports (display: grid) {
.site-grid {
display: grid;
grid-template-areas: ". head head head head ." ". banner banner banner banner ." ". top-a top-a top-a top-a ." ". top-b top-b top-b top-b ." ". main main main main ." ". bot-a bot-a bot-a bot-a ." ". bot-b bot-b bot-b bot-b ." ". footer footer footer footer ." ". debug debug debug debug .";
grid-template-areas: ". head head head head ." ". banner banner banner banner ." ". top-a top-a top-a top-a ." ". top-b top-b top-b top-b ." ". main main main main ." ". bot-a bot-a bot-a bot-a ." ". bot-b bot-b bot-b bot-b ." ". footer footer footer footer ." ". debug debug debug debug .";
grid-template-columns: [full-start] minmax(0, 1fr) [main-start] repeat(4, minmax(0, 270px)) [main-end] minmax(0, 1fr) [full-end];
grid-gap: 0 15px; }
.site-grid > div {
Expand All @@ -8508,11 +8508,11 @@ joomla-alert {
grid-column: full-start / full-end; }
@media (max-width: 575px) {
.site-grid {
grid-template-areas: ". head head head head ." ". banner banner banner banner ." ". main main main main ." ". top-a top-a top-a top-a ." ". top-b top-b top-b top-b ." ". bot-a bot-a bot-a bot-a ." ". bot-b bot-b bot-b bot-b ." ". footer footer footer footer ." ". debug debug debug debug ."; } }
header {
margin-bottom: 0; }
header + div:not(.container-banner) {
margin-top: 15px; }
grid-template-areas: ". head head head head ." ". banner banner banner banner ." ". main main main main ." ". top-a top-a top-a top-a ." ". top-b top-b top-b top-b ." ". bot-a bot-a bot-a bot-a ." ". bot-b bot-b bot-b bot-b ." ". footer footer footer footer ." ". debug debug debug debug ."; } }
.site-grid header {
margin-bottom: 0; }
.site-grid header + div:not(.container-banner) {
margin-top: 15px; }
.container-banner {
margin: 0 0 15px; }
.container-banner p {
Expand Down
2 changes: 1 addition & 1 deletion templates/aurora/css/template.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion templates/aurora/css/template.min.css
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions templates/aurora/scss/blocks/_css-grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@supports (display: grid) {
.site-grid {
display: grid;

grid-template-areas:
". head head head head ."
". banner banner banner banner ."
Expand Down Expand Up @@ -53,13 +54,13 @@
". footer footer footer footer ."
". debug debug debug debug .";
}
}

header {
margin-bottom: 0;
header {
margin-bottom: 0;

+ div:not(.container-banner) {
margin-top: $aurora-grid-gutter;
+ div:not(.container-banner) {
margin-top: $aurora-grid-gutter;
}
}
}

Expand Down