Skip to content

Commit

Permalink
Merge pull request #10 from jaljo/feat/final-layout
Browse files Browse the repository at this point in the history
positionned the final layout
  • Loading branch information
jaljo authored Apr 28, 2020
2 parents d1fdc43 + c78453b commit 80dcfc0
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
Binary file added public/images/layout.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/Component/App.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ html {
font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
line-height: 1.5;
font-size: 1.25rem;
overflow: hidden;
}
11 changes: 2 additions & 9 deletions src/Component/Board/Board.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ div[data-is="main-board"] {
display: flex;
flex-direction: column;
margin-bottom: 20px;
background-image: url('/images/layout.png');
padding: 0 128px 128px 128px;

section[data-is="line"] {
flex: 1;
Expand All @@ -12,17 +14,8 @@ div[data-is="main-board"] {

div[data-is="tile"] {
flex: 1;
border: 1px black dashed;
min-height: 128px;
min-width: 128px;

&.goal {
background-color: teal;
}

&.is-locked {
background-color: black;
}
}
}
}
10 changes: 8 additions & 2 deletions src/Component/Game/Game.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
div[data-is="game"] {
display: flex;
flex-direction: row;
transform: scale(.8);
margin-top: -2rem;

section.game-section {
flex: 1;
padding: 2rem;
padding: 0 2rem;

&.right-panel {
h1 {
Expand All @@ -20,7 +22,7 @@ div[data-is="game"] {
margin: 0;
text-align: center;
color: $color-white;
font-size: 4rem;
font-size: 3rem;
font-weight: bold;
text-shadow: 0px 3px 0px $color-soil-light;
}
Expand Down Expand Up @@ -52,6 +54,10 @@ div[data-is="game"] {
&:active {
box-shadow: inset 0px 3px $color-soil-light;
}

&::-moz-focus-inner {
border: 0;
}
}
}
}
Expand Down

0 comments on commit 80dcfc0

Please sign in to comment.