Skip to content

Commit

Permalink
Fix style lint rule violations
Browse files Browse the repository at this point in the history
Bug: T348449
Change-Id: I3d57ee3290d428ed6272f3102581745690f63aa3
  • Loading branch information
itamargiv committed Jul 11, 2024
1 parent 5abd4c3 commit 056b3ae
Show file tree
Hide file tree
Showing 15 changed files with 23 additions and 21 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"test:integration": "jest -c jest.config.integration.js",
"test:lint": "eslint --no-fix --max-warnings 0 --ignore-path .gitignore .",
"test": "npm-run-all test:* && vite build",
"disabled:test:lintcss": "stylelint '**/*.{vue,scss}'",
"test:lintcss": "stylelint '**/*.{vue,scss}'",
"test:a11y": "jest --testMatch=\"**/tests/a11y/**\"",
"test:cy": "env $(grep -v '^#' .env.example | xargs) start-server-and-test serve http-get://localhost:8080 cypress",
"fix:css": "stylelint '**/*.{vue,scss}' --fix",
Expand Down
2 changes: 1 addition & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export default defineComponent( {
</script>

<style lang="scss">
@import "ress";
@import 'ress';
@import './styles/custom-variables.css';
@import 'wikit-dist/wikit-vue-components-vue3compat.css';
@import './styles/typography';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export default defineComponent( {
</script>

<style lang="scss">
@import "@wikimedia/codex-design-tokens/theme-wikimedia-ui";
@import '@wikimedia/codex-design-tokens/theme-wikimedia-ui';
@import '../styles/typography';
$tinyViewportWidth: 38em;
Expand Down
2 changes: 1 addition & 1 deletion src/components/InfoTooltip.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default defineComponent( {
</script>

<style lang="scss">
@import "@wikimedia/codex-design-tokens/theme-wikimedia-ui";
@import '@wikimedia/codex-design-tokens/theme-wikimedia-ui';
.querybuilder-tooltip {
& .wikit-Popover__target .cdx-button.cdx-button--action-default {
Expand Down
2 changes: 1 addition & 1 deletion src/components/LanguageSelector.vue
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export default defineComponent( {
</script>

<style lang="scss">
@import "@wikimedia/codex-design-tokens/theme-wikimedia-ui";
@import '@wikimedia/codex-design-tokens/theme-wikimedia-ui';
$tinyViewportWidth: 38em;
Expand Down
7 changes: 3 additions & 4 deletions src/components/LanguageSelectorInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export default defineComponent( {
</script>

<style lang="scss">
@import "@wikimedia/codex-design-tokens/theme-wikimedia-ui";
@import '@wikimedia/codex-design-tokens/theme-wikimedia-ui';
.languageSelector__input {
color: $color-base;
Expand Down Expand Up @@ -122,8 +122,8 @@ export default defineComponent( {
}
&-left-side {
display:flex;
flex-grow:1;
display: flex;
flex-grow: 1;
}
&__search-icon {
Expand All @@ -140,6 +140,5 @@ export default defineComponent( {
visibility: visible;
}
}
}
</style>
9 changes: 6 additions & 3 deletions src/components/LanguageSelectorOptionsMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export default defineComponent( {
</script>

<style lang="scss">
@import "@wikimedia/codex-design-tokens/theme-wikimedia-ui";
@import '@wikimedia/codex-design-tokens/theme-wikimedia-ui';
$base: '.languageSelector__options-menu';
$tinyViewportWidth: 38em;
Expand Down Expand Up @@ -119,12 +119,15 @@ $tinyViewportWidth: 38em;
transition-duration: 100ms;
transition-timing-function: ease;
&:hover, &:active, &.highlight {
&:hover,
&:active,
&.highlight {
background-color: $background-color-interactive;
cursor: pointer;
}
&--selected, &--selected:hover {
&--selected,
&--selected:hover {
background-color: $background-color-interactive;
}
}
Expand Down
1 change: 0 additions & 1 deletion src/components/Limit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ export default defineComponent( {
</script>

<style lang="scss">
.querybuilder-limit {
display: flex;
align-items: flex-start;
Expand Down
4 changes: 2 additions & 2 deletions src/components/QueryBuilder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -421,12 +421,12 @@ a {
justify-content: space-between;
.querybuilder__logo {
background-image: url( '/img/QB_Logo.svg' );
background-image: url('/img/QB_Logo.svg');
inline-size: 360px;
block-size: 24px;
@media (max-width: $tinyViewportWidth) {
background-image: url( '/img/QB_Logo_Mobile.svg' );
background-image: url('/img/QB_Logo_Mobile.svg');
inline-size: 239px;
block-size: 24px;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/QueryCondition.vue
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ export default defineComponent( {
</script>

<style scoped lang="scss">
@import "@wikimedia/codex-design-tokens/theme-wikimedia-ui";
@import '@wikimedia/codex-design-tokens/theme-wikimedia-ui';
$tinyViewportWidth: 38em; // Set so that inputs show all below each other in the smallest layout
Expand Down
2 changes: 1 addition & 1 deletion src/components/SharableLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export default defineComponent( {
</script>

<style scoped lang="scss">
@import "@wikimedia/codex-design-tokens/theme-wikimedia-ui";
@import '@wikimedia/codex-design-tokens/theme-wikimedia-ui';
@import '../styles/typography';
$tinyViewportWidth: 36em;
Expand Down
3 changes: 2 additions & 1 deletion src/styles/_links.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
outline-color: gray;
}

&:hover, &:active {
&:hover,
&:active {
text-decoration: underline;
}
}
Expand Down
1 change: 0 additions & 1 deletion src/styles/noscript.scss
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,3 @@ main.no-script {
justify-content: center;
}
}

2 changes: 1 addition & 1 deletion src/styles/typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
color: $color-base;
}

@mixin ui-text-m($font-weight: $font-weight-normal){
@mixin ui-text-m($font-weight: $font-weight-normal) {
font-family: $font-family-system-sans;
font-size: $font-size-medium;
font-weight: $font-weight;
Expand Down
3 changes: 2 additions & 1 deletion stylelint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ module.exports = {
'@stylistic/stylelint-plugin',
],
rules: {
indentation: 'tab',
'@stylistic/indentation': 'tab',
'@stylistic/string-quotes': 'single',
'csstools/use-logical': 'always',
// CSS Logical Properties do not support the shorthand 'margin' and 'padding' yet
// TODO: Re-enable property-disallowed-list
Expand Down

0 comments on commit 056b3ae

Please sign in to comment.