mobile spacing refinement and landing spacing fix

This commit is contained in:
Lance Cummings 2018-12-21 08:22:34 -08:00
Родитель d984fbe5e9
Коммит 9598449c5f
6 изменённых файлов: 30 добавлений и 13 удалений

Просмотреть файл

@ -5,8 +5,8 @@
{%- seo -%}
<link rel="apple-touch-icon" href="{{ "/assets/img/favicon.png" | relative_url }}">
<link rel="shortcut icon" href="{{ "/favicon.ico" | relative_url }}">
<link rel="stylesheet" href="{{ "/assets/slick/slick.css?ver=2018.11.23" | relative_url }}">
<link rel="stylesheet" href="{{ "/assets/main.css?ver=2018.11.23" | relative_url }}">
<link rel="stylesheet" href="{{ "/assets/slick/slick.css?ver=2018.12.21" | relative_url }}">
<link rel="stylesheet" href="{{ "/assets/main.css?ver=2018.12.21" | relative_url }}">
<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
{%- feed_meta -%}
{%- if jekyll.environment == 'production' and site.google_analytics -%}

Просмотреть файл

@ -55,7 +55,7 @@
</div>
</aside>
<script type="text/javascript" src="{{ "/assets/scripts/scripts.min.js?ver=2018.11.23" | relative_url }}"></script>
<script type="text/javascript" src="{{ "/assets/scripts/scripts.min.js?ver=2018.12.21" | relative_url }}"></script>
</body>
</html>

Просмотреть файл

@ -22,9 +22,9 @@
</div>
</aside>
<!-- <script type="text/javascript" src="{{ "/assets/scripts/rssfeed.pkg.js?ver=2018.11.23" | relative_url }}"></script> -->
<script type="text/javascript" src="{{ "/assets/slick/slick.min.js?ver=2018.11.23" | relative_url }}"></script>
<script type="text/javascript" src="{{ "/assets/scripts/scripts.min.js?ver=2018.11.23" | relative_url }}"></script>
<!-- <script type="text/javascript" src="{{ "/assets/scripts/rssfeed.pkg.js?ver=2018.12.21" | relative_url }}"></script> -->
<script type="text/javascript" src="{{ "/assets/slick/slick.min.js?ver=2018.12.21" | relative_url }}"></script>
<script type="text/javascript" src="{{ "/assets/scripts/scripts.min.js?ver=2018.12.21" | relative_url }}"></script>
<script src="{{ "/assets/scripts/basket-client.js" | relative_url }}"></script>
</body>

Просмотреть файл

@ -162,7 +162,7 @@ $sidebar-w : rem-calc(230);
// Full Width Image & Half Width Images
// ------
.image-with-caption {font-size: $small-font-size; color: $dark-gray; margin: rem-calc(12 0);
.image-with-caption {font-size: $small-font-size; color: $dark-gray; margin: rem-calc(12 0 15);
img {display: block; width: 100%; margin-bottom: rem-calc(6);}
@include breakpoint(medium) {margin: rem-calc(24 0);
@ -203,7 +203,7 @@ $sidebar-w : rem-calc(230);
// Image Grid
// ------
.icon-grid {margin: rem-calc(12 0 0);
.icon-grid {margin: rem-calc(12 0 3);
p {margin-bottom: rem-calc(12);}
@include breakpoint(medium) {margin: rem-calc(24 0 0);
p {margin-bottom: rem-calc(24);}
@ -250,7 +250,7 @@ span.example {display: inline-block; padding: rem-calc(0 7); margin: 0;}
}
.do-this-not-this {
.do-this, .not-this {margin: rem-calc(6 0);}
.do-this, .not-this {margin: rem-calc(0 0 12);}
@include breakpoint(medium) {margin: rem-calc(24 0);
.do-this, .not-this {margin: 0;}

Просмотреть файл

@ -250,6 +250,10 @@ Stylesheet: Landing Page Stylesheet
.cell.tile {z-index: 3; padding: rem-calc(20 26) !important; margin: rem-calc(8 0); color: $body-font-color;
&:before {left: rem-calc(6); width: calc(100% - #{rem-calc(12)});}
h1, h2, h3, h4, h5, h6 {
&:not(:first-child) {margin-top: 0;}
}
img {display: block; max-height: rem-calc(120); margin: 0 auto;}
&:not(.tile-block-link) {
@ -333,6 +337,10 @@ Stylesheet: Landing Page Stylesheet
&:last-child {margin-bottom: 0;}
}
h1, h2, h3, h4, h5, h6 {
&:not(:first-child) {margin-top: 0;}
}
&:not(.tile-block-link) > * {
&:first-child {position: absolute; top: rem-calc(12); right: rem-calc(24); width: rem-calc(32);
img {width: rem-calc(32);}
@ -392,6 +400,10 @@ Stylesheet: Landing Page Stylesheet
a img {border-radius: $global-radius; transition: box-shadow .2s ease-in-out;}
a:hover img {box-shadow: #{rem-calc(0 4 16)} rgba(12,12,13,0.33);}
h1, h2, h3, h4, h5, h6 {
&:not(:first-child) {margin-top: 0;}
}
@include breakpoint(medium) {padding: rem-calc(24 34 30) !important; margin: rem-calc(12 0); display: flex; flex-flow: column nowrap; justify-content: stretch;
> * {flex: 0 0 auto; width: 100%;
&:last-child {flex: 1 1 auto; display: flex; flex-flow: column; justify-content: flex-end; margin-bottom: 0;}
@ -405,6 +417,9 @@ Stylesheet: Landing Page Stylesheet
}
.tile-extended {
h1, h2, h3, h4, h5, h6 {
&:not(:first-child) {margin-top: 0;}
}
> p a {@include button(); font-size: 0.733333333333333rem; padding: rem-calc(6 8);
&:hover {text-decoration: none;}
}
@ -414,6 +429,9 @@ Stylesheet: Landing Page Stylesheet
}
.tiles-outside {padding-top: rem-calc(10); padding-bottom: rem-calc(20);
h1, h2, h3, h4, h5, h6 {
&:not(:first-child) {margin-top: 0;}
}
&:first-child {
*:last-child {margin-bottom: 0;}
@include breakpoint(small down) {padding-top: rem-calc(24); padding-bottom: rem-calc(6);}

Просмотреть файл

@ -12,12 +12,11 @@ Stylesheet: Main Stylesheet
// -------------------------------------------------------------------------------------------------------------------
h1, h2, h3, h4, h5, h6 {margin-bottom: $header-margin-bottom;}
p, ul, ol, h1, h2, h3, h4, h5, h6 {
+ h1, + h2, + h3, + h4, + h5, + h6 {margin-top: 1.6666em;}
h1, h2, h3, h4, h5, h6 {margin-bottom: $header-margin-bottom;
&:not(:first-child) {margin-top: 1.6666em;}
}
h1, h2 {
+ h5, + h6 {margin-top: -0.6em;}
}