diff --git a/style/main.css b/style/main.css index 41557e96ba8d8bd5a4809751ccfdeb9ab47ac6d1..6a30e3f9fb3978fd8c651001685a5bbf5741be18 100644 --- a/style/main.css +++ b/style/main.css @@ -484,7 +484,8 @@ hr { .game-intro { float: left; - line-height: 42px; } + line-height: 42px; + margin-bottom: 0; } .restart-button { display: inline-block; @@ -547,7 +548,7 @@ hr { margin-top: 2px; } .game-container { - margin-top: 40px; + margin-top: 10px; position: relative; padding: 10px; cursor: default; @@ -707,9 +708,6 @@ hr { -moz-transform: translate(202px, 202px); transform: translate(202px, 202px); } - .game-container { - margin-top: 20px; } - .tile .tile-inner { font-size: 35px; } diff --git a/style/main.scss b/style/main.scss index 753e43cee5f405a506b5a55bf5e8fd15bbb4544e..45def3f4e56d1705864711e971d39ceb0de377f4 100644 --- a/style/main.scss +++ b/style/main.scss @@ -16,6 +16,7 @@ $tile-color: #eee4da; $tile-gold-color: #edc22e; $tile-gold-glow-color: lighten($tile-gold-color, 15%); +$game-container-margin-top: 40px; $game-container-background: #bbada0; $transition-speed: 100ms; @@ -169,7 +170,7 @@ hr { // Game field mixin used to render CSS at different width @mixin game-field { .game-container { - margin-top: 40px; + margin-top: $game-container-margin-top; position: relative; padding: $grid-spacing; @@ -453,20 +454,17 @@ hr { .above-game { @include clearfix; - // margin-bottom: 10px; } .game-intro { float: left; line-height: 42px; - // margin-bottom: 0; + margin-bottom: 0; } .restart-button { @include button; display: block; - // width: 100px; - // margin: 10px auto 10px auto; text-align: center; float: right; } @@ -492,6 +490,7 @@ hr { $grid-row-cells: 4; $tile-size: ($field-width - $grid-spacing * ($grid-row-cells + 1)) / $grid-row-cells; $tile-border-radius: 3px; + $game-container-margin-top: 10px; html, body { font-size: 15px; @@ -541,10 +540,6 @@ hr { // Render the game field at the right width @include game-field; - .game-container { - margin-top: 20px; - } - // Rest of the font-size adjustments in the tile class .tile .tile-inner { font-size: 35px;