Skip to content

Commit

Permalink
Merge pull request #300 from manabuyasuda/#292
Browse files Browse the repository at this point in the history 
Fix: data-whatinputからdata-whatintentに修正

fix #292
  • Loading branch information
@manabuyasuda
manabuyasuda authored Aug 30, 2020
2 parents cdb9dae + 01911b7 commit 6e730df
Show file tree
Hide file tree
Showing 17 changed files with 83 additions and 83 deletions.
78 changes: 39 additions & 39 deletions htdocs/assets/css/site.css
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions htdocs/assets/js/site.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/assets/css/base/_base.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ input[type="text"] {
}

// フォーカスインジゲータはキーボード操作のときにだけ表示します。
[data-whatinput="mouse"] *:focus,
[data-whatinput="touch"] *:focus {
[data-whatintent="mouse"] *:focus,
[data-whatintent="touch"] *:focus {
outline: none;
}
6 changes: 3 additions & 3 deletions src/assets/css/base/mixin/namespace/sitewide/_Button.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
appearance: none;
}

[data-whatinput="keyboard"] &:focus {
[data-whatintent="keyboard"] &:focus {
outline-width: 0;
box-shadow: $form-box-shadow-focus;
}

[data-whatinput="mouse"] &:focus,
[data-whatinput="touch"] &:focus {
[data-whatintent="mouse"] &:focus,
[data-whatintent="touch"] &:focus {
outline-width: 0;
box-shadow: none;
}
Expand Down
10 changes: 5 additions & 5 deletions src/assets/css/base/mixin/namespace/sitewide/_FormCheckbox.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,20 @@
width: calc(100% - 1em - 4px);
}

[data-whatinput="keyboard"] &:focus + label > svg {
[data-whatintent="keyboard"] &:focus + label > svg {
border-color: $form-border-color-focus;
box-shadow: $form-box-shadow-focus;
}

[data-whatinput="mouse"] &:focus + label > svg,
[data-whatinput="touch"] &:focus + label > svg {
[data-whatintent="mouse"] &:focus + label > svg,
[data-whatintent="touch"] &:focus + label > svg {
border-color: $form-boder-color;
box-shadow: none;
}

&:checked + label > svg,
[data-whatinput="mouse"] &:checked + label > svg,
[data-whatinput="touch"] &:checked + label > svg {
[data-whatintent="mouse"] &:checked + label > svg,
[data-whatintent="touch"] &:checked + label > svg {
border-color: #1e87f0;
background-color: #1e87f0;
fill: #fff;
Expand Down
10 changes: 5 additions & 5 deletions src/assets/css/base/mixin/namespace/sitewide/_FormRadio.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,20 @@
width: calc(100% - 1em - 4px);
}

[data-whatinput="keyboard"] &:focus + label > svg {
[data-whatintent="keyboard"] &:focus + label > svg {
border-color: $form-border-color-focus;
box-shadow: $form-box-shadow-focus;
}

[data-whatinput="mouse"] &:focus + label > svg,
[data-whatinput="touch"] &:focus + label > svg {
[data-whatintent="mouse"] &:focus + label > svg,
[data-whatintent="touch"] &:focus + label > svg {
border-color: $form-boder-color;
box-shadow: none;
}

&:checked + label > svg,
[data-whatinput="mouse"] &:checked + label > svg,
[data-whatinput="touch"] &:checked + label > svg {
[data-whatintent="mouse"] &:checked + label > svg,
[data-whatintent="touch"] &:checked + label > svg {
border-color: #1e87f0;
background-color: #1e87f0;

Expand Down
2 changes: 1 addition & 1 deletion src/assets/css/base/mixin/namespace/sitewide/_FormSelect.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
outline-width: 0;
}

[data-whatinput="keyboard"] & > select:focus {
[data-whatintent="keyboard"] & > select:focus {
border-color: $form-border-color-focus;
box-shadow: $form-box-shadow-focus;
}
Expand Down
2 changes: 1 addition & 1 deletion src/assets/css/base/mixin/namespace/sitewide/_Label.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
background-color: inherit;
color: $color-text;

html:not([data-whatinput="touch"]) &:hover {
html:not([data-whatintent="touch"]) &:hover {
text-decoration: none;
color: currentColor;
}
Expand Down
2 changes: 1 addition & 1 deletion src/assets/css/base/mixin/namespace/sitewide/_Link.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
text-decoration: underline;
color: $color-link;

html:not([data-whatinput="touch"]) &:hover {
html:not([data-whatintent="touch"]) &:hover {
text-decoration: underline;
color: $color-link-hover;
}
Expand Down
6 changes: 3 additions & 3 deletions src/assets/css/namespace/sitewide/_Button.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ category: [Button, Link, Form]
background-color: $color-brand;
color: #fff;

html:not([data-whatinput="touch"]) &:hover {
html:not([data-whatintent="touch"]) &:hover {
background-color: #fff;
color: $color-brand;
}

html:not([data-whatinput="touch"]) &:disabled:hover,
html:not([data-whatinput="touch"]) &.-disabled:hover {
html:not([data-whatintent="touch"]) &:disabled:hover,
html:not([data-whatintent="touch"]) &.-disabled:hover {
color: #fff;
}
}
Expand Down
14 changes: 7 additions & 7 deletions src/assets/css/namespace/sitewide/_Dialog.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,13 +189,13 @@ A11yに対応したダイアログ（モーダル）です。
appearance: none;
}

[data-whatinput="keyboard"] &:focus {
[data-whatintent="keyboard"] &:focus {
outline-width: 0;
box-shadow: $form-box-shadow-focus;
}

[data-whatinput="mouse"] &:focus,
[data-whatinput="touch"] &:focus {
[data-whatintent="mouse"] &:focus,
[data-whatintent="touch"] &:focus {
outline-width: 0;
box-shadow: none;
}
Expand Down Expand Up @@ -227,18 +227,18 @@ A11yに対応したダイアログ（モーダル）です。
transition-duration: $global-transition-duration;
appearance: none;

html:not([data-whatinput="touch"]) &:hover {
html:not([data-whatintent="touch"]) &:hover {
text-decoration: none;
color: $color-link-hover;
}

[data-whatinput="keyboard"] &:focus {
[data-whatintent="keyboard"] &:focus {
outline-width: 0;
box-shadow: $form-box-shadow-focus;
}

[data-whatinput="mouse"] &:focus,
[data-whatinput="touch"] &:focus {
[data-whatintent="mouse"] &:focus,
[data-whatintent="touch"] &:focus {
outline-width: 0;
box-shadow: none;
}
Expand Down
2 changes: 1 addition & 1 deletion src/assets/css/namespace/sitewide/_LinkDownload.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ category: [Link, Icon]
text-decoration: none;
color: $color-link;

html:not([data-whatinput="touch"]) &:hover {
html:not([data-whatintent="touch"]) &:hover {
text-decoration: underline;
color: $color-link-hover;
}
Expand Down
2 changes: 1 addition & 1 deletion src/assets/css/namespace/sitewide/_LinkExternal.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ category: [Link, Icon]
text-decoration: none;
color: $color-link;

html:not([data-whatinput="touch"]) &:hover {
html:not([data-whatintent="touch"]) &:hover {
text-decoration: underline;
color: $color-link-hover;
}
Expand Down
2 changes: 1 addition & 1 deletion src/assets/css/namespace/sitewide/_LinkMore.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ category: [Link, Icon]
text-decoration: none;
color: $color-link;

html:not([data-whatinput="touch"]) &:hover {
html:not([data-whatintent="touch"]) &:hover {
text-decoration: underline;
color: $color-link-hover;
}
Expand Down
2 changes: 1 addition & 1 deletion src/assets/css/namespace/sitewide/_LinkNote.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ category: Link
text-decoration: underline;
color: $color-link;

html:not([data-whatinput="touch"]) &:hover {
html:not([data-whatintent="touch"]) &:hover {
text-decoration: underline;
color: $color-link-hover;
}
Expand Down
2 changes: 1 addition & 1 deletion src/assets/css/namespace/sitewide/_LinkPdf.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ category: [Link, Icon]
text-decoration: none;
color: $color-link;

html:not([data-whatinput="touch"]) &:hover {
html:not([data-whatintent="touch"]) &:hover {
text-decoration: underline;
color: $color-link-hover;
}
Expand Down
18 changes: 9 additions & 9 deletions src/components/VButton/VButton.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ export default {
appearance: none;
}
[data-whatinput='keyboard'] &:focus {
[data-whatintent='keyboard'] &:focus {
outline-width: 0;
box-shadow: $form-box-shadow-focus;
}
[data-whatinput='mouse'] &:focus,
[data-whatinput='touch'] &:focus {
[data-whatintent='mouse'] &:focus,
[data-whatintent='touch'] &:focus {
outline-width: 0;
box-shadow: none;
}
Expand All @@ -122,13 +122,13 @@ export default {
background-color: $color-brand;
color: #fff;
html:not([data-whatinput='touch']) &:hover {
html:not([data-whatintent='touch']) &:hover {
background-color: #fff;
color: $color-brand;
}
html:not([data-whatinput='touch']) &:disabled:hover,
html:not([data-whatinput='touch']) &.-disabled:hover {
html:not([data-whatintent='touch']) &:disabled:hover,
html:not([data-whatintent='touch']) &.-disabled:hover {
color: #fff;
}
}
Expand All @@ -138,13 +138,13 @@ export default {
background-color: #fff;
color: $color-brand;
html:not([data-whatinput='touch']) &:hover {
html:not([data-whatintent='touch']) &:hover {
background-color: $color-brand;
color: #fff;
}
html:not([data-whatinput='touch']) &:disabled:hover,
html:not([data-whatinput='touch']) &.-disabled:hover {
html:not([data-whatintent='touch']) &:disabled:hover,
html:not([data-whatintent='touch']) &.-disabled:hover {
color: $color-brand;
}
}
Expand Down

0 comments on commit 6e730df

Please sign in to comment.