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

[Vue Rewrite] Fix CI Jobs #1816

Merged
merged 19 commits into from
Jun 9, 2022
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
7 changes: 6 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
module.exports = {
extends: [
'@nextcloud',
]
],
rules: {
'jsdoc/check-alignment': 'off',
'vue/html-indent': 'off',
'indent': ['error', 4]
},
}
10 changes: 5 additions & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
node-versions: [12.x]
node-version: [16.x]

name: eslint node${{ matrix.node-versions }}
steps:
Expand All @@ -21,7 +21,7 @@ jobs:
- name: Set up node ${{ matrix.node-versions }}
uses: actions/setup-node@v1
with:
node-versions: ${{ matrix.node-versions }}
node-version: ${{ matrix.node-versions }}

- name: Install dependencies
run: npm ci
Expand All @@ -34,7 +34,7 @@ jobs:

strategy:
matrix:
node-versions: [12.x]
node-version: [16.x]

name: stylelint node${{ matrix.node-versions }}
steps:
Expand All @@ -43,10 +43,10 @@ jobs:
- name: Set up node ${{ matrix.node-versions }}
uses: actions/setup-node@v1
with:
node-versions: ${{ matrix.node-versions }}
node-version: ${{ matrix.node-versions }}

- name: Install dependencies
run: npm ci

- name: Lint
run: npm run stylelint
run: npm run stylelint
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
The format is mostly based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), older entries don't fully match.

# Unreleased
## [19.x.x]
### Changed
- Vue Rewrite

## [18.x.x]
### Changed
- Add routes for starring/unstarring items by id
Expand Down
66 changes: 33 additions & 33 deletions css/explore.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,37 +21,37 @@
width: 100%;
padding: 45px 0 45px 45px;

.grid-item {
width: 300px;
border: 2px solid var(--color-border);
border-radius: var(--border-radius-large);
margin: 0 24px 24px 0;
padding: 24px;

.explore-title {
background-repeat: no-repeat;
background-position: 0 center;
background-size: 24px;
padding-left: 32px;

a {
word-wrap: break-word;

&:hover,
&:focus {
text-decoration: underline;
}
}
}

.explore-logo {
text-align: center;
margin-top: 25px;

img {
width: 100%;
}
}

}
.grid-item {
width: 300px;
border: 2px solid var(--color-border);
border-radius: var(--border-radius-large);
margin: 0 24px 24px 0;
padding: 24px;

.explore-title {
background-repeat: no-repeat;
background-position: 0 center;
background-size: 24px;
padding-left: 32px;

a {
word-wrap: break-word;

&:hover,
&:focus {
text-decoration: underline;
}
}
}

.explore-logo {
text-align: center;
margin-top: 25px;

img {
width: 100%;
}
}

}
}
25 changes: 10 additions & 15 deletions css/navigation.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/**
* Nextcloud - News
*
Expand Down Expand Up @@ -32,7 +31,6 @@
background-position: 14px center;
}


/* navigation */
#app-navigation ul.with-icon > li > a,
#app-navigation ul.with-icon > li > ul > li > a {
Expand Down Expand Up @@ -63,7 +61,6 @@
background-image: url('../img/twitter.svg') !important;
}


.col-4 {
-ms-flex: 0 0 33.333333%;
flex: 0 0 33.333333%;
Expand All @@ -79,7 +76,7 @@
flex-wrap: wrap;
}

.icon-dropdown{
.icon-dropdown {
background-position: center !important;
background-size: 24px;
padding: 2em !important;
Expand All @@ -90,14 +87,13 @@
.icon-full-text-enabled {
background-image: url('../img/fulltext.svg');
background-size: 50%;
opacity: .5;
opacity: 0.5;
}


.icon-full-text-disabled {
background-image: url('../img/nonfulltext.svg');
background-size: 50%;
opacity: .5;
opacity: 0.5;
}

#app-navigation .unread > a {
Expand Down Expand Up @@ -135,10 +131,10 @@
white-space: nowrap;
}

#app-navigation .error-message:hover .title
#app-navigation .error-message:hover .message {
// #app-navigation .error-message:hover .title
// #app-navigation .error-message:hover .message {

}
// }

#app-navigation .error-message button {
top: 0;
Expand All @@ -154,7 +150,7 @@
background-image: url('../img/close.svg');
background-repeat: no-repeat;
background-position: right 5px top 5px;
opacity: .9;
opacity: 0.9;
}

#app-navigation .error-message button:hover {
Expand All @@ -170,7 +166,7 @@

#app-navigation .animate-show.ng-hide-add-active,
#app-navigation .animate-show.ng-hide-remove-active {
transition: .2s linear opacity;
transition: 0.2s linear opacity;
}

#app-navigation .animate-show {
Expand All @@ -189,8 +185,8 @@
transform: rotate(180deg);
}

#app-navigation .feed-normal-ordering {
}
// #app-navigation .feed-normal-ordering {
// }

#app-navigation .icon-pinned {
background-image: url('../img/pinned.svg');
Expand All @@ -211,4 +207,3 @@
#app-navigation .updateerror a {
background-color: var(--color-warning) !important;
}

2 changes: 1 addition & 1 deletion css/settings.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
padding-left: 18px;
}

#app-settings-content label input[type="checkbox"] {
#app-settings-content label input[type='checkbox'] {
margin-left: -18px;
max-width: 16px;
}
Expand Down
4 changes: 2 additions & 2 deletions css/shortcuts.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#app-shortcuts {
}
// #app-shortcuts {
// }

#app-shortcuts table {
border-collapse: collapse;
Expand Down
Loading