diff --git a/src/client/site/browse_page/browse_page.scss b/src/client/site/browse_page/browse_page.scss index 7fde29b3b..fd4ed0048 100644 --- a/src/client/site/browse_page/browse_page.scss +++ b/src/client/site/browse_page/browse_page.scss @@ -10,13 +10,23 @@ .right { .tile_container { - display : flex; - flex-wrap : wrap; - justify-content : space-between; + display : flex; + flex-wrap : wrap; + + @include screen-size(tablet) { + flex-direction: column; + align-items: stretch; + } .view__mod_tile { - width : calc(50% - 12px); // $size-margin-large / 2 + flex : 1 1 calc(50% - 12px); // $size-margin-large / 2 + margin-right : $size-margin-medium; margin-bottom : $size-margin-large; + + @include screen-size(tablet) { + flex: 0 0 auto; + margin-right: 0; + } } } } diff --git a/src/client/site/browse_page/mod_tile/mod_tile.scss b/src/client/site/browse_page/mod_tile/mod_tile.scss index 85e5ec908..f615fb418 100644 --- a/src/client/site/browse_page/mod_tile/mod_tile.scss +++ b/src/client/site/browse_page/mod_tile/mod_tile.scss @@ -13,7 +13,7 @@ align-items : stretch; a { - max-width: 100%; + width: 100%; @include floating-panel; border : $size-border-medium solid $color-background-panel; diff --git a/src/client/site/common/inventory/inventory.scss b/src/client/site/common/inventory/inventory.scss index d8778b64a..a079077a7 100644 --- a/src/client/site/common/inventory/inventory.scss +++ b/src/client/site/common/inventory/inventory.scss @@ -38,12 +38,12 @@ margin-top: $size-margin-large; .item-selector { - flex : 85%; + flex : 80%; margin-right : $size-margin-medium; } .clear { - flex : 15%; + flex : 20%; } } } diff --git a/src/client/site/common/item_group/item_group.scss b/src/client/site/common/item_group/item_group.scss index c05403e37..8443f7167 100644 --- a/src/client/site/common/item_group/item_group.scss +++ b/src/client/site/common/item_group/item_group.scss @@ -14,6 +14,10 @@ .view__item_tile { margin-bottom: $size-margin-medium; width: calc(33% - 8px); // $size-margin-xsmall * 2 + + @include screen-size(tablet) { + width: calc(50% - 8px); // $size-margin-xsmall * 2 + } } } } diff --git a/src/client/site/common/video/video.jade b/src/client/site/common/video/video.jade index 797100ee2..2a57537c2 100644 --- a/src/client/site/common/video/video.jade +++ b/src/client/site/common/video/video.jade @@ -6,5 +6,5 @@ //- .view__video - iframe(width="356", height="267", src="", frameborder="0", allowfullscreen="true") + iframe(src="", frameborder="0", allowfullscreen="true") .caption: p \ No newline at end of file diff --git a/src/client/site/craft_page/craftsman_working/craftsman_working.scss b/src/client/site/craft_page/craftsman_working/craftsman_working.scss index c456b059a..18f1e0b6c 100644 --- a/src/client/site/craft_page/craftsman_working/craftsman_working.scss +++ b/src/client/site/craft_page/craftsman_working/craftsman_working.scss @@ -35,7 +35,7 @@ All rights reserved. .button { margin-top: $size-margin-large; height: $size-minecraft-block * 2; - width: 50%; + width: $size-minecraft-block * 10; p { font-size: $font-size-xxlarge; diff --git a/src/client/site/feedback/feedback.scss b/src/client/site/feedback/feedback.scss index 1299c1d7a..5d8e3a429 100644 --- a/src/client/site/feedback/feedback.scss +++ b/src/client/site/feedback/feedback.scss @@ -73,13 +73,11 @@ background: $color-gray-light; border: $size-border-medium solid $color-black; border-left: 0; - - display: flex; - align-items: center; - justify-content: center; + position: relative; p { - transform: rotate(-90deg); + position: absolute; top: 50%; left: 50%; + transform: translateX(-50%) rotate(-90deg) translateX(10%); font-family: $font-family-header; font-size: $label-size; diff --git a/src/client/site/header/header.scss b/src/client/site/header/header.scss index 717c30491..bb6bfa214 100644 --- a/src/client/site/header/header.scss +++ b/src/client/site/header/header.scss @@ -23,15 +23,25 @@ img { position : relative; - top : -$size-minecraft-block * 0.5; - left : -$size-minecraft-block * 0.5; - height : $size-minecraft-block * 2.0; - width : $size-minecraft-block * 2.0; + height : $size-minecraft-block * 1.5; + width : $size-minecraft-block * 1.5; + + @include screen-size(desktop) { + top : -$size-minecraft-block * 0.5; + left : -$size-minecraft-block * 0.5; + height : $size-minecraft-block * 2.0; + width : $size-minecraft-block * 2.0; + } } } h1 { flex: 1 1 auto; + white-space: nowrap; + + @include screen-size(tablet) { + font-size: $font-size-xlarge; + } } .addthis_sharing_toolbox { @@ -40,7 +50,6 @@ min-width : 144px; margin-right : $size-margin-small; - &.placeholder { border : 1px solid orange; text-align : center; @@ -62,15 +71,20 @@ align-items : center; display : flex; flex-wrap : wrap; - justify-content : space-around; + justify-content : center; padding : $size-margin-medium $size-margin-medium; padding-top : 0; .button { - flex : 1 1 20%; - min-width : 4 * $size-minecraft-block; - max-width : 5 * $size-minecraft-block; - margin-top: $size-margin-medium; + flex : 1 1 calc(20% - 8px); + min-width : 3 * $size-minecraft-block; + max-width : 5 * $size-minecraft-block; + margin-top : $size-margin-medium; + margin-right : $size-margin-small; + + &:last-child { + margin-right: 0; + } } } diff --git a/src/client/site/index.scss b/src/client/site/index.scss index 327278b4d..8bba5661f 100644 --- a/src/client/site/index.scss +++ b/src/client/site/index.scss @@ -38,17 +38,23 @@ html { & > *:first-child { flex: 0 0 50%; + @include screen-size(tablet) { + flex: 0 0 75%; + } + box-shadow : $size-margin-small $size-margin-small $size-margin-large $color-shadow; } } .page { - margin : $size-margin-large 0; - max-width : $size-page-width; - width : 100%; - background : $color-background-page; - box-shadow : $size-margin-small $size-margin-small $size-margin-large $color-shadow; + + @include screen-size(desktop) { + margin : $size-margin-large 0; + max-width : $size-page-width; + width : 100%; + box-shadow : $size-margin-small $size-margin-small $size-margin-large $color-shadow; + } display : flex; flex-direction : column; diff --git a/src/client/site/tutorial_page/tutorial_page.scss b/src/client/site/tutorial_page/tutorial_page.scss index 909b29742..dc02c7cfc 100644 --- a/src/client/site/tutorial_page/tutorial_page.scss +++ b/src/client/site/tutorial_page/tutorial_page.scss @@ -51,12 +51,14 @@ margin-top : -$size-margin-medium; display : flex; flex-wrap : wrap; + justify-content: space-between; + + padding-right : -$size-margin-medium; & > * { - flex : 1 1 100%; margin-right : $size-margin-medium; margin-top : $size-margin-medium; - max-width : calc(50% - 12px); // $size-margin-medium + width : calc(50% - 12px); // $size-margin-medium; } } } diff --git a/src/client/styles/main.scss b/src/client/styles/main.scss index bbf907fc9..28b45e52a 100644 --- a/src/client/styles/main.scss +++ b/src/client/styles/main.scss @@ -8,6 +8,9 @@ // normalize all values @import './reset'; +// define media breakpoints +@import './media'; + // define variables @import './colors'; @import './fonts'; diff --git a/src/client/styles/media.scss b/src/client/styles/media.scss new file mode 100644 index 000000000..373e176e5 --- /dev/null +++ b/src/client/styles/media.scss @@ -0,0 +1,20 @@ +// +// Crafting Guide - fonts.scss +// +// Copyright © 2014-2016 by Redwood Labs +// All rights reserved. +// + + +$tablet : 960px; +$mobile : 320px; + +@mixin screen-size($screenType) { + @if $screenType == desktop { + @media (min-width: $tablet + 1) { @content; } + } @else if $screenType == tablet { + @media (max-width: $tablet) { @content; } + } @else if $screenType == mobile { + @media (max-width: $mobile) { @content; } + } +} diff --git a/src/client/styles/mixins.scss b/src/client/styles/mixins.scss index 1e15a7a3b..1b5f30470 100644 --- a/src/client/styles/mixins.scss +++ b/src/client/styles/mixins.scss @@ -10,6 +10,11 @@ filter : blur($radius); } +@mixin floating-panel { + background: $color-background-panel; + box-shadow: $size-margin-xxsmall $size-margin-xxsmall $size-margin-xsmall $color-shadow; +} + @mixin grayscale { -webkit-filter : grayscale(100%); -moz-filter : grayscale(100%); @@ -18,17 +23,32 @@ filter : gray; } -@mixin no-select { - -webkit-touch-callout : none; /* iOS Safari */ - -webkit-user-select : none; /* Chrome/Safari/Opera */ - -moz-user-select : none; /* Firefox */ - -ms-user-select : none; /* IE/Edge */ - user-select : none; /* non-prefixed version, currently not supported by any browser */ -} +@mixin layout-body-with-sidebar { + display: flex; -@mixin floating-panel { - background: $color-background-panel; - box-shadow: $size-margin-xxsmall $size-margin-xxsmall $size-margin-xsmall $color-shadow; + & > .left { + flex: 0 0 $size-skyscraper-width + $size-margin-medium; + padding-right: $size-margin-medium; + + @include screen-size(tablet) { + display: none; + } + @include screen-size(mobile) { + display: none; + } + } + + & > .right { + flex: 1 1 auto; + + @include screen-size(tablet) { + margin: 0 $size-margin-xlarge; + } + + section { + margin-bottom: $size-margin-large; + } + } } @mixin layout-link-list { @@ -56,6 +76,14 @@ } } +@mixin no-select { + -webkit-touch-callout : none; /* iOS Safari */ + -webkit-user-select : none; /* Chrome/Safari/Opera */ + -moz-user-select : none; /* Firefox */ + -ms-user-select : none; /* IE/Edge */ + user-select : none; /* non-prefixed version, currently not supported by any browser */ +} + @mixin pixel-image { image-rendering : -moz-crisp-edges; /* Firefox */ image-rendering : -o-crisp-edges; /* Opera */ @@ -63,20 +91,3 @@ image-rendering : crisp-edges; -ms-interpolation-mode : nearest-neighbor; /* IE (non-standard property) */ } - -@mixin layout-body-with-sidebar { - display: flex; - - & > .left { - flex: 0 0 $size-skyscraper-width + $size-margin-medium; - padding-right: $size-margin-medium; - } - - & > .right { - flex: 1 1 auto; - - section { - margin-bottom: $size-margin-large; - } - } -}