Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fc-pregmod
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
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
macaronideath
fc-pregmod
Commits
a7b9059b
Commit
a7b9059b
authored
6 years ago
by
deepmurk
Browse files
Options
Downloads
Patches
Plain Diff
Revamp revert fix
fixes problems with revamped
parent
4d846fcd
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/art/vector/Set_Colour_Skin.tw
+16
-8
16 additions, 8 deletions
src/art/vector/Set_Colour_Skin.tw
src/js/vectorRevampedArtControlJS.tw
+3
-4
3 additions, 4 deletions
src/js/vectorRevampedArtControlJS.tw
with
19 additions
and
12 deletions
src/art/vector/Set_Colour_Skin.tw
+
16
−
8
View file @
a7b9059b
...
...
@@ -18,11 +18,11 @@
<<set _areolaStyle = "fill:#FCCADB;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "pale">>
<<set _skinColour = "#F5DFDC">>
/* #f9ebf0 */
<<set _skinColour = "#F5DFDC">>
<<set _areolaStyle = "fill:#EFBDC9;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "fair" "extremely fair" "very fair">>
<<set _skinColour = "#F5D4C7">>
/* #F6E0E8 */
<<set _skinColour = "#F5D4C7">>
<<set _areolaStyle = "fill:#E1B0B6;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "white" "light" "lightened">>
...
...
@@ -34,27 +34,35 @@
<<set _areolaStyle = "fill:#C69691;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "natural" "tanned">>
<<set _skinColour = "#C37C4D">> /* #F4C7A5 */ /* #BCA480 */
<<set _skinColour = "#C37C4D">>
<<set _areolaStyle = "fill:#A67A6F;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "bronzed">>
<<set _skinColour = "#F4CB94">>
<<set _areolaStyle = "fill:#A67A6F;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "dark olive">>
<<set _skinColour = "#9A7A58">>
/* #9E7D4A */
<<set _skinColour = "#9A7A58">>
<<set _areolaStyle = "fill:#855E4E;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "dark">>
<<set _skinColour = "#784F2F">>
/* #8A5B31 */
<<set _skinColour = "#784F2F">>
<<set _areolaStyle = "fill:#65422C;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "brown" "light brown">>
<<set _skinColour = "#65422C">>
/* #C97631 */
<<set _skinColour = "#65422C">>
<<set _areolaStyle = "fill:#583E2F;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "dark brown">>
<<set _skinColour = "#583E2F">>
/* #763818 */
<<set _skinColour = "#583E2F">>
<<set _areolaStyle = "fill:#4A3A33;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "ebony">>
<<set _skinColour = "#583D3D">>
<<set _areolaStyle = "fill:#524E4D;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "black">>
<<set _skinColour = "#4A3A33">>
/* #3f3b3a */ /* 5b3a29 */
<<set _skinColour = "#4A3A33">>
<<set _areolaStyle = "fill:#524E4D;" >>
<<set _labiaStyle = "fill:#F977A3;" >>
<<case "camouflage patterned">>
...
...
This diff is collapsed.
Click to expand it.
src/js/vectorRevampedArtControlJS.tw
+
3
−
4
View file @
a7b9059b
...
...
@@ -234,10 +234,10 @@ class ArtStyleControl {
["pale", "#f9ebf0"],
["tanned", "#e8b693"],
["natural", "#e8b693"],
["light olive", "#d4c6bb"],
["dark", "#a46237"],
["olive", "#d4c6bb"],
["light brown", "#a46237"],
["dark", "#845c44"],
["brown", "#845c44"],
["dark brown", "#845c44"],
["black", "#463a3a"],
["camouflage patterned", "#78875a"],
["red dyed", "#bc4949"],
...
...
@@ -247,7 +247,6 @@ class ArtStyleControl {
["blue dyed", "#5b8eb7"],
["dyed blue", "#5b8eb7"],
["tiger striped", "#e2d75d"]
["olive", "#a46237"],
];
var skinPaletteMap = new Map(skinPalette);
...
...
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