Fixes for reactivity in Safari

This commit is contained in:
Andrew Miner
2016-04-29 23:08:08 -07:00
parent 83156c30c7
commit 545408a7e7
4 changed files with 48 additions and 23 deletions
+8 -3
View File
@@ -9,12 +9,17 @@
display: flex; display: flex;
.input { .input {
flex: 1 1 50%; flex: 0 0 auto;
align-items : center; align-items : center;
display : flex; display : flex;
flex-direction : column; flex-direction : column;
.view__crafting_grid {
flex: 1 1 auto;
width: 100%;
}
.tool { .tool {
margin-top : $size-margin-small; margin-top : $size-margin-small;
@@ -24,7 +29,7 @@
} }
.output { .output {
flex: 1 1 50%; flex: 1 1 100%;
margin-left: $size-margin-medium; margin-left: $size-margin-medium;
display : flex; display : flex;
@@ -42,4 +47,4 @@
margin-top : $size-margin-medium; margin-top : $size-margin-medium;
} }
} }
} }
+28 -19
View File
@@ -28,19 +28,10 @@
.main_content { .main_content {
display: flex; display: flex;
@include screen-size(mobile) {
flex-direction: column-reverse;
align-items: stretch;
}
.view__inventory { .view__inventory {
flex: 50%; flex: 50%;
margin-left: $size-margin-large; margin-left: $size-margin-large;
@include screen-size(mobile) {
margin: $size-margin-large $size-margin-large 0 $size-margin-large;
}
.buttons { .buttons {
display: none; display: none;
} }
@@ -55,9 +46,6 @@
margin-top: $size-margin-large; margin-top: $size-margin-large;
opacity: 0; opacity: 0;
@include screen-size(mobile) {
opacity: 1.0;
}
display: flex; display: flex;
@@ -67,12 +55,6 @@
&:not(:first-child) { &:not(:first-child) {
margin-left: $size-margin-medium; margin-left: $size-margin-medium;
} }
@include screen-size(mobile) {
.full {
display: none;
}
}
} }
a { a {
@@ -94,4 +76,31 @@
text-decoration: line-through; text-decoration: line-through;
} }
} }
} }
@include screen-size(mobile) {
.view__step {
.main_content {
flex-direction: column-reverse;
.view__inventory {
flex: 0 0 auto;
margin: $size-margin-large $size-margin-large 0 $size-margin-large;
}
.view__recipe {
flex: 0 0 auto;
}
}
.buttons {
opacity: 1.0;
.button {
.full {
display: none;
}
}
}
}
}
+10
View File
@@ -64,3 +64,13 @@
height: $size-minecraft-block; height: $size-minecraft-block;
} }
} }
@include screen-size(mobile) {
.view__footer {
> .content {
.left, .center, .right {
flex: 0 0 auto;
}
}
}
}
+2 -1
View File
@@ -84,7 +84,8 @@
padding-top : 0; padding-top : 0;
.button { .button {
flex : 1 1 calc(20% - 8px); flex-grow : 1;
flex-shrink : 1;
min-width : 3 * $size-minecraft-block; min-width : 3 * $size-minecraft-block;
max-width : 5 * $size-minecraft-block; max-width : 5 * $size-minecraft-block;
margin-top : $size-margin-medium; margin-top : $size-margin-medium;