Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
pleroma-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
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
Pleroma
pleroma-fe
Commits
93dfb4d3
Commit
93dfb4d3
authored
5 years ago
by
HJ
Browse files
Options
Downloads
Patches
Plain Diff
fix shadow picker preview, change hint
parent
a7b6c791
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!1074
Update master with 2.0.0
,
!1037
Themes v3 Part 1 "2.1" codenamed "One step for themes, a giant burder for code reviewers"
Pipeline
#21913
passed
5 years ago
Stage: lint
Stage: build
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/components/shadow_control/shadow_control.js
+1
-1
1 addition, 1 deletion
src/components/shadow_control/shadow_control.js
src/components/shadow_control/shadow_control.vue
+6
-3
6 additions, 3 deletions
src/components/shadow_control/shadow_control.vue
src/i18n/en.json
+1
-1
1 addition, 1 deletion
src/i18n/en.json
with
8 additions
and
5 deletions
src/components/shadow_control/shadow_control.js
+
1
−
1
View file @
93dfb4d3
...
...
@@ -95,7 +95,7 @@ export default {
},
style
()
{
return
this
.
ready
?
{
boxShadow
:
getCssShadow
(
this
.
cValue
)
boxShadow
:
getCssShadow
(
this
.
fallback
)
}
:
{}
}
}
...
...
This diff is collapsed.
Click to expand it.
src/components/shadow_control/shadow_control.vue
+
6
−
3
View file @
93dfb4d3
...
...
@@ -199,9 +199,12 @@
v
-
model
=
"
selected.alpha
"
:
disabled
=
"
!present
"
/>
<
p
>
{{
$t
(
'
settings.style.shadows.hint
'
)
}}
<
/p
>
<
i18n
path
=
"
settings.style.shadows.hintV3
"
tag
=
"
p
"
>
<
code
>--
variable
,
mod
<
/code
>
<
/i18n
>
<
/div
>
<
/div
>
<
/template
>
...
...
This diff is collapsed.
Click to expand it.
src/i18n/en.json
+
1
−
1
View file @
93dfb4d3
...
...
@@ -452,7 +452,7 @@
"blur"
:
"Blur"
,
"spread"
:
"Spread"
,
"inset"
:
"Inset"
,
"hint"
:
"For shadows you can also use
--variable as a color value to use CSS3 variables. Please note that setting opacity won't work in this case
."
,
"hint
V3
"
:
"For shadows you can also use
the {0} notation to use other color slot
."
,
"filter_hint"
:
{
"always_drop_shadow"
:
"Warning, this shadow always uses {0} when browser supports it."
,
"drop_shadow_syntax"
:
"{0} does not support {1} parameter and {2} keyword."
,
...
...
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