Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pleroma-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ilja
pleroma-fe
Commits
adbab6ad
Commit
adbab6ad
authored
5 years ago
by
HJ
Browse files
Options
Downloads
Patches
Plain Diff
added optional checkbox for opacity, similar to color input
parent
4bb1c98e
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/opacity_input/opacity_input.vue
+33
-4
33 additions, 4 deletions
src/components/opacity_input/opacity_input.vue
src/components/style_switcher/style_switcher.vue
+7
-2
7 additions, 2 deletions
src/components/style_switcher/style_switcher.vue
with
40 additions
and
6 deletions
src/components/opacity_input/opacity_input.vue
+
33
−
4
View file @
adbab6ad
...
...
@@ -18,7 +18,7 @@
@
input=
"$emit('input', !present ? fallback : undefined)"
>
<label
v-if=
"typeof fallback !== 'undefined'"
v-if=
"typeof fallback !== 'undefined'
&& showOptionalTickbox
"
class=
"opt-l"
:for=
"name + '-o'"
/>
...
...
@@ -38,9 +38,38 @@
<
script
>
export
default
{
props
:
[
'
name
'
,
'
value
'
,
'
fallback
'
,
'
disabled
'
],
props
:
{
// Name of opacity, used for identifying
name
:
{
required
:
true
,
type
:
String
},
// Opacity value, should be required but vue cannot tell the difference
// between "property missing" and "property set to undefined"
value
:
{
required
:
false
,
type
:
Number
,
default
:
undefined
},
// Opacity fallback to use when value is not defeind
fallback
:
{
required
:
false
,
type
:
Number
,
default
:
undefined
},
// Disable the control
disabled
:
{
required
:
false
,
type
:
Boolean
,
default
:
false
},
// Show "optional" tickbox, for when value might become mandatory
showOptionalTickbox
:
{
required
:
false
,
type
:
Boolean
,
default
:
true
}
},
computed
:
{
present
()
{
return
typeof
this
.
value
!==
'
undefined
'
...
...
This diff is collapsed.
Click to expand it.
src/components/style_switcher/style_switcher.vue
+
7
−
2
View file @
adbab6ad
...
...
@@ -118,15 +118,15 @@
v-model=
"accentColorLocal"
name=
"accentColor"
:fallback=
"previewTheme.colors.link"
:showOptionalTickbox=
"typeof linkColorLocal !== 'undefined'"
:label=
"$t('settings.accent')"
:showOptionalTickbox=
"typeof linkColorLocal !== 'undefined'"
/>
<ColorInput
v-model=
"linkColorLocal"
name=
"linkColor"
:fallback=
"previewTheme.colors.accent"
:showOptionalTickbox=
"typeof accentColorLocal !== 'undefined'"
:label=
"$t('settings.links')"
:showOptionalTickbox=
"typeof accentColorLocal !== 'undefined'"
/>
<ContrastRatio
:contrast=
"previewContrast.bgLink"
/>
</div>
...
...
@@ -239,6 +239,7 @@
v-model=
"panelOpacityLocal"
name=
"panelOpacity"
:fallback=
"previewTheme.opacity.panel"
:showOptionalTickbox=
"panelColorLocal !== 'transparent'"
/>
<ColorInput
v-model=
"panelTextColorLocal"
...
...
@@ -296,6 +297,7 @@
v-model=
"inputOpacityLocal"
name=
"inputOpacity"
:fallback=
"previewTheme.opacity.input"
:showOptionalTickbox=
"inputColorLocal !== 'transparent'"
/>
<ColorInput
v-model=
"inputTextColorLocal"
...
...
@@ -317,6 +319,7 @@
v-model=
"btnOpacityLocal"
name=
"btnOpacity"
:fallback=
"previewTheme.opacity.btn"
:showOptionalTickbox=
"btnColorLocal !== 'transparent'"
/>
<ColorInput
v-model=
"btnTextColorLocal"
...
...
@@ -338,6 +341,7 @@
v-model=
"borderOpacityLocal"
name=
"borderOpacity"
:fallback=
"previewTheme.opacity.border"
:showOptionalTickbox=
"borderColorLocal !== 'transparent'"
/>
</div>
<div
class=
"color-item"
>
...
...
@@ -378,6 +382,7 @@
v-model=
"underlayOpacityLocal"
name=
"underlayOpacity"
:fallback=
"previewTheme.opacity.underlay"
:showOptionalTickbox=
"underlayOpacityLocal !== 'transparent'"
/>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment