Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: correctly run stylelint to support unix #14171

Merged
merged 2 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"test:coverage": "jest --coverage",
"lint": "eslint --ext .js,.ts,.vue src",
"lint:fix": "eslint --ext .js,.ts,.vue src --fix",
"stylelint": "stylelint css/*.css css/*.scss src/**/*.scss src/**/*.vue",
"stylelint:fix": "stylelint css/*.css css/*.scss src/**/*.scss src/**/*.vue --fix",
"stylelint": "stylelint \"css/*.css\" \"css/*.scss\" \"src/**/*.scss\" \"src/**/*.vue\"",
"stylelint:fix": "stylelint \"css/*.css\" \"css/*.scss\" \"src/**/*.scss\" \"src/**/*.vue\" --fix",
"analyze": "npm run analyze:stats && npm run analyze:serve",
"analyze:stats": "npm run build -- --json js/stats.json",
"analyze:serve": "webpack-bundle-analyzer js/stats.json js/",
Expand Down
1 change: 1 addition & 0 deletions src/PublicShareSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ body .modal-wrapper * {
footer {
transition: width var(--animation-quick);
}

#content-vue:has(#talk-sidebar) ~ footer {
width: calc(100% - 2 * var(--body-container-margin) - clamp(300px, 27vw, 500px));
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -169,13 +169,13 @@ export default {

&__number-input {
display: block;
margin-bottom: calc(var(--default-grid-baseline)*4);
margin-bottom: calc(var(--default-grid-baseline) * 4);
}

&__caption {
font-weight: bold;
display: block;
margin: calc(var(--default-grid-baseline)*3) 0 calc(var(--default-grid-baseline)*2) 0;
margin: calc(var(--default-grid-baseline) * 3) 0 calc(var(--default-grid-baseline) * 2) 0;
}

&__error-hint {
Expand Down
1 change: 0 additions & 1 deletion src/components/CallView/Grid/Grid.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1011,7 +1011,6 @@ export default {
outline: 1px solid #00FF41;
color: #00FF41;
}

position: relative;

img {
Expand Down
4 changes: 0 additions & 4 deletions src/components/ConversationSettings/BasicInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,3 @@ export default {
},
}
</script>

<style lang="scss" scoped>

</style>
3 changes: 0 additions & 3 deletions src/components/ConversationSettings/ExpirationSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,3 @@ export default {
},
}
</script>

<style lang="scss" scoped>
</style>
3 changes: 0 additions & 3 deletions src/components/ConversationSettings/MentionsSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,3 @@ export default {

}
</script>

<style lang="scss" scoped>
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,3 @@ export default {
},
}
</script>

<style lang="scss" scoped>
</style>
4 changes: 3 additions & 1 deletion src/components/MediaSettings/MediaDevicesSpeakerTest.vue
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ export default {
</script>

<style lang="scss" scoped>
@use 'sass:math';

.media-devices-checker {
display: flex;
gap: var(--default-grid-baseline);
Expand Down Expand Up @@ -117,7 +119,7 @@ export default {

@keyframes equalizer {
@for $i from 0 through 15 {
#{4*$i}% { height: random(70) + 20%; }
#{4 * $i}% { height: math.random(70) + 20%; }
}
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,3 @@ export default {
},
}
</script>

<style lang="scss" scoped>
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,6 @@ export default {
.reactions-wrapper {
--minimal-button-width: 48px;
--font-family-emoji: 'Segoe UI Emoji', 'Segoe UI Symbol', 'Segoe UI', 'Apple Color Emoji', 'Twemoji Mozilla', 'Noto Color Emoji', 'EmojiOne Color', 'Android Emoji';

display: flex;
flex-wrap: wrap;
gap: var(--default-grid-baseline);
Expand Down
1 change: 0 additions & 1 deletion src/components/NewMessage/NewMessage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -990,7 +990,6 @@ export default {
.new-message-form {
--emoji-button-size: calc(var(--default-clickable-area) - var(--border-width-input-focused, 2px) * 2);
--emoji-button-radius: calc(var(--border-radius-element, calc(var(--button-size) / 2)) - var(--border-width-input-focused, 2px));

align-items: flex-end;
display: flex;
gap: var(--default-grid-baseline);
Expand Down
2 changes: 1 addition & 1 deletion src/components/NewMessage/NewMessageTemplatePreview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ export default {
&__title {
overflow: hidden;
// also count preview border
max-width: calc(var(--width) + 2*2px);
max-width: calc(var(--width) + 2 * 2px);
padding: var(--margin);
white-space: nowrap;
text-overflow: ellipsis;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ export default {

<style lang="scss" scoped>
.breakout-room-item {
margin-top: calc(var(--default-grid-baseline)*5);
margin-top: calc(var(--default-grid-baseline) * 5);
font-weight: bold;

&__wrapper {
Expand Down
2 changes: 2 additions & 0 deletions src/components/TopBar/CallTime.vue
Original file line number Diff line number Diff line change
Expand Up @@ -226,10 +226,12 @@ export default {
.solid {
margin: 0;
}

.call-duration-hint {
display: flex;
padding: calc(var(--default-grid-baseline) * 2);
}

.call-time {
display: flex;
justify-content: center;
Expand Down
1 change: 0 additions & 1 deletion src/components/TopBar/TopBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,6 @@ export default {
<style lang="scss" scoped>
.top-bar {
--border-width: 1px;

display: flex;
flex-wrap: wrap;
gap: 3px;
Expand Down
3 changes: 0 additions & 3 deletions src/components/UIShared/ContactSelectionBubble.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,3 @@ const removeLabel = computed(() => t('spreed', 'Remove participant {name}', { na
</template>
</NcChip>
</template>

<style lang="scss" scoped>
</style>
2 changes: 1 addition & 1 deletion stylelint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const stylelintConfig = require('@nextcloud/stylelint-config')

stylelintConfig.rules['at-rule-no-unknown'] = [
true, {
ignoreAtRules: ['include', 'mixin', 'use'],
ignoreAtRules: ['include', 'mixin', 'use', 'for'],
},
]

Expand Down
Loading