Skip to content

Commit

Permalink
Merge pull request dnum-mi#126 from laruiss/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
laruiss authored Oct 12, 2021
2 parents 9219c59 + e61db32 commit 3ccdd5e
Show file tree
Hide file tree
Showing 7 changed files with 73 additions and 50 deletions.
9 changes: 4 additions & 5 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
// https://github.com/johnsoncodehk/volar
"johnsoncodehk.volar",

// Language support for PostCSS
// https://github.com/csstools/postcss-language
"csstools.postcss",

// Peek and go-to-definition for .vue files
// https://github.com/fuzinato/vscode-vue-peek
"dariofuzinato.vue-peek",
Expand Down Expand Up @@ -62,11 +66,6 @@
// https://github.com/vscode-icons/vscode-icons
"vscode-icons-team.vscode-icons",

// A customizable extension for colorizing matching brackets
// https://github.com/CoenraadS/BracketPair
// (Archived, not maintained, but still working and the best...)
"coenraads.bracket-pair-colorizer",

// Makes indentation easier to read
// https://github.com/oderwat/vscode-indent-rainbow
"oderwat.indent-rainbow",
Expand Down
19 changes: 16 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
{
"jest.jestCommandLine": "./node_modules/.bin/jest",
"conventionalCommits.scopes": [
"releases"
]
"releases",
"dx"
],
"editor.bracketPairColorization.enabled": true,
"emmet.includeLanguages": {
"vue-html": "html",
"postcss": "css"
},
"emmet.syntaxProfiles": {
"postcss": "css"
},
"eslint.workingDirectories": [{ "mode": "auto"}],
"files.associations": {
"*.css": "postcss"
},
"jest.jestCommandLine": "./node_modules/.bin/jest",
}
76 changes: 38 additions & 38 deletions src/assets/core.css
Original file line number Diff line number Diff line change
Expand Up @@ -233,13 +233,13 @@ a {
outline-width: 2px;
}

a:focus {
/* a:focus {
outline-style: solid;
}
} */

a:focus:not(:focus-visible) {
/* a:focus:not(:focus-visible) {
outline-style: none;
}
} */

a:focus-visible {
outline-style: solid;
Expand All @@ -262,13 +262,13 @@ button {
outline-width: 2px;
}

button:focus {
/* button:focus {
outline-style: solid;
}
} */

button:focus:not(:focus-visible) {
/* button:focus:not(:focus-visible) {
outline-style: none;
}
} */

button:focus-visible {
outline-style: solid;
Expand All @@ -291,13 +291,13 @@ input {
outline-width: 2px;
}

input:focus {
/* input:focus {
outline-style: solid;
}
} */

input:focus:not(:focus-visible) {
/* input:focus:not(:focus-visible) {
outline-style: none;
}
} */

input:focus-visible {
outline-style: solid;
Expand All @@ -316,15 +316,15 @@ input[type="checkbox"] + label::before, input[type="radio"] + label::before {
outline-width: 2px;
}

input[type="checkbox"]:focus + label::before,
/* input[type="checkbox"]:focus + label::before,
input[type="radio"]:focus + label::before {
outline-style: solid;
}
} */

input[type="checkbox"]:focus:not(:focus-visible) + label::before,
/* input[type="checkbox"]:focus:not(:focus-visible) + label::before,
input[type="radio"]:focus:not(:focus-visible) + label::before {
outline-style: none;
}
} */

input[type="checkbox"]:focus-visible + label::before,
input[type="radio"]:focus-visible + label::before {
Expand Down Expand Up @@ -360,13 +360,13 @@ select {
outline-width: 2px;
}

select:focus {
/* select:focus {
outline-style: solid;
}
} */

select:focus:not(:focus-visible) {
/* select:focus:not(:focus-visible) {
outline-style: none;
}
} */

select:focus-visible {
outline-style: solid;
Expand All @@ -389,13 +389,13 @@ textarea {
outline-width: 2px;
}

textarea:focus {
/* textarea:focus {
outline-style: solid;
}
} */

textarea:focus:not(:focus-visible) {
/* textarea:focus:not(:focus-visible) {
outline-style: none;
}
} */

textarea:focus-visible {
outline-style: solid;
Expand All @@ -414,13 +414,13 @@ textarea:disabled {
outline-width: 2px;
}

[tabindex]:focus {
/* [tabindex]:focus {
outline-style: solid;
}
} */

[tabindex]:focus:not(:focus-visible) {
/* [tabindex]:focus:not(:focus-visible) {
outline-style: none;
}
} */

[tabindex]:focus-visible {
outline-style: solid;
Expand All @@ -435,14 +435,14 @@ video[controls], audio[controls] {
outline-width: 2px;
}

video:focus[controls], audio:focus[controls] {
/* video:focus[controls], audio:focus[controls] {
outline-style: solid;
}
} */

video:focus:not(:focus-visible)[controls],
/* video:focus:not(:focus-visible)[controls],
audio:focus:not(:focus-visible)[controls] {
outline-style: none;
}
} */

video:focus-visible[controls], audio:focus-visible[controls] {
outline-style: solid;
Expand All @@ -469,9 +469,9 @@ video:not([href]), audio:not([href]) {
outline-style: solid;
}

[contenteditable]:not([contenteditable="false"]):focus:not(:focus-visible) {
/* [contenteditable]:not([contenteditable="false"]):focus:not(:focus-visible) {
outline-style: none;
}
} */

[contenteditable]:not([contenteditable="false"]):focus-visible {
outline-style: solid;
Expand All @@ -482,14 +482,14 @@ details, details > summary:first-of-type {
outline-width: 2px;
}

details:focus, details > summary:first-of-type:focus {
/* details:focus, details > summary:first-of-type:focus {
outline-style: solid;
}
} */

details:focus:not(:focus-visible),
/* details:focus:not(:focus-visible),
details > summary:first-of-type:focus:not(:focus-visible) {
outline-style: none;
}
} */

details:focus-visible, details > summary:first-of-type:focus-visible {
outline-style: solid;
Expand Down
6 changes: 6 additions & 0 deletions src/components/DsfrCheckbox/DsfrCheckbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,18 @@ export default defineComponent({
outline-offset: 2px;
outline-width: 2px;
@nest input:focus + label & {
outline-style: solid;
}
@nest input[type="checkbox"]:checked + label & {
outline-color: var(--focus);
background-color: var(--bf500);
color: var(--g100);
}
@nest input[type="checkbox"]:disabled + label & {
outline-color: var(--focus);
background-color: var(--g200);
border: 1px solid var(--g400);
cursor: not-allowed;
Expand Down
4 changes: 0 additions & 4 deletions src/components/DsfrRadioButton/DsfrRadioButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,6 @@ input[type="radio"]:checked + label::before {
border: 1px solid var(--bf500);
}
input[type="radio"]:focus:not(:focus-visible) + label::before {
outline-style: none;
}
input[type="radio"] {
position: absolute;
opacity: 0;
Expand Down
8 changes: 8 additions & 0 deletions src/components/DsfrTabs/DsfrTabItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
>
<button
:id="tabId"
ref="button"
:data-testid="`test-${tabId}`"
class="fr-tabs__tab"
:tabindex="selected ? 0 : -1"
Expand Down Expand Up @@ -50,5 +51,12 @@ export default {
emits: ['click', 'next', 'previous'],
watch: {
selected (newValue, oldValue) {
if (newValue) {
this.$refs.button.focus()
}
},
},
}
</script>
1 change: 1 addition & 0 deletions src/components/DsfrTabs/DsfrTabs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import { getRandomId } from '../../utils/random-utils.js'
import DsfrTabItem from './DsfrTabItem.vue'
import DsfrTabContent from './DsfrTabContent.vue'
export default {
name: 'DsfrTabs',
Expand Down

0 comments on commit 3ccdd5e

Please sign in to comment.