Merge conflict corrections with master.

ken30huang · Nov 30, 2018 · b3f56c9 · b3f56c9
2 parents d062c2c + 4c6bf1f
commit b3f56c9
Show file tree

Hide file tree

Showing 8 changed files with 1,151 additions and 1,137 deletions.
diff --git a/css/nes.css b/css/nes.css
diff --git a/css/nes.css.map b/css/nes.css.map
diff --git a/css/nes.min.css b/css/nes.min.css
diff --git a/package-lock.json b/package-lock.json
diff --git a/scss/elements/buttons.scss b/scss/elements/buttons.scss
@@ -3,7 +3,8 @@
  background-color: $background;
  box-shadow: inset -4px -4px $shadow;
 
- &:hover {
+ &:hover,
+ &:focus {
  background-color: $hover-background;
  box-shadow: inset -6px -6px $shadow;
  }

diff --git a/scss/elements/radios.scss b/scss/elements/radios.scss
@@ -36,10 +36,17 @@
  top: -2px;
  left: -20px;
  content: "";
- animation: blink 1s infinite steps(1);
 
  @include pixelize($radio, $colors, 2px);
  }
+
+ &:checked:hover,
+ &:checked:focus {
+ & + span::before {
+ animation: blink 1s infinite steps(1);
+ }
+ }
+
  &:checked:focus + span::before {
  @include pixelize($radio-checked-focus, $colors, 2px);
  }

diff --git a/scss/form/inputs.scss b/scss/form/inputs.scss
@@ -9,6 +9,7 @@
  -4px 0 $border;
  }
 
+ max-width: 100%;
  padding: 0.5rem 1rem;
  margin: 4px;
  border: none;

diff --git a/scss/utilities/icon-mixin.scss b/scss/utilities/icon-mixin.scss
@@ -20,5 +20,5 @@
 
  width: $size;
  height: $size;
- box-shadow: unquote($ret + ";");
+ box-shadow: unquote($ret);
 }