Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
subugoe
emo
TIDO
Commits
eb0c096a
Commit
eb0c096a
authored
Oct 19, 2020
by
schneider210
Browse files
chore: merge develop into actual MR
parents
4abbdc04
3543b437
Pipeline
#155095
passed with stages
in 3 minutes and 30 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
README.md
View file @
eb0c096a
...
...
@@ -290,9 +290,9 @@ It's a *JSON* object. So if you are going to make any changes and you have to qu
`primary`
and
`accent`
should be a darker tone, so that white text is visible if used as background. It's the other way around with
`secondary`
.
Hex values (like
`#a1a1a1`
) or color names (like
`hotpink`
)
can be used
.
Hex values (like
`#a1a1a1`
) or color names (like
`hotpink`
)
are fine
.
If any value is left
`""`
(empty string
), a default color scheme will be used.
If any value is left
blank (e.g.
`"primary": "",`
), a default color scheme will be used.
-
**headers**
...
...
src/App.vue
View file @
eb0c096a
...
...
@@ -307,7 +307,7 @@ export default {
this
.
$q
.
dark
.
set
(
'
auto
'
);
this
.
itemurls
.
sort
((
a
,
b
)
=>
a
.
localeCompare
(
b
,
undefined
,
{
numeric
:
true
}));
if
(
this
.
config
.
colors
.
primary
!==
'
false
'
)
{
if
(
this
.
config
.
colors
.
primary
&&
this
.
config
.
colors
.
secondary
&&
this
.
config
.
colors
.
accent
)
{
colors
.
setBrand
(
'
primary
'
,
this
.
config
.
colors
.
primary
);
colors
.
setBrand
(
'
secondary
'
,
this
.
config
.
colors
.
secondary
);
colors
.
setBrand
(
'
accent
'
,
this
.
config
.
colors
.
accent
);
...
...
src/components/color.vue
View file @
eb0c096a
...
...
@@ -25,7 +25,7 @@
clickable
@
click=
"() => changeColorsTo('emo')"
v-close-popup
v-if=
"projectcolors.primary"
v-if=
"projectcolors.primary
&& projectcolors.secondary && projectcolors.accent
"
>
<q-item-section>
EMo
</q-item-section>
</q-item>
...
...
@@ -57,7 +57,7 @@ export default {
methods
:
{
changeColorsTo
(
color
)
{
if
(
color
===
'
default
'
)
{
if
(
this
.
projectcolors
.
primary
)
{
if
(
this
.
projectcolors
.
primary
&&
this
.
projectcolors
.
secondary
&&
this
.
projectcolors
.
accent
)
{
colors
.
setBrand
(
'
primary
'
,
this
.
projectcolors
.
primary
);
colors
.
setBrand
(
'
secondary
'
,
this
.
projectcolors
.
secondary
);
colors
.
setBrand
(
'
accent
'
,
this
.
projectcolors
.
accent
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment