forked from FreeTubeApp/FreeTube
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'development' into feature/playlist-2023-05
* development: (65 commits) Make constants imported from @fortawesome/free-solid-svg-icons ordered by name again (FreeTubeApp#3958) Replace labeler workflow with GH labeler (FreeTubeApp#3966) Fix HTML styling (e.g., hashtag links) showing up as raw HTML in descriptions (FreeTubeApp#3946) Make certain controls non-selectable / non-draggable - Part II (FreeTubeApp#3957) Translated using Weblate (German) Show video list buttons on hover or focus (FreeTubeApp#3954) Bump @babel/eslint-parser from 7.22.10 to 7.22.11 (FreeTubeApp#3962) Bump youtubei.js from 6.0.0 to 6.1.0 (FreeTubeApp#3965) Bump eslint-plugin-n from 16.0.1 to 16.0.2 (FreeTubeApp#3964) Bump eslint from 8.47.0 to 8.48.0 (FreeTubeApp#3963) Bump marked from 7.0.4 to 7.0.5 (FreeTubeApp#3961) Bump @babel/core from 7.22.10 to 7.22.11 (FreeTubeApp#3959) Make certain controls non-selectable / non-draggable (FreeTubeApp#3947) Add updated video resolution to auto selector (FreeTubeApp#3935) Fix Save icon blocking issue (FreeTubeApp#3951) * Update URL parser to recognize youtube.com/live/xxxxxxx (FreeTubeApp#3930) Translated using Weblate (Czech) Translated using Weblate (Portuguese) Translated using Weblate (Polish) Translated using Weblate (Arabic) ... # Conflicts: # src/renderer/main.js # src/renderer/scss-partials/_ft-list-item.scss
- Loading branch information
Showing
61 changed files
with
789 additions
and
429 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
'B: visual': | ||
- '(visual bug)' | ||
|
||
'B: Unofficial Download': | ||
- '(AUR|Chocolatey|FreeTubeCordova|PortableApps|winget|Scoop|Snapcraft|MPR|Nix)' | ||
|
||
'B: keyboard control': | ||
- '(keyboard control not working)' | ||
|
||
'B: text/string': | ||
- '(text/string issue)' | ||
|
||
'B: content not loading': | ||
- '(content not loading)' | ||
|
||
'B: accessibility': | ||
- '(accessibility issue)' | ||
|
||
'B: usability': | ||
- '(usability issue)' | ||
|
||
'B: crash': | ||
- '(causes crash)' | ||
|
||
'B: feature stopped working': | ||
- '(feature stopped working)' | ||
|
||
'B: inconsistent behavior': | ||
- '(inconsistent behavior)' | ||
|
||
'B: data loss': | ||
- '(data loss)' | ||
|
||
'B: race condition': | ||
- '(race condition)' | ||
|
||
'B: API issue': | ||
- '(API issue)' | ||
|
||
'B: developer mode': | ||
- '(only happens in developer mode)' | ||
|
||
'E: improvement existing feature': | ||
- '(improvement to existing feature)' | ||
|
||
'E: new optional setting': | ||
- '(new optional setting)' | ||
|
||
'E: visual improvement': | ||
- '(visual improvement)' | ||
|
||
'E: display more information': | ||
- '(display more information to user)' | ||
|
||
'E: ease of use improvement': | ||
- '(ease of use improvement)' | ||
|
||
'E: support external software': | ||
- '(support for external software)' | ||
|
||
'E: new feature': | ||
- '(new feature)' | ||
|
||
'E: keyboard shortcut': | ||
- '(new keyboard shortcut)' |
File renamed without changes.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
name: "Issue Labeler" | ||
on: | ||
issues: | ||
types: [opened] | ||
|
||
permissions: | ||
issues: write | ||
contents: read | ||
|
||
jobs: | ||
triage: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: github/issue-labeler@v3.2 | ||
with: | ||
configuration-path: .github/issue-labeler.yml | ||
enable-versioned-regex: 0 | ||
repo-token: ${{ secrets.GITHUB_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,6 +26,8 @@ | |
|
||
.flexBox { | ||
display: block; | ||
user-select: unset; | ||
-webkit-user-select: unset; | ||
} | ||
|
||
#changeLogText { | ||
|
57 changes: 57 additions & 0 deletions
57
src/renderer/components/ft-community-poll/ft-community-poll.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
.vote-count { | ||
padding-bottom: 6px; | ||
font-size: smaller; | ||
} | ||
|
||
.empty-circle { | ||
background-color: transparent; | ||
border-radius: 50%; | ||
border-style: solid; | ||
border-width: 2px; | ||
display: block; | ||
float: left; | ||
height: 10px; | ||
left: 5px; | ||
position: relative; | ||
top: 8px; | ||
width: 10px; | ||
} | ||
|
||
.filled-circle { | ||
border-radius: 50%; | ||
background-color: black; | ||
float: left; | ||
height: 6px; | ||
left: 2px; | ||
top: 2px; | ||
position: relative; | ||
width: 6px; | ||
} | ||
|
||
.option-text { | ||
border-radius: 5px; | ||
border-style: solid; | ||
border-width: 2px; | ||
padding: 5px 25px; | ||
} | ||
|
||
.option { | ||
padding-bottom: 10px; | ||
} | ||
|
||
.correct-option { | ||
background-color: #78da71; | ||
} | ||
|
||
.incorrect-option { | ||
background-color: #dd4e4e; | ||
} | ||
|
||
.reveal-answer { | ||
text-align: center; | ||
cursor: pointer; | ||
} | ||
|
||
.reveal-answer:hover > .option-text, .reveal-answer:focus > .option-text { | ||
background-color: var(--side-nav-hover-color) | ||
} |
22 changes: 22 additions & 0 deletions
22
src/renderer/components/ft-community-poll/ft-community-poll.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
import { defineComponent } from 'vue' | ||
import { formatNumber } from '../../helpers/utils' | ||
|
||
export default defineComponent({ | ||
name: 'FtCommunityPoll', | ||
props: { | ||
data: { | ||
type: Object, | ||
required: true | ||
} | ||
}, | ||
data: function () { | ||
return { | ||
revealAnswer: false | ||
} | ||
}, | ||
computed: { | ||
formattedVotes: function () { | ||
return formatNumber(this.data.totalVotes) | ||
}, | ||
} | ||
}) |
Oops, something went wrong.