Skip to content

Commit

Permalink
Merge pull request #84 from joomla/development-spaces
Browse files Browse the repository at this point in the history
More space on fluid layout.
Change several paddings and margins in containers.
Increase grid-gap in fluid layout to have more space right and left.
  • Loading branch information
richard67 authored Sep 16, 2020
2 parents 94ceb30 + b0ecf60 commit 0b46068
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 12 deletions.
6 changes: 6 additions & 0 deletions templates/cassiopeia/scss/blocks/_css-grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,15 @@

&.wrapper-fluid {
grid-template-columns: [full-start] minmax(0, 1fr) [main-start] repeat(4, minmax(0, 25%)) [main-end] minmax(0, 1fr) [full-end];
grid-gap: 0 ($cassiopeia-grid-gutter*2);
.grid-child {
max-width: none;
}
header > .grid-child,
footer > .grid-child {
padding-right: $cassiopeia-grid-gutter*2;
padding-left: $cassiopeia-grid-gutter*2;
}
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions templates/cassiopeia/scss/blocks/_footer.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
// Footer

.footer {
padding: 2.5rem ($cassiopeia-grid-gutter / 2);
margin-top: $cassiopeia-grid-gutter;
color: $white;
background-color: var(--cassiopeia-color-primary);
background-image: $cassiopeia-header-grad;

.grid-child {
padding: 2.5rem ($cassiopeia-grid-gutter/2);
}

a {
color: $white;
}
Expand All @@ -19,7 +22,6 @@
background: $white;
border-radius: $border-radius;

@include margin("right", 5px);
@include margin("left", auto);
}
}
11 changes: 3 additions & 8 deletions templates/cassiopeia/scss/blocks/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,12 @@
position: relative !important;
}

header {
width: 100%;
max-width: 72.1875rem;
padding: 0 ($cassiopeia-grid-gutter / 2);
margin: 0 auto;

.grid-child {
padding: ($cassiopeia-grid-gutter / 2);
}

nav {
padding: ($cassiopeia-grid-gutter / 2) ($cassiopeia-grid-gutter / 2) $cassiopeia-grid-gutter ($cassiopeia-grid-gutter / 2);
padding: ($cassiopeia-grid-gutter / 2) $cassiopeia-grid-gutter $cassiopeia-grid-gutter ($cassiopeia-grid-gutter / 2);
}

.site-description {
Expand All @@ -31,7 +27,6 @@
.navbar-brand {
position: relative;
display: inline-block;
padding: $cassiopeia-grid-gutter / 2;
margin-right: auto;
font-size: 2rem;
color: $white;
Expand Down
4 changes: 2 additions & 2 deletions templates/cassiopeia/scss/vendor/metismenu/_metismenu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
&.mod-menu {
.metismenu-item {
display: flex;
padding: $cassiopeia-grid-gutter/2;
font-size: 1.1em;
padding: $cassiopeia-grid-gutter/2 0;
font-size: 1.1rem;
line-height: 1.5;

&.parent {
Expand Down

0 comments on commit 0b46068

Please sign in to comment.