From dc533827a12c2baafbed75e35e7edca430db8d94 Mon Sep 17 00:00:00 2001 From: Jeremy Thomas Date: Mon, 25 Apr 2016 22:00:21 +0100 Subject: [PATCH] Add only responsive classes, Remove test tiles, Remove section border, Add widescreen container --- CHANGELOG.md | 14 +++++++++++++- sass/base/classes.sass | 2 ++ sass/base/helpers.sass | 4 ++-- sass/components/grid.sass | 13 ------------- sass/components/navbar.sass | 12 ++++++++++-- sass/layout/section.sass | 2 -- sass/utilities/mixins.sass | 8 ++++++++ 7 files changed, 35 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b157e18b..cdebbf65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,23 @@ ## 0.0.24 +### Added + +* `is-mobile` for the navbar + +### Removed + +* removed border between sections. Use `
` now + ### Updated -* restructured file structure +* restructured files * added back `inline-flex` for controls and tags +### Removed + +* test tiles + ## 0.0.23 ### BREAKING diff --git a/sass/base/classes.sass b/sass/base/classes.sass index 8c9c7cac..277fe532 100644 --- a/sass/base/classes.sass +++ b/sass/base/classes.sass @@ -11,6 +11,8 @@ &.is-fluid margin: 0 20px max-width: none + +widescreen + max-width: 1200px .fa font-size: 21px diff --git a/sass/base/helpers.sass b/sass/base/helpers.sass index 549f3889..3854bb97 100644 --- a/sass/base/helpers.sass +++ b/sass/base/helpers.sass @@ -40,7 +40,7 @@ display: none !important .is-hidden-tablet - +tablet + +tablet-only display: none !important .is-hidden-touch @@ -48,7 +48,7 @@ display: none !important .is-hidden-desktop - +desktop + +desktop-only display: none !important // Other diff --git a/sass/components/grid.sass b/sass/components/grid.sass index ef850fd9..991c845c 100644 --- a/sass/components/grid.sass +++ b/sass/components/grid.sass @@ -211,19 +211,6 @@ &.is-desktop display: flex -.tilefiejsoif - flex: 1 - // Modifiers - &.is-parent - padding: 10px - // Responsiveness - +tablet - // Sizes - @for $i from 1 through 12 - &.is-#{$i} - flex: none - width: ($i / 12) * 100% - .tile align-items: stretch flex: 1 diff --git a/sass/components/navbar.sass b/sass/components/navbar.sass index 1668b42a..1340a69e 100644 --- a/sass/components/navbar.sass +++ b/sass/components/navbar.sass @@ -34,16 +34,24 @@ .navbar @extend .block + align-items: center + justify-content: space-between code border-radius: $radius img display: inline-block vertical-align: top + // Modifiers + &.is-mobile + display: flex + & > .navbar-item + &:not(:last-child) + margin-bottom: 0 + &:not(.is-narrow) + flex: 1 // Responsiveness +tablet - align-items: center display: flex - justify-content: space-between & > .navbar-item &:not(.is-narrow) flex: 1 diff --git a/sass/layout/section.sass b/sass/layout/section.sass index 0a552e85..98271a5c 100644 --- a/sass/layout/section.sass +++ b/sass/layout/section.sass @@ -1,8 +1,6 @@ .section background: white padding: 40px 20px - & + .section - border-top: 1px solid rgba($border, 0.5) // Responsiveness +desktop padding: 40px 0 diff --git a/sass/utilities/mixins.sass b/sass/utilities/mixins.sass index 29c763c6..fb20fd2a 100644 --- a/sass/utilities/mixins.sass +++ b/sass/utilities/mixins.sass @@ -78,6 +78,10 @@ @media screen and (min-width: $tablet) @content +=tablet-only + @media screen and (min-width: $tablet) and (max-width: $desktop - 1px) + @content + =touch @media screen and (max-width: $desktop - 1px) @content @@ -86,6 +90,10 @@ @media screen and (min-width: $desktop) @content +=desktop-only + @media screen and (min-width: $desktop) and (max-width: $widescreen - 1px) + @content + =widescreen @media screen and (min-width: $widescreen) @content