diff --git a/_layouts/home.html b/_layouts/home.html index eb6d21b4a..b302ef2e2 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -1,11 +1,11 @@ @@ -15,8 +15,8 @@ {%- include svgs.html -%} {%- include header.html -%} - -
+ +
{%- include home-banner.html -%}
diff --git a/_sass/minima/_article.scss b/_sass/minima/_article.scss index eab99dd7b..14755a882 100644 --- a/_sass/minima/_article.scss +++ b/_sass/minima/_article.scss @@ -7,8 +7,11 @@ article.guide { figure { &.-background { - padding: 20px; + padding: $spacing-unit/3*2; background-color: #f8f8f8; + display: flex; + flex-direction: column; + align-items: center; } &.-shadow { @@ -21,7 +24,7 @@ article.guide { a.button { display: inline-block; - padding: 0 20px; + padding: 0 $spacing-unit/3*2; border-radius: 3px; color: white; line-height: 43px; @@ -45,273 +48,10 @@ article.guide { } } - .do { - margin-top: $spacing-unit; - display: flex; - flex-wrap: wrap; - background-color: #f8f8f8; - @include responsive('padding', 20, 30); - - .icon { - flex-grow: 0; - display: flex; - align-items: center; - padding-top: 2px; - - &.-green { - svg { - background-color: $green; - } - } - - &.-red { - svg { - background-color: $red; - } - } - - svg { - display: block; - background-color: $blue; - border-radius: 3px; - width: 24px; - height: 24px; - color: white; - vertical-align: middle; - transform: translateY(-2px); - } - } - - h6 { - margin: 0 0 0 10px; - padding: 0px 0 0 0; - font-size: 18px; - font-weight: 500; - flex-grow: 1; - flex-basis: 50%; - - &:before { - display: none; - } - } - - .copy { - p { - & + figure { - margin-top: 10px; - } - } - - figure { - &:last-child { - margin-bottom: 0; - } - } - } - } - - .dos { - display: flex; - - @include media-query(small) { - flex-direction: column; - - .do { - & + .do { - margin-top: 20px; - } - } - } - - @include media-query(medium-up) { - .do { - flex-basis: 30%; - flex-grow: 1; - - & + .do { - margin-left: 40px; - } - } - } - } - - .tip, - .recommendation { - margin-top: $spacing-unit; - padding: 25px 25px 20px 25px; - box-sizing: border-box; - - h6 { - margin: 0; - padding: 0; - font-size: 22px; - font-weight: 500; - - &:before { - display: none; - } - - svg { - display: inline-block; - margin-right: 10px; - background-color: $blue; - border-radius: 3px; - width: 24px; - height: 24px; - color: white; - vertical-align: middle; - transform: translateY(-2px); - } - } - - p { - margin: 10px 0 0 0; - } - - &.-red { - background-color: rgba($red, 0.1); - - h6 { - svg { - background-color: $red; - } - } - } - - &.-green { - background-color: rgba($green, 0.1); - - h6 { - svg { - background-color: $green; - } - } - } - - &.-blue { - background-color: rgba($blue, 0.1); - - h6 { - svg { - background-color: $blue; - } - } - } - - &.-orange { - background-color: rgba($bitcoin-yellow, 0.1); - - h6 { - svg { - background-color: $bitcoin-yellow; - } - } - } - - &.-yellow { - background-color: rgba($yellow, 0.1); - - h6 { - svg { - background-color: $yellow; - } - } - } - } - - .tip { - background-color: rgba($blue, 0.1); - - h6 { - svg { - background-color: $blue; - } - } - } - - .recommendation { - background-color: rgba($bitcoin-yellow, 0.1); - - h6 { - svg { - background-color: $bitcoin-yellow; - } - } - } - - .fact { - margin-top: $spacing-unit; - display: flex; - border: 1px solid #DEDEDE; - align-items: stretch; - - .icon { - padding: 10px 20px; - border-right: 1px solid #DEDEDE; - flex-grow: 0; - display: flex; - align-items: center; - - &.-green { - svg { - background-color: $green; - } - } - - &.-red { - svg { - background-color: $red; - } - } - - svg { - display: inline-block; - background-color: $blue; - border-radius: 3px; - width: 24px; - height: 24px; - color: white; - vertical-align: middle; - transform: translateY(-2px); - } - } - - .copy { - padding: 20px; - flex-grow: 1; - - h6 { - margin: 0; - padding: 0; - font-size: 18px; - font-weight: 500; - - &:before { - display: none; - } - } - - ul, ol { - margin-left: 0; - - &:first-child { - margin-top: 5px; - } - } - - p { - margin: 5px 0 0 0; - } - } - - & + .fact { - margin-top: 0; - border-top: 0; - } - } - a.video-link, a.prototype-link { + margin-top: $spacing-unit; + display: block; position: relative; > svg { @@ -340,8 +80,8 @@ article.guide { box-shadow: 0 5px 15px -3px rgba(black, 0.25); > svg { - width: 30px; - height: 30px; + width: $spacing-unit; + height: $spacing-unit; margin-right: 3px; } } @@ -385,8 +125,8 @@ article.guide { } @include media-query(medium-down) { - padding-left: $spacing-unit / 2; - padding-right: $spacing-unit / 2; + padding-left: $spacing-unit/2; + padding-right: $spacing-unit/2; } @include media-query(large) { @@ -397,22 +137,36 @@ article.guide { & > .center { @include clearfix; - > figure { - margin-top: 0; + @include media-query(medium-down) { + > figure { + &:not(:first-child), + &.-float-left, + &.-float-right, + &.-float-left-mobile, + &.-float-right-mobile { + margin-top: $spacing-unit/5; + } + } + } + + @include media-query(large) { + > figure { + margin-top: 0; + } } } & > .-float-left, & > .center .-float-left { float: left; - margin-right: 15px; + margin-right: $spacing-unit/2; max-width: 50%; } & > .-float-right, & > .center .-float-right { float: right; - margin-left: 15px; + margin-left: $spacing-unit/2; max-width: 50%; } @@ -420,26 +174,38 @@ article.guide { & > .-float-left-desktop, & > .center .-float-left-desktop { float: left; - margin-right: 15px; + margin-right: $spacing-unit/2; max-width: 50%; } & > .-float-right-desktop, & > .center .-float-right-desktop { float: right; - margin-left: 15px; + margin-left: $spacing-unit/2; max-width: 50%; } } + & > .-float-right, + & > .center .-float-right { + @include media-query(large) { + margin-top: 0; + margin-bottom: 0; + float: right; + margin-left: $spacing-unit; + } + } + + // Full width images stretch all the way, up to 1600px width. + & > .-full-width { display: flex; flex-direction: column; align-items: center; @include media-query(medium-down) { - margin-left: -$spacing-unit / 2; - margin-right: -$spacing-unit / 2; + margin-left: -$spacing-unit/2; + margin-right: -$spacing-unit/2; } @include media-query(large) { @@ -448,6 +214,21 @@ article.guide { } } + figure.-full-width { + figcaption { + margin-left: $spacing-unit/2; + margin-right: $spacing-unit/2; + } + } + + // Width images can stretch beyond the regular content, but maintain padding left and right. + + & > .-wide { + display: flex; + flex-direction: column; + align-items: center; + } + & > iframe.-full-width { @include media-query(medium-down) { margin-left: 0; @@ -460,7 +241,7 @@ article.guide { } } - & > *:not(.-full-width) { + & > *:not(.-full-width, .-wide) { @include media-query(medium-down) { } @@ -472,6 +253,8 @@ article.guide { } } + // Other + li { margin-left: 18px; } @@ -493,275 +276,14 @@ article.guide { figure:not(.-float-left, .-float-right, :first-child), iframe { - margin-top: $spacing-unit; - margin-bottom: $spacing-unit; - - @include media-query(medium-down) { - margin-top: $spacing-unit * 0.5; - margin-bottom: $spacing-unit * 0.5; - } - - @include media-query(large) { - margin-top: $spacing-unit * 1; - margin-bottom: $spacing-unit * 1; - } - - } - - // & > .-float-left, - // & > .center .-float-left { - // @include media-query(large) { - // margin-top: $spacing-unit * 1; - // margin-bottom: $spacing-unit * 1; - // } - // } - - .image-gallery { - display: flex; - background-color: #f8f8f8; - justify-content: center; - max-width: none !important; - - figure { - margin-top: 0; - margin-bottom: 0; - float: left; - margin-right: 30px; - - img { - box-shadow: 0 20px 10px -8px rgba(black, 0.05); - border: 1px solid rgba(black, 0.1); - } - } - - @include media-query(small) { - flex-direction: column; - margin-left: -15px; - margin-right: -15px; - padding: 10px 15px; - } - - @include media-query(medium-up) { - margin-left: -30px; - margin-right: -30px; - padding: 30px 30px 15px 30px; - - figure { - & + figure { - margin-left: 40px; - } - } - } - } - - .image-slide-gallery { - margin-top: 30px; - margin-bottom: 30px; - background-color: #f8f8f8; - justify-content: left; - max-width: none !important; - display: flex; - overflow: hidden; - overflow-x: scroll; - -webkit-overflow-scrolling: touch; - scroll-snap-type: x mandatory; - - figure { - flex-shrink: 0; - margin-top: 0; - margin-bottom: 0; - width: min-content; - - img { - max-width: none; - height: auto; - } - - figcaption { - p { - margin-top: 0; - } - } - } - - &:before, - &:after { - display: block; - content: ''; - position: relative; - height: 20px; - flex-shrink: 0; - flex-grow: 1; - } - - @include media-query(small) { - padding: 30px 0; - - figure { - flex-basis: calc(100vw - 180px); - - & + figure { - margin-left: 30px; - } - } - - &:before, - &:after { - flex-basis: 30px; - } - } - @include media-query(medium-down) { - margin-left: -15px; - margin-right: -15px; + margin-top: $spacing-unit; + margin-bottom: $spacing-unit; } - @include media-query(medium-up) { - padding: 30px 0 30px 0; - - figure { - & + figure { - margin-left: 30px; - } - } - - &:before, - &:after { - flex-basis: 30px; - } - } - - @include media-query(large) { - margin-left: -30px; - margin-right: -30px; - } - } - - & > .-float-right, - & > .center .-float-right { @include media-query(large) { - margin-top: 0; - margin-bottom: 0; - float: right; - margin-left: 30px; - } - } -} - -dl { - display: flex; - flex-wrap: wrap; - align-items: stretch; - - dt, - dd { - display: flex; - padding: 20px 30px; - background-color: rgba($blue, 0.1); - - p { - margin: 0; - } - - &.-green { - background-color: rgba($green, 0.1); - } - - &.-red { - background-color: rgba($red, 0.1); - } - - &.-blue { - background-color: rgba($blue, 0.1); - } - - &.-orange { - background-color: rgba($bitcoin-yellow, 0.1); - } - - &.-yellow { - background-color: rgba($yellow, 0.1); - } - } - - .icon { - display: flex; - align-items: center; - justify-content: center; - - svg { - width: 30px; - height: 30px; - } - } - - @include media-query(small) { - dt, - dd, - .icon { - flex-basis: 100%; - } - - dd { - & + dt { - margin-top: 20px; - } - } - - .icon { - height: 60px; - - svg { - transform: rotate(90deg); - } - } - } - - @include media-query(medium-up) { - dt, - dd { - flex-basis: 30%; - flex-grow: 1; - margin-top: 20px; - - &:first-of-type { - margin-top: 0; - } - } - - .icon { - width: 60px; - margin-top: 20px; - - &:first-of-type { - margin-top: 0; - } - } - } -} - -.footnotes { - padding: 30px; - font-size: 0.8rem; - margin: 60px 0 0; - border: 1px solid rgba(var(--front), 0.05); - box-sizing: border-box; - background: #FDFDFD; - &::before { - content: "REFERENCES"; - display: block; - margin-bottom: 10px; - color: var(--frontHex); - letter-spacing: 1px; - } - ol { - margin: 0; - list-style-position: inside; - li { - margin-left: 0; - p { - display: inline; - } + margin-top: $spacing-unit; + margin-bottom: $spacing-unit; } } } diff --git a/_sass/minima/_base.scss b/_sass/minima/_base.scss index b2796ae61..bece0143d 100644 --- a/_sass/minima/_base.scss +++ b/_sass/minima/_base.scss @@ -55,9 +55,12 @@ ul, ol, dl, figure, hr { margin-top: $spacing-unit; - margin-bottom: $spacing-unit; - border: 1px solid rgba(var(--front), 0.05); + border: 1px solid rgba(var(--front), 0.1); border-width: 1px 0 0; + + & + p { + margin-top: $spacing-unit; + } } /** @@ -260,8 +263,8 @@ pre { max-width: calc(#{$content-width} - (#{$spacing-unit})); margin-right: auto; margin-left: auto; - padding-right: $spacing-unit / 3 * 2; - padding-left: $spacing-unit / 3 * 2; + // padding-right: $spacing-unit / 3 * 2; + // padding-left: $spacing-unit / 3 * 2; @include clearfix; @include media-query(large) { @@ -314,6 +317,7 @@ pre { * Tables */ table { + margin-top: $spacing-unit; margin-bottom: $spacing-unit; width: 100%; text-align: $table-text-align; diff --git a/_sass/minima/_home-banner.scss b/_sass/minima/_home-banner.scss index 98dd85b33..90decaa5a 100644 --- a/_sass/minima/_home-banner.scss +++ b/_sass/minima/_home-banner.scss @@ -82,7 +82,7 @@ background-image: var(--background-image-path-mobile); background-size: cover; background-repeat: no-repeat; - background-position: center center; + background-position: center center; transition: background-color 150ms $ease; @include retina() { @@ -156,6 +156,7 @@ padding: 5px 15px; position: relative; z-index: 1; + box-sizing: border-box; .home-banner-info-wrapper { width: 100%; diff --git a/_sass/minima/_home-page.scss b/_sass/minima/_home-page.scss new file mode 100644 index 000000000..aeb1533cf --- /dev/null +++ b/_sass/minima/_home-page.scss @@ -0,0 +1,13 @@ +.home-page { + article { + padding-top: $spacing-unit; + } + + @include media-query(small) { + padding-bottom: $spacing-unit; + } + + @include media-query(medium-up) { + padding-bottom: $spacing-unit*2; + } +} diff --git a/_sass/minima/_layout.scss b/_sass/minima/_layout.scss index 017ff7ba3..669466192 100644 --- a/_sass/minima/_layout.scss +++ b/_sass/minima/_layout.scss @@ -5,6 +5,7 @@ .page-content { flex: 1 0 auto; + @include media-query(large) { > .page-content-wrapper { display: flex; @@ -129,9 +130,9 @@ @include relative-font-size(0.8); @include media-query(medium-down) { - margin-top: $spacing-unit / 2; - margin-left: $spacing-unit / 2; - margin-right: $spacing-unit / 2; + margin-top: $spacing-unit/2; + margin-left: $spacing-unit/2; + margin-right: $spacing-unit/2; } @include media-query(large) { @@ -139,18 +140,29 @@ } } - /** * Posts */ .main { - @include media-query(small) { - padding-bottom: $spacing-unit * 2; + &.sidebar { + @include media-query(small) { + padding-bottom: $spacing-unit*2; + } + + @include media-query(medium-up) { + padding-bottom: $spacing-unit * 6; + } } - @include media-query(medium-up) { - padding-bottom: $spacing-unit * 6; + &:not(.sidebar) { + @include media-query(small) { + padding-bottom: $spacing-unit; + } + + @include media-query(medium-up) { + padding-bottom: $spacing-unit*3; + } } &:not(.-no-top-padding) { @@ -159,14 +171,16 @@ } @include media-query(medium-up) { - padding-top: $spacing-unit * 4; + padding-top: $spacing-unit*4; } } } .post-title, .post-content h1, -article.guide h1 { +article.guide h1, +.post-content .h1, +article.guide .h1 { @include relative-font-size(2.625); letter-spacing: -1px; line-height: 1.15; @@ -178,7 +192,8 @@ article.guide h1 { .post-content, article.guide { - h1 { + h1, + .h1 { margin-top: $spacing-unit * 1; @include media-query(medium-up) { @@ -186,7 +201,8 @@ article.guide { } } - h2, h3, h4, h5, h6 { + h2, h3, h4, h5, h6, + .h2, .h3, .h4, .h5, .h6 { margin-top: 0; &::before { @@ -200,7 +216,8 @@ article.guide { } } - h2, h3 { + h2, h3, + .h2, .h3 { &::before { height: $spacing-unit * 1; } @@ -213,7 +230,8 @@ article.guide { } } - h4, h5, h6 { + h4, h5, h6, + .h4, .h5, .h6 { &::before { height: $spacing-unit * 1.5; margin-top: -$spacing-unit 1.5; @@ -226,7 +244,7 @@ article.guide { } } - h2 { + h2, .h2 { @include relative-font-size(1.75); @include media-query(large) { @@ -234,7 +252,7 @@ article.guide { } } - h3 { + h3, .h3 { @include relative-font-size(1.375); @include media-query(large) { @@ -242,15 +260,15 @@ article.guide { } } - h4 { + h4, .h4 { @include relative-font-size(1.25); } - h5 { + h5, .h5 { @include relative-font-size(1.125); } - h6 { + h6, .h6 { @include relative-font-size(1.0625); } } @@ -267,7 +285,9 @@ article.guide { float: left; margin: 5px 10px 5px 0; - &:last-of-type { margin-right: 0 } + &:last-of-type { + margin-right: 0 + } a { display: block; @@ -276,12 +296,14 @@ article.guide { &:hover { border-color: $border-color-02 } } } + li { a, div { min-width: 41px; text-align: center; box-sizing: border-box; } + div { display: block; padding: $spacing-unit / 4; diff --git a/_sass/minima/_site-footer.scss b/_sass/minima/_site-footer.scss index fccd61f67..da190a464 100644 --- a/_sass/minima/_site-footer.scss +++ b/_sass/minima/_site-footer.scss @@ -3,7 +3,7 @@ * Site footer */ .site-footer { - padding: 20px 20px $spacing-unit * 2 20px; + padding: $spacing-unit/2 $spacing-unit/2 $spacing-unit*2 $spacing-unit/2; .wrapper { display: flex; @@ -144,7 +144,7 @@ margin-right: auto; order: 1; } - + .edit-license { display: flex; border-right: 1px solid black; @@ -184,4 +184,4 @@ body.sidebar { padding-top: 30px; border-top: 1px solid rgba(var(--front), 0.1); } -} \ No newline at end of file +} diff --git a/_sass/minima/article/_dl.scss b/_sass/minima/article/_dl.scss new file mode 100644 index 000000000..75382ebbc --- /dev/null +++ b/_sass/minima/article/_dl.scss @@ -0,0 +1,93 @@ +article.guide { + dl { + display: flex; + flex-wrap: wrap; + align-items: stretch; + + dt, + dd { + display: flex; + padding: $spacing-unit/3*2 $spacing-unit; + background-color: rgba($blue, 0.1); + + p { + margin: 0; + } + + &.-green { + background-color: rgba($green, 0.1); + } + + &.-red { + background-color: rgba($red, 0.1); + } + + &.-blue { + background-color: rgba($blue, 0.1); + } + + &.-orange { + background-color: rgba($bitcoin-yellow, 0.1); + } + + &.-yellow { + background-color: rgba($yellow, 0.1); + } + } + + .icon { + display: flex; + align-items: center; + justify-content: center; + + svg { + width: $spacing-unit; + height: $spacing-unit; + } + } + + @include media-query(small) { + dt, + dd, + .icon { + flex-basis: 100%; + } + + dd { + & + dt { + margin-top: $spacing-unit/3*2; + } + } + + .icon { + height: $spacing-unit * 2; + + svg { + transform: rotate(90deg); + } + } + } + + @include media-query(medium-up) { + dt, + dd { + flex-basis: 30%; + flex-grow: 1; + margin-top: $spacing-unit/3*2; + + &:first-of-type { + margin-top: 0; + } + } + + .icon { + width: $spacing-unit*2; + margin-top: $spacing-unit/3*2; + + &:first-of-type { + margin-top: 0; + } + } + } + } +} diff --git a/_sass/minima/article/_do.scss b/_sass/minima/article/_do.scss new file mode 100644 index 000000000..517d83b37 --- /dev/null +++ b/_sass/minima/article/_do.scss @@ -0,0 +1,91 @@ +article.guide { + .do { + margin-top: $spacing-unit; + display: flex; + flex-wrap: wrap; + background-color: #f8f8f8; + @include responsive('padding', 20, 30); + + .icon { + flex-grow: 0; + display: flex; + align-items: center; + padding-top: 2px; + + &.-green { + svg { + background-color: $green; + } + } + + &.-red { + svg { + background-color: $red; + } + } + + svg { + display: block; + background-color: $blue; + border-radius: 3px; + width: 24px; + height: 24px; + color: white; + vertical-align: middle; + transform: translateY(-2px); + } + } + + h6 { + margin: 0 0 0 $spacing-unit/3; + padding: 0px 0 0 0; + font-size: 18px; + font-weight: 500; + flex-grow: 1; + flex-basis: 50%; + + &:before { + display: none; + } + } + + .copy { + p { + & + figure { + margin-top: $spacing-unit/3; + } + } + + figure { + &:last-child { + margin-bottom: 0; + } + } + } + } + + .dos { + display: flex; + + @include media-query(small) { + flex-direction: column; + + .do { + & + .do { + margin-top: $spacing-unit/3*2; + } + } + } + + @include media-query(medium-up) { + .do { + flex-basis: 30%; + flex-grow: 1; + + & + .do { + margin-left: $spacing-unit/3*4; + } + } + } + } +} diff --git a/_sass/minima/article/_fact.scss b/_sass/minima/article/_fact.scss new file mode 100644 index 000000000..56b2e141b --- /dev/null +++ b/_sass/minima/article/_fact.scss @@ -0,0 +1,72 @@ +article.guide { + .fact { + margin-top: $spacing-unit; + display: flex; + border: 1px solid #DEDEDE; + align-items: stretch; + + .icon { + padding: $spacing-unit/3 $spacing-unit/3*2; + border-right: 1px solid #DEDEDE; + flex-grow: 0; + display: flex; + align-items: center; + + &.-green { + svg { + background-color: $green; + } + } + + &.-red { + svg { + background-color: $red; + } + } + + svg { + display: inline-block; + background-color: $blue; + border-radius: 3px; + width: 24px; + height: 24px; + color: white; + vertical-align: middle; + transform: translateY(-2px); + } + } + + .copy { + padding: $spacing-unit/3*2; + flex-grow: 1; + + h6 { + margin: 0; + padding: 0; + font-size: 18px; + font-weight: 500; + + &:before { + display: none; + } + } + + ul, ol { + margin-left: 0; + + &:first-child { + margin-top: 5px; + } + } + + p { + margin: 5px 0 0 0; + } + } + + & + .fact { + margin-top: 0; + border-top: 0; + } + } +} diff --git a/_sass/minima/article/_footnotes.scss b/_sass/minima/article/_footnotes.scss new file mode 100644 index 000000000..9fcf11d09 --- /dev/null +++ b/_sass/minima/article/_footnotes.scss @@ -0,0 +1,30 @@ +article.guide { + .footnotes { + padding: $spacing-unit; + font-size: 0.8rem; + margin-top: $spacing-unit*2; + border: 1px solid rgba(var(--front), 0.05); + box-sizing: border-box; + background: #FDFDFD; + + &::before { + content: "REFERENCES"; + display: block; + margin-bottom: $spacing-unit/3; + color: var(--frontHex); + letter-spacing: 1px; + } + + ol { + margin: 0; + list-style-position: inside; + + li { + margin-left: 0; + p { + display: inline; + } + } + } + } +} diff --git a/_sass/minima/article/_image-gallery.scss b/_sass/minima/article/_image-gallery.scss new file mode 100644 index 000000000..d63e21b96 --- /dev/null +++ b/_sass/minima/article/_image-gallery.scss @@ -0,0 +1,49 @@ +article.guide { + .image-gallery { + display: flex; + margin-top: $spacing-unit; + background-color: #f8f8f8; + justify-content: center; + max-width: none !important; + + figure { + margin-top: 0; + margin-bottom: 0; + float: left; + // margin-right: $spacing-unit; + + img { + box-shadow: 0 20px 10px -8px rgba(black, 0.05); + border: 1px solid rgba(black, 0.1); + } + } + + @include media-query(small) { + flex-direction: column; + align-items: center; + margin-left: -$spacing-unit / 2; + margin-right: -$spacing-unit / 2; + padding: $spacing-unit $spacing-unit/2; + + figure { + margin: 0; + + & + figure { + margin-top: $spacing-unit; + } + } + } + + @include media-query(medium-up) { + margin-left: -$spacing-unit; + margin-right: -$spacing-unit; + padding: $spacing-unit; + + figure { + & + figure { + margin-left: $spacing-unit/3*4; + } + } + } + } +} diff --git a/_sass/minima/article/_image-slide-gallery.scss b/_sass/minima/article/_image-slide-gallery.scss new file mode 100644 index 000000000..f1527d887 --- /dev/null +++ b/_sass/minima/article/_image-slide-gallery.scss @@ -0,0 +1,94 @@ +article.guide { + .image-slide-gallery { + margin-top: $spacing-unit; + margin-bottom: $spacing-unit; + background-color: #f8f8f8; + justify-content: left; + max-width: none !important; + display: flex; + overflow: hidden; + overflow-x: scroll; + -webkit-overflow-scrolling: touch; + scroll-snap-type: x mandatory; + + figure { + flex-shrink: 0; + margin-top: 0; + margin-bottom: 0; + width: min-content; + + img { + max-width: none; + height: auto; + } + + figcaption { + p { + margin-top: 0; + } + } + } + + &:before, + &:after { + display: block; + content: ''; + position: relative; + height: $spacing-unit/3*2; + flex-shrink: 0; + flex-grow: 1; + } + + @include media-query(small) { + padding: $spacing-unit 0; + + figure { + flex-basis: calc(100vw - $spacing-unit*6); + + & + figure { + margin-left: $spacing-unit; + } + } + + &:before, + &:after { + flex-basis: $spacing-unit; + } + } + + @include media-query(medium-down) { + margin-left: -$spacing-unit/2; + margin-right: -$spacing-unit/2; + } + + @include media-query(medium-up) { + padding: $spacing-unit 0 $spacing-unit 0; + + figure { + & + figure { + margin-left: $spacing-unit; + } + } + + &:before, + &:after { + flex-basis: $spacing-unit; + } + } + + @include media-query(large) { + margin-left: -$spacing-unit; + margin-right: -$spacing-unit; + } + } + + & > .-float-right, + & > .center .-float-right { + @include media-query(large) { + margin-top: 0; + margin-bottom: 0; + float: right; + margin-left: $spacing-unit; + } + } +} diff --git a/_sass/minima/article/_tip.scss b/_sass/minima/article/_tip.scss new file mode 100644 index 000000000..68ddec596 --- /dev/null +++ b/_sass/minima/article/_tip.scss @@ -0,0 +1,105 @@ +article.guide { + .tip, + .recommendation { + margin-top: $spacing-unit; + padding: $spacing-unit/6*5 $spacing-unit/6*5 $spacing-unit/3*2 $spacing-unit/6*5; + box-sizing: border-box; + + h6 { + margin: 0; + padding: 0; + font-size: 22px; + font-weight: 500; + + &:before { + display: none; + } + + svg { + display: inline-block; + margin-right: 10px; + background-color: $blue; + border-radius: 3px; + width: 24px; + height: 24px; + color: white; + vertical-align: middle; + transform: translateY(-2px); + } + } + + p { + margin: 10px 0 0 0; + } + + &.-red { + background-color: rgba($red, 0.1); + + h6 { + svg { + background-color: $red; + } + } + } + + &.-green { + background-color: rgba($green, 0.1); + + h6 { + svg { + background-color: $green; + } + } + } + + &.-blue { + background-color: rgba($blue, 0.1); + + h6 { + svg { + background-color: $blue; + } + } + } + + &.-orange { + background-color: rgba($bitcoin-yellow, 0.1); + + h6 { + svg { + background-color: $bitcoin-yellow; + } + } + } + + &.-yellow { + background-color: rgba($yellow, 0.1); + + h6 { + svg { + background-color: $yellow; + } + } + } + } + + .tip { + background-color: rgba($blue, 0.1); + + h6 { + svg { + background-color: $blue; + } + } + } + + .recommendation { + background-color: rgba($bitcoin-yellow, 0.1); + + h6 { + svg { + background-color: $bitcoin-yellow; + } + } + } +} diff --git a/_sass/minima/initialize.scss b/_sass/minima/initialize.scss index a10f3fb4c..8f8c9fcf1 100644 --- a/_sass/minima/initialize.scss +++ b/_sass/minima/initialize.scss @@ -11,6 +11,14 @@ "minima/side-bar", // Side bar for guide pages "minima/nav-list", // Navigation list for guide page side bar and mobile menu guide sub nav "minima/article", // Formatting for all article pages (guide, post, page) + "minima/article/_dl", + "minima/article/_do", + "minima/article/_fact", + "minima/article/_footnotes", + "minima/article/_image-gallery", + "minima/article/_image-slide-gallery", + "minima/article/_tip", + "minima/home-page", // Formatting for the home page "minima/search-page", // Formatting for the search page "minima/projects-page", // Formatting for the projects page "minima/glossary-page", // Formatting for the glossary page diff --git a/guide/foundations/principles.md b/guide/foundations/principles.md index def48d13f..696752f7c 100644 --- a/guide/foundations/principles.md +++ b/guide/foundations/principles.md @@ -21,7 +21,7 @@ The key principles of designing for Bitcoin image = "/assets/images/guide/foundations/principles/principles.jpg" retina = "/assets/images/guide/foundations/principles/principles@2x.jpg" mobile = "/assets/images/guide/foundations/principles/principles-mobile.jpg" - mobileRetina = "/assets/images/foundations/principles/principles-mobile@2x.jpg" + mobileRetina = "/assets/images/guide/foundations/principles/principles-mobile@2x.jpg" alt-text = "Principles header illustration, five white circles in a horizontal line on black background" width = 1600 height = 600 diff --git a/guide/onboarding/introduction.md b/guide/onboarding/introduction.md index e2e28136f..e9c9a0bf3 100644 --- a/guide/onboarding/introduction.md +++ b/guide/onboarding/introduction.md @@ -22,7 +22,7 @@ scan this page to get an overview of the section and then decide which topics to image = "/assets/images/guide/onboarding/onboarding.png" retina = "/assets/images/guide/onboarding/onboarding@2x.png" mobile = "/assets/images/guide/onboarding/onboarding-mobile.png" - mobileRetina = "/assets/images/guide/onboarding/onboarding/onboarding-mobile@2x.png" + mobileRetina = "/assets/images/guide/onboarding/onboarding-mobile@2x.png" alt-text = "Person climbing ladder" width = 1600 height = 600 @@ -59,4 +59,4 @@ An overview of how to design a successful onboarding experience for first-time u ### Restoring a wallet (coming soon) -### Protecting a wallet (coming soon) \ No newline at end of file +### Protecting a wallet (coming soon)