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.

Sign up for GitHub

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

Make use of stylelint in vue files and update @nextcloud/stylelint-config to 3.0.1 #3070

Merged
merged 2 commits into from
Jan 28, 2025
Merged

Make use of stylelint in vue files and update @nextcloud/stylelint-config to 3.0.1 #3070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70fdf45
fix: use stylelint for scoped css included in vue files and move old …
wofferl Jan 27, 2025
820fb87
deps-dev: update @nextcloud/stylelint-config to 3.0.1
wofferl Jan 27, 2025
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
0 css/admin.scss → css-old/admin.scss
View file
Open in desktop
File renamed without changes.
0 css/app.scss → css-old/app.scss
View file
Open in desktop
File renamed without changes.
0 css/custom.css → css-old/custom.css
View file
Open in desktop
File renamed without changes.
0 css/explore.css → css-old/explore.css
View file
Open in desktop
File renamed without changes.
0 css/explore.scss → css-old/explore.scss
View file
Open in desktop
File renamed without changes.
0 css/merged.scss → css-old/merged.scss
View file
Open in desktop
File renamed without changes.
0 css/mobile.css → css-old/mobile.css
View file
Open in desktop
File renamed without changes.
0 css/navigation.scss → css-old/navigation.scss
View file
Open in desktop
File renamed without changes.
0 css/settings.css → css-old/settings.css
View file
Open in desktop
File renamed without changes.
0 css/shortcuts.css → css-old/shortcuts.css
View file
Open in desktop
File renamed without changes.
1,051 changes: 330 additions & 721 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"watch": "NODE_ENV=development webpack --progress --watch --config webpack.js",
"lint": "eslint --ext .js,.vue,.ts src",
"lint:fix": "eslint --ext .js,.vue,.ts src --fix",
"stylelint": "stylelint **/*.css **/*.scss **/*.vue",
"stylelint:fix": "stylelint **/*.css **/*.scss **/*.vue --fix",
"stylelint": "stylelint 'css/*.css' 'css/*.scss' 'src/**/*.scss' 'src/**/*.vue'",
"stylelint:fix": "stylelint 'css/*.css' 'css/*.scss' 'src/**/*.scss' 'src/**/*.vue' --fix",
"test": "jest --verbose",
"serve": "webpack --node-env development serve --progress",
"sass": "sass css",
Expand Down Expand Up @@ -67,7 +67,7 @@
"@nextcloud/babel-config": "^1.2.0",
"@nextcloud/browserslist-config": "^3.0.1",
"@nextcloud/eslint-config": "^8.4.1",
"@nextcloud/stylelint-config": "^2.1.2",
"@nextcloud/stylelint-config": "^3.0.1",
"@nextcloud/webpack-vue-config": "^6.2.0",
"@types/jest": "^29.5.14",
"@types/lodash": "^4.17.14",
Expand Down
6 changes: 3 additions & 3 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ export default Vue.extend({

#warning-box {
position: absolute;
right: 35px;
right: 35px;
top: 15px;
z-index: 5000;
z-index: 5000;
padding: 5px 10px;
background-color: var(--color-main-background);
color: var(--color-main-text);
Expand Down Expand Up @@ -131,7 +131,7 @@ export default Vue.extend({
.podcast audio {
flex-grow: 1;
background-color: rgba(0,0,0,0);
height: 40px;
height: 40px;
}

.podcast .podcast-download {
Expand Down
1 change: 1 addition & 0 deletions src/components/AddFeed.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ export default Vue.extend({
.invalid {
border: 1px solid rgb(251, 72, 72) !important;
}

.error {
color: rgb(251, 72, 72);
padding: 10px;
Expand Down
10 changes: 5 additions & 5 deletions src/components/ShareItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,23 +138,23 @@ export default Vue.extend({

<style>
#share-item .user-bubble__content * {
cursor: pointer;
cursor: pointer;
}

#share-item fieldset {
padding: 16px;
padding: 16px;
}

#share-item input {
width: 90%;
width: 90%;
}

#share-item .user-bubble-container {
margin: 10px;
margin: 10px;
}

#share-item .user-bubble__wrapper {
margin: 5px 10px;
margin: 5px 10px;
}

</style>
24 changes: 12 additions & 12 deletions src/components/Sidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,38 +727,38 @@ export default Vue.extend({

<style scoped>
.button-container {
display: flex;
width: 100%;
display: flex;
width: 100%;
}

.button-container button {
flex: 1;
flex: 1;
}

.select-container {
display: flex;
align-items: center;
display: flex;
align-items: center;
}

.select-container select {
min-width: 140px;
text-overflow: ellipsis;
margin-left: auto;
min-width: 140px;
text-overflow: ellipsis;
margin-left: auto;
}

.settings-button {
padding: 2px;
padding: 2px;
}

.new-folder-container {
padding: calc(var(--default-grid-baseline, 4px)* 2);
padding: calc(var(--default-grid-baseline, 4px) * 2);
}

/*
* workaround remove extra scroll bar in navigation body
*/
:deep(.app-navigation__body) {
overflow-y: unset !important;
flex: 1 0 auto;
overflow-y: unset !important;
flex: 1 0 auto;
}
</style>
10 changes: 5 additions & 5 deletions src/components/feed-display/FeedItemDisplay.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ export default Vue.extend({

.article .body {
color: var(--color-main-text);
font-size: 15px;
font-size: 15px;
}

.article a {
Expand Down Expand Up @@ -352,13 +352,13 @@ export default Vue.extend({

.article .subtitle {
color: var(--color-text-lighter);
font-size: 15px;
padding: 25px 0;
font-size: 15px;
padding: 25px 0;
}

.article .author {
color: var(--color-text-lighter);
font-size: 15px;
font-size: 15px;
}

.article img {
Expand All @@ -368,7 +368,7 @@ export default Vue.extend({

.article h1 {
font-weight: bold;
font-size: 17px;
font-size: 17px;
}

.article table {
Expand Down
2 changes: 1 addition & 1 deletion src/components/feed-display/FeedItemRow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ export default Vue.extend({
display: flex; padding: 4px 4px !important;
border-bottom: 1px solid var(--color-border);
}

.feed-item-row.compact a.external {
line-height: 0;
}
Expand Down Expand Up @@ -248,7 +249,6 @@ export default Vue.extend({
.feed-item-row .main-container {
flex-grow: 1;
min-width: 0;
flex-grow: 1;
}

.feed-item-row .main-container.compact {
Expand Down
9 changes: 1 addition & 8 deletions src/components/feed-display/ItemSkeleton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
-->

<template>
<div class="item-skeleton">
<div>
<div class="item__labels" />
<div class="item__actions" />
</div>
Expand All @@ -23,10 +23,3 @@ export default Vue.extend({
},
})
</script>

<style>
.item-skeleton {
background: 'var(--color-placeholder-dark)';
height: '45px';
}
</style>
11 changes: 6 additions & 5 deletions src/components/feed-display/VirtualScroll.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,11 +204,12 @@ export default Vue.extend({
position: relative;
overflow-y: scroll;
}

.container-window::after {
content: '';
display: block;
/* Subtract the height of the Nextcloud and Feed header. */
height: calc(100vh - 50px - 54px);
background-repeat: no-repeat;
content: '';
display: block;
/* Subtract the height of the Nextcloud and Feed header. */
height: calc(100vh - 50px - 54px);
background-repeat: no-repeat;
}
</style>
58 changes: 29 additions & 29 deletions src/components/routes/Explore.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ export default ExploreComponent

<style scoped>
#explore {
height: 100%;
width: 100%;
padding: 45px 0 45px 45px;
display: flex;
justify-items: center;
height: 100%;
width: 100%;
padding: 45px 0 45px 45px;
display: flex;
justify-items: center;
}

#explore .grid-container {
Expand All @@ -126,57 +126,57 @@ export default ExploreComponent
}

#explore .grid-item {
width: 300px;
border: 2px solid var(--color-border);
border-radius: var(--border-radius-large);
margin: 0 24px 24px 0;
padding: 24px;
flex-grow: 1;
max-width: calc(50% - 24px);
display: flex;
flex-direction: column;
width: 300px;
border: 2px solid var(--color-border);
border-radius: var(--border-radius-large);
margin: 0 24px 24px 0;
padding: 24px;
flex-grow: 1;
max-width: calc(50% - 24px);
display: flex;
flex-direction: column;
}

#explore .grid-item .explore-title {
background-repeat: no-repeat;
background-position: 0 center;
background-size: 24px;
background-repeat: no-repeat;
background-position: 0 center;
background-size: 24px;
}

#explore .grid-item .explore-title.icon {
padding-left: 32px;
}

#explore .grid-item .explore-title a {
word-wrap: break-word;
word-wrap: break-word;
}

#explore .grid-item .explore-title a:hover,
#explore .grid-item .explore-title a:focus {
text-decoration: underline;
text-decoration: underline;
}

#explore .grid-item .explore-logo {
text-align: center;
margin-top: 25px;
text-align: center;
margin-top: 25px;
}

#explore .grid-item .explore-logo img {
width: 100%;
width: 100%;
}

#explore .grid-item .explore-subscribe {
margin-top: 16px;
max-width: 100%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
margin-top: 16px;
max-width: 100%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}

#explore .grid-item .explore-content {
justify-content: center;
display: flex;
flex-direction: column;
display: flex;
flex-direction: column;
margin-bottom: 10px;
}
</style>
3 changes: 0 additions & 3 deletions stylelint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
const stylelintConfig = require('@nextcloud/stylelint-config')

stylelintConfig.rules.indentation = 4
stylelintConfig.ignoreFiles.push('**/*.vue')

module.exports = stylelintConfig