Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/polls.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/lint.yml49
-rw-r--r--src/js/App.vue1
-rw-r--r--src/js/components/Base/Counter.vue2
-rw-r--r--src/js/components/Base/OptionAddDate.vue3
-rw-r--r--src/js/components/Base/OptionItem.vue4
-rw-r--r--src/js/components/Base/ParticipantsList.vue1
-rw-r--r--src/js/components/PollList/PollItem.vue3
-rw-r--r--src/js/components/VoteTable/VoteTable.vue67
-rw-r--r--src/js/components/VoteTable/VoteTableVoteItem.vue1
9 files changed, 87 insertions, 44 deletions
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 00000000..d2bf8786
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,49 @@
+name: Lint
+
+on:
+ pull_request:
+ push:
+ branches:
+ - master
+ - stable*
+
+jobs:
+ node:
+ runs-on: ubuntu-latest
+
+ strategy:
+ matrix:
+ node-version: [12.x]
+
+ steps:
+ - uses: actions/checkout@v2
+ - name: Use node ${{ matrix.node-version }}
+ uses: actions/setup-node@v1
+ with:
+ node-version: ${{ matrix.node-version }}
+ - name: Install dependencies
+ run: npm ci
+ - name: ESLint
+ run: npm run lint
+
+ stylelint:
+ runs-on: ubuntu-latest
+
+ strategy:
+ matrix:
+ node-versions: [12.x]
+
+ name: stylelint node${{ matrix.node-versions }}
+ steps:
+ - uses: actions/checkout@v2
+
+ - name: Set up node ${{ matrix.node-versions }}
+ uses: actions/setup-node@v1
+ with:
+ node-versions: ${{ matrix.node-versions }}
+
+ - name: Install dependencies
+ run: npm ci
+
+ - name: Lint
+ run: npm run stylelint
diff --git a/src/js/App.vue b/src/js/App.vue
index c6bfcf2c..2e01d49a 100644
--- a/src/js/App.vue
+++ b/src/js/App.vue
@@ -127,6 +127,7 @@ export default {
--color-polls-foreground-filter-no: invert(43%) sepia(100%) saturate(1579%) hue-rotate(318deg) brightness(99%) contrast(94%);
--color-polls-foreground-filter-maybe: invert(81%) sepia(22%) saturate(3383%) hue-rotate(353deg) brightness(101%) contrast(101%);
}
+
.icon-polls {
background-image: var(--icon-polls);
}
diff --git a/src/js/components/Base/Counter.vue b/src/js/components/Base/Counter.vue
index 203f6aba..e263bb16 100644
--- a/src/js/components/Base/Counter.vue
+++ b/src/js/components/Base/Counter.vue
@@ -85,8 +85,8 @@ export default {
<style lang="scss">
.counter {
display: flex;
- // padding: 14px 0;
}
+
.counter--icon {
display: flex;
justify-content: center;
diff --git a/src/js/components/Base/OptionAddDate.vue b/src/js/components/Base/OptionAddDate.vue
index 98489fbf..dc386c6f 100644
--- a/src/js/components/Base/OptionAddDate.vue
+++ b/src/js/components/Base/OptionAddDate.vue
@@ -80,6 +80,3 @@ export default {
}
</script>
-
-<style lang="scss" scoped>
-</style>
diff --git a/src/js/components/Base/OptionItem.vue b/src/js/components/Base/OptionItem.vue
index 047aaaf1..da4639e7 100644
--- a/src/js/components/Base/OptionItem.vue
+++ b/src/js/components/Base/OptionItem.vue
@@ -132,10 +132,6 @@ export default {
padding-right: 4px;
}
- .option-item__option--datebox {
- display: flex;
- }
-
.option-item__option--text {
overflow: hidden;
text-overflow: ellipsis;
diff --git a/src/js/components/Base/ParticipantsList.vue b/src/js/components/Base/ParticipantsList.vue
index 2e901b3f..dafbadd4 100644
--- a/src/js/components/Base/ParticipantsList.vue
+++ b/src/js/components/Base/ParticipantsList.vue
@@ -55,6 +55,7 @@ export default {
.participants-list {
padding: 8px;
}
+
.participants-list__list {
display: flex;
justify-content: flex-start;
diff --git a/src/js/components/PollList/PollItem.vue b/src/js/components/PollList/PollItem.vue
index 9864f307..b5627e1b 100644
--- a/src/js/components/PollList/PollItem.vue
+++ b/src/js/components/PollList/PollItem.vue
@@ -246,6 +246,7 @@ export default {
width: 44px;
min-width: 44px;
}
+
.item__title {
display: flex;
flex-direction: column;
@@ -261,6 +262,7 @@ export default {
.item__access {
width: 80px;
}
+
.item__owner {
width: 230px;
}
@@ -319,6 +321,7 @@ export default {
.item__type--textPoll {
background-image: var(--icon-toggle-filelist-000);
}
+
.item__type--datePoll {
background-image: var(--icon-calendar-000);
}
diff --git a/src/js/components/VoteTable/VoteTable.vue b/src/js/components/VoteTable/VoteTable.vue
index 7575bb83..7fe1d3dc 100644
--- a/src/js/components/VoteTable/VoteTable.vue
+++ b/src/js/components/VoteTable/VoteTable.vue
@@ -213,12 +213,18 @@ export default {
.vote-table.mobile {
grid-template-columns: auto 1fr;
grid-template-rows: auto;
- grid-template-areas: "vote header";
+ grid-template-areas: 'vote header';
justify-items: stretch;
.vote-table__header {
grid-area: header;
flex-direction: column;
+
+ > div.confirmed {
+ border-left: none !important;
+ border-bottom-left-radius: 0;
+ border-top-left-radius: 0;
+ }
}
.vote-table__votes {
@@ -252,14 +258,6 @@ export default {
}
}
- .vote-table__header {
- > div.confirmed {
- border-left: none !important;
- border-bottom-left-radius: 0;
- border-top-left-radius: 0;
- }
- }
-
.vote-table__vote-row {
> div.confirmed {
border-right: none !important;
@@ -274,19 +272,26 @@ export default {
grid-template-columns: auto repeat(var(--polls-vote-columns), 1fr);
grid-template-rows: auto repeat(var(--polls-vote-rows), 1fr) auto;
grid-template-areas:
- "blind1 options"
- "users vote"
- "blind2 footer";
+ 'blind1 options'
+ 'users vote'
+ 'blind2 footer';
justify-items: stretch;
padding-bottom: 14px; // leave space for the scrollbar!
.vote-table__header {
grid-area: options;
flex-direction: row;
+
> div {
flex-direction: column;
flex: 1;
align-items: center;
+
+ &.confirmed {
+ border-bottom: none !important;
+ border-bottom-left-radius: 0;
+ border-bottom-right-radius: 0;
+ }
}
}
@@ -317,10 +322,17 @@ export default {
.vote-table__footer {
grid-area: footer;
flex-direction: row;
+
> div {
display: flex;
align-items: center;
justify-content: center;
+
+ &.confirmed {
+ border-top: none !important;
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+ }
}
}
@@ -343,9 +355,16 @@ export default {
flex-direction: row;
order: 1;
flex: 1;
+
&.currentuser {
order: 0;
}
+
+ > div.confirmed {
+ border-top: none !important;
+ border-bottom: none !important;
+ border-radius: 0;
+ }
}
.vote-table-vote-item {
@@ -369,30 +388,6 @@ export default {
// divergent styles for confirmed optins in table layout
- .vote-table__header {
- > div.confirmed {
- border-bottom: none !important;
- border-bottom-left-radius: 0;
- border-bottom-right-radius: 0;
- }
- }
-
- .vote-table__vote-row {
- > div.confirmed {
- border-top: none !important;
- border-bottom: none !important;
- border-radius: 0;
- }
- }
-
- .vote-table__footer {
- > div.confirmed {
- border-top: none !important;
- border-top-left-radius: 0;
- border-top-right-radius: 0;
- }
- }
-
.option-item {
.option-item__option--text {
hyphens: auto;
diff --git a/src/js/components/VoteTable/VoteTableVoteItem.vue b/src/js/components/VoteTable/VoteTableVoteItem.vue
index 7719ea7c..25ac0e3e 100644
--- a/src/js/components/VoteTable/VoteTableVoteItem.vue
+++ b/src/js/components/VoteTable/VoteTableVoteItem.vue
@@ -128,6 +128,7 @@ export default {
}
}
}
+
.vote-table-vote-item.confirmed:not(.yes):not(.maybe) .icon {
background-image: var(--icon-polls-no);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-27 00:16:23 +0300