From 5effa220386d166e5060f99680483f4e2cfa58d5 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Mon, 24 Sep 2018 14:48:48 +0200 Subject: [PATCH] Simple color editor. --- .../Schemas/StringFieldEditor.cs | 1 + src/Squidex/app/features/content/module.ts | 2 + .../shared/field-editor.component.html | 7 + .../schema/types/string-ui.component.html | 7 + .../angular/forms/tag-editor.component.ts | 1 + .../app/theme/icomoon/demo-files/demo.css | 6 +- src/Squidex/app/theme/icomoon/demo.html | 998 +++++----- .../app/theme/icomoon/fonts/icomoon.eot | Bin 24676 -> 24920 bytes .../app/theme/icomoon/fonts/icomoon.svg | 2 + .../app/theme/icomoon/fonts/icomoon.ttf | Bin 24512 -> 24756 bytes .../app/theme/icomoon/fonts/icomoon.woff | Bin 24588 -> 24832 bytes src/Squidex/app/theme/icomoon/selection.json | 1665 +++++++++-------- src/Squidex/app/theme/icomoon/style.css | 258 ++- src/Squidex/package.json | 1 + 14 files changed, 1479 insertions(+), 1469 deletions(-) diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/StringFieldEditor.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/StringFieldEditor.cs index c7130e1de..ad5aec8cc 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/StringFieldEditor.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/StringFieldEditor.cs @@ -10,6 +10,7 @@ namespace Squidex.Domain.Apps.Core.Schemas public enum StringFieldEditor { Input, + Color, Markdown, Dropdown, Radio, diff --git a/src/Squidex/app/features/content/module.ts b/src/Squidex/app/features/content/module.ts index dc2dafdab..832b7c161 100644 --- a/src/Squidex/app/features/content/module.ts +++ b/src/Squidex/app/features/content/module.ts @@ -8,6 +8,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { DndModule } from 'ng2-dnd'; +import { ColorPickerModule } from 'ngx-color-picker'; import { CanDeactivateGuard, @@ -81,6 +82,7 @@ const routes: Routes = [ @NgModule({ imports: [ + ColorPickerModule, DndModule, SqxFrameworkModule, SqxSharedModule, diff --git a/src/Squidex/app/features/content/shared/field-editor.component.html b/src/Squidex/app/features/content/shared/field-editor.component.html index 2ed8c9469..06369885a 100644 --- a/src/Squidex/app/features/content/shared/field-editor.component.html +++ b/src/Squidex/app/features/content/shared/field-editor.component.html @@ -69,6 +69,13 @@ + + + diff --git a/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.html b/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.html index eebeb9636..3227da9f3 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.html @@ -74,6 +74,13 @@ Radio +
diff --git a/src/Squidex/app/framework/angular/forms/tag-editor.component.ts b/src/Squidex/app/framework/angular/forms/tag-editor.component.ts index 12247f366..9a7422295 100644 --- a/src/Squidex/app/framework/angular/forms/tag-editor.component.ts +++ b/src/Squidex/app/framework/angular/forms/tag-editor.component.ts @@ -194,6 +194,7 @@ export class TagEditorComponent implements AfterViewInit, ControlValueAccessor, public markTouched() { this.callTouched(); + this.resetAutocompletion(); this.hasFocus = false; } diff --git a/src/Squidex/app/theme/icomoon/demo-files/demo.css b/src/Squidex/app/theme/icomoon/demo-files/demo.css index 8823845c8..7876bec84 100644 --- a/src/Squidex/app/theme/icomoon/demo-files/demo.css +++ b/src/Squidex/app/theme/icomoon/demo-files/demo.css @@ -150,16 +150,16 @@ p { font-size: 32px; } .fs2 { - font-size: 24px; + font-size: 32px; } .fs3 { font-size: 32px; } .fs4 { - font-size: 28px; + font-size: 24px; } .fs5 { - font-size: 32px; + font-size: 28px; } .fs6 { font-size: 20px; diff --git a/src/Squidex/app/theme/icomoon/demo.html b/src/Squidex/app/theme/icomoon/demo.html index 634b83544..17d4d4676 100644 --- a/src/Squidex/app/theme/icomoon/demo.html +++ b/src/Squidex/app/theme/icomoon/demo.html @@ -9,20 +9,20 @@
-

Font Name: icomoon (Glyphs: 93)

+

Font Name: icomoon (Glyphs: 95)

-

Grid Size: 16

+

Grid Size: 32

- + - icon-star-full + icon-control-Color
- - + +
liga: @@ -31,14 +31,14 @@
- + - icon-star-empty + icon-browser
- - + +
liga: @@ -47,14 +47,14 @@
- + - icon-twitter + icon-checkmark
- - + +
liga: @@ -63,257 +63,257 @@
- + - icon-hour-glass + icon-control-Stars
- - + +
liga:
-
+
+
+

Grid Size: Unknown

+
-
- - + +
liga:
-
+
- + - icon-clock + icon-circle
- - + +
liga:
-
+
- + - icon-bin2 + icon-control-Slug
- - + +
liga:
-
+
- + - icon-earth + icon-type-Tags
- - + +
liga: - +
-
+
- + - icon-elapsed + icon-activity
- - + +
liga:
-
+
- + - icon-google + icon-history
- - + +
liga:
-
+
- + - icon-lock + icon-time
- - + +
liga:
-
+
- + - icon-microsoft + icon-add
- - + +
liga:
-
+
- + - icon-pause + icon-plus
- - + +
liga:
-
+
- + - icon-play + icon-check-circle
- - + +
liga:
-
+
- + - icon-reset + icon-check-circle-filled
- - + +
liga:
-
+
- + - icon-settings2 + icon-close
- - + +
liga:
-
+
- + - icon-timeout + icon-type-References
- - + +
liga:
-
+
- + - icon-unlocked + icon-control-Checkbox
- - + +
liga:
-
-
-

Grid Size: 24

- + - icon-backup + icon-control-Dropdown
- - + +
liga: @@ -322,14 +322,14 @@
- + - icon-support + icon-control-Input
- - + +
liga: @@ -338,14 +338,14 @@
- + - icon-control-RichText + icon-control-Radio
- - + +
liga: @@ -354,14 +354,14 @@
- + - icon-download + icon-control-TextArea
- - + +
liga: @@ -370,14 +370,14 @@
-
- - + +
liga: @@ -386,14 +386,14 @@
- + - icon-media + icon-copy
- - + +
liga: @@ -402,14 +402,14 @@
- + - icon-type-Assets + icon-dashboard
- - + +
liga: @@ -418,14 +418,14 @@
- + - icon-trigger-AssetChanged + icon-delete
- - + +
liga: @@ -434,14 +434,14 @@
- + - icon-more + icon-bin
- - + +
liga: @@ -450,14 +450,14 @@
- + - icon-dots + icon-delete-filled
- - + +
liga: @@ -466,14 +466,14 @@
- + - icon-pencil + icon-document-delete
- - + +
liga: @@ -482,14 +482,14 @@
- + - icon-reference + icon-document-disable
- - + +
liga: @@ -498,14 +498,14 @@
- + - icon-schemas + icon-document-publish
- - + +
liga: @@ -514,14 +514,14 @@
- + - icon-search + icon-drag
- - + +
liga: @@ -530,14 +530,14 @@
- + - icon-settings + icon-filter
- - + +
liga: @@ -546,14 +546,14 @@
- + - icon-type-Boolean + icon-github
- - + +
liga: @@ -562,14 +562,14 @@
- + - icon-type-DateTime + icon-help
- - + +
liga: @@ -578,14 +578,14 @@
- + - icon-type-Json + icon-location
- - + +
liga: @@ -594,14 +594,14 @@
- + - icon-json + icon-control-Map
- - + +
liga: @@ -610,14 +610,14 @@
- + - icon-type-Number + icon-type-Geolocation
- - + +
liga: @@ -626,14 +626,14 @@
- + - icon-type-String + icon-logo
- - + +
liga: @@ -642,273 +642,289 @@
- + - icon-user + icon-media
- - + +
liga:
-
-
-

Grid Size: Unknown

-
+
- + - icon-circle + icon-type-Assets
- - + +
liga:
-
+
- + - icon-control-Slug + icon-trigger-AssetChanged
- - + +
liga:
-
+
- + - icon-type-Tags + icon-more
- - + +
liga:
-
+
- + - icon-activity + icon-dots
- - + +
liga:
-
+
- + - icon-history + icon-pencil
- - + +
liga:
-
+
- + - icon-time + icon-reference
- - + +
liga:
-
+
- + - icon-add + icon-schemas
- - + +
liga:
-
+
- + - icon-plus + icon-search
- - + +
liga:
-
+
- + - icon-check-circle + icon-settings
- - + +
liga:
-
+
- + - icon-check-circle-filled + icon-type-Boolean
- - + +
liga:
-
+
- + - icon-close + icon-type-DateTime
- - + + +
+
+ liga: + +
+
+
+
+ + + + icon-type-Json +
+
+ +
liga:
-
+
- + - icon-type-References + icon-json
- - + +
liga:
-
+
- + - icon-control-Checkbox + icon-type-Number
- - + +
liga:
-
+
- + - icon-control-Dropdown + icon-type-String
- - + +
liga:
-
+
- + - icon-control-Input + icon-user
- - + +
liga:
+
+
+

Grid Size: 16

- + - icon-control-Radio + icon-star-full
- - + +
liga: @@ -917,14 +933,14 @@
- + - icon-control-TextArea + icon-star-empty
- - + +
liga: @@ -933,14 +949,14 @@
- + - icon-control-Toggle + icon-twitter
- - + +
liga: @@ -949,14 +965,14 @@
- + - icon-copy + icon-hour-glass
- - + +
liga: @@ -965,14 +981,14 @@
- + - icon-dashboard + icon-spinner
- - + +
liga: @@ -981,14 +997,14 @@
- + - icon-delete + icon-clock
- - + +
liga: @@ -997,14 +1013,14 @@
- + - icon-bin + icon-bin2
- - + +
liga: @@ -1013,30 +1029,30 @@
- + - icon-delete-filled + icon-earth
- - + +
liga: - +
- + - icon-document-delete + icon-elapsed
- - + +
liga: @@ -1045,14 +1061,14 @@
- + - icon-document-disable + icon-google
- - + +
liga: @@ -1061,14 +1077,14 @@
- + - icon-document-publish + icon-lock
- - + +
liga: @@ -1077,14 +1093,14 @@
- + - icon-drag + icon-microsoft
- - + +
liga: @@ -1093,14 +1109,14 @@
- + - icon-filter + icon-pause
- - + +
liga: @@ -1109,14 +1125,14 @@
- + - icon-github + icon-play
- - + +
liga: @@ -1125,14 +1141,14 @@
- + - icon-help + icon-reset
- - + +
liga: @@ -1141,14 +1157,14 @@
- + - icon-location + icon-settings2
- - + +
liga: @@ -1157,14 +1173,14 @@
- + - icon-control-Map + icon-timeout
- - + +
liga: @@ -1173,302 +1189,305 @@
- + - icon-type-Geolocation + icon-unlocked
- - + +
liga:
-
+
+
+

Grid Size: 24

+
-
- - + +
liga:
-
+
- + - icon-media + icon-support
- - + +
liga:
-
+
- + - icon-type-Assets + icon-control-RichText
- - + +
liga:
-
+
- + - icon-trigger-AssetChanged + icon-download
- - + +
liga:
-
+
- + - icon-more + icon-orleans
- - + +
liga:
-
+
- + - icon-dots + icon-document-lock
- - + +
liga:
-
+
- + - icon-pencil + icon-document-unpublish
- - + +
liga:
-
+
- + - icon-reference + icon-angle-down
- - + +
liga:
-
+
- + - icon-schemas + icon-angle-left
- - + +
liga:
-
+
- + - icon-search + icon-angle-right
- - + +
liga:
-
+
- + - icon-settings + icon-angle-up
- - + +
liga:
-
+
- + - icon-type-Boolean + icon-api
- - + +
liga:
-
+
- + - icon-type-DateTime + icon-assets
- - + +
liga:
-
+
- + - icon-type-Json + icon-bug
- - + +
liga:
-
+
- + - icon-json + icon-caret-down
- - + +
liga:
-
+
- + - icon-type-Number + icon-caret-left
- - + +
liga:
-
+
- + - icon-type-String + icon-caret-right
- - + +
liga:
-
+
- + - icon-user + icon-caret-up
- - + +
liga: @@ -1478,7 +1497,7 @@

Grid Size: 14

-
+
@@ -1494,7 +1513,7 @@
-
+
@@ -1510,7 +1529,7 @@
-
+
@@ -1526,7 +1545,7 @@
-
+
@@ -1542,7 +1561,7 @@
-
+
@@ -1558,7 +1577,7 @@
-
+
@@ -1574,7 +1593,7 @@
-
+
@@ -1590,7 +1609,7 @@
-
+
@@ -1606,7 +1625,7 @@
-
+
@@ -1622,7 +1641,7 @@
-
+
@@ -1638,7 +1657,7 @@
-
+
@@ -1654,7 +1673,7 @@
-
+
@@ -1670,7 +1689,7 @@
-
+
@@ -1686,7 +1705,7 @@
-
+
@@ -1702,7 +1721,7 @@
-
+
@@ -1718,7 +1737,7 @@
-
+
@@ -1734,7 +1753,7 @@
-
+
@@ -1750,7 +1769,7 @@
-
+
@@ -1766,7 +1785,7 @@
-
+
@@ -1782,7 +1801,7 @@
-
+
@@ -1798,7 +1817,7 @@
-
+
@@ -1814,7 +1833,7 @@
-
+
@@ -1830,7 +1849,7 @@
-
+
@@ -1846,7 +1865,7 @@
-
+
@@ -1862,7 +1881,7 @@
-
+
@@ -1878,7 +1897,7 @@
-
+
@@ -1894,7 +1913,7 @@
-
+
@@ -1910,89 +1929,6 @@
-
-
- - - - icon-browser -
-
- - -
-
- liga: - -
-
-
-
- - - - icon-checkmark -
-
- - -
-
- liga: - -
-
-
-
-

Grid Size: 32

-
-
- - - - icon-browser -
-
- - -
-
- liga: - -
-
-
-
- - - - icon-checkmark -
-
- - -
-
- liga: - -
-
-
-
- - - - icon-control-Stars -
-
- - -
-
- liga: - -
-

Grid Size: 20

diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.eot b/src/Squidex/app/theme/icomoon/fonts/icomoon.eot index 27c3ea3360c4a80266d707f71ebfdc7d778e397c..b195bfb60674b73cffbc6e37dffe9004b149f33c 100644 GIT binary patch delta 584 zcmXw#UuaTM9LK-s9KA8@&fN7XiIIQSb!rx=*BESYG4?RApfO5@O`VQ}GL3}B9@1V0 zQ7@)MzU`qXs5hmjAXzW-rS%XLJ@m4m(H{t6FAZJi7CrpVkI(P>{hjmWeD0AC8$?Lu zfNr)S#0=Xr)}4lS)AAC4UfFypSNUjcPd7H5wewGYF9GB!u+SHv_Q;=Wjs z4@Ri5z`4qKyjZHPlxMBiIX~n(_pX-nxkNm(0W6MleY2EXsbG~XaQ@EObuCv~ZYM_e zfXqSeU#paFRKd7{Y)jX{80j|)72KM9{;yGaaNj~p z`tt^?Lt|N{;V_OsL71m=%U;#3dS$ENb$gU)5{*UNVVfMWFn3LMGd}hxswKiaf^4-# z!Z9_fFm2e=NZloggPtf!BGp7ms}DiZQydPZ&QTJ1QJ0qOWp$|Q$36&LgStae97G%b z7#r1xqhoq7Be4I=0M^4%L@|phYCKw}e6ArncdRqp8S~UGOa|SG_iygJ{@2*mb%7 delta 322 zcmca{i1En*Mz)j$28ILi6WPpI_ODl3GkIaW$i$Fj!QBiD410h$Avrg(;O76CrV~%d z)Gz!KP{Y8$xPpNpa!p2RVv6v=-jj2nI2b5e!U|4Vi>DZ;oHe2mniGUTOdU diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.svg b/src/Squidex/app/theme/icomoon/fonts/icomoon.svg index 6764b7f05..533ca5aae 100644 --- a/src/Squidex/app/theme/icomoon/fonts/icomoon.svg +++ b/src/Squidex/app/theme/icomoon/fonts/icomoon.svg @@ -83,6 +83,8 @@ + + diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf b/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf index ff4407c305215eae2e3dbd662b255ad25fcadf63..c2460360e885f8eaf448a8ad011111c12c9ce88d 100644 GIT binary patch delta 586 zcmXw$PiPZC6vp4|WTPc+(`2&=hKkvwZkogxNwSeb3v0zgLyGtZmA0B})0%*di8P1U zgIPfWqL-Q?=9Yt?pa&trli;>q41)C_2p+t6Q2Yae^kT`@w~7NZAHVOt$9%)+FGzQt z)PVqi4K$!|_{8a0-0tL_qhsz|zNA(@u&oIIGK_q)pe|QXhmhN-y9-O#E}eY%dmi}_ zz|2~4QC;A-&+h`58^?O8h{gcJE+AKtM~bCttvuzrihLhu?ktt_N7eLXb_3wz2sXSb zskI8MkQwCf$i6FTX|a_a*apb%!GT7lyj;bgxN>V|9VqRs>bJ>sGecrF>R~*@eQ)TT zz13-uSf)<#VVCI^^A)VXfdha)AhQB1N6BBY5f48}1fxqbOu_g@GDdg4C-=yW$77q3 z&9Nu{gc1689Zbo*)B}*0H1pWO zuk!UZuOxYiV*GFpn&zO>48{WN{IUSmVLv2c3aU`YXr0&7tK9Gx*YQtT`}h{vEM_ab ze{<{Qe{I%gkC1%l>FhDWn&o!$=iKMWA!#Kj1slOCBE< delta 346 zcmdmTknzBN#(D-u1_lOhh6V;^1_S?KeItG$-rYcvJwTk0oSRs1^Z!g!1_nkMAipI& zvA6(83jp~GfHX&XPG#D{KLIsB{t5<$$Tb-et$f_%~u9)7LXwf*Eimt38N<`#F#TCZk`e2%sBaR z>=VOH>O$&H>iaZeH2O3iXeMah)8f*~(t4!LplzUiO=ptMHE_r!GDa|nfz4t9*|(WL HekmgWy$oMO diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.woff b/src/Squidex/app/theme/icomoon/fonts/icomoon.woff index 343d2191bfe5a4c0de37ba9466cc7fb05d8a0a80..5decab2c6a14ce829781fc9ffeaf6b7752bf323f 100644 GIT binary patch delta 611 zcmeA50W4u{S_I2NVmW=TxQv#lA2wL`?zVz~#S^GEx&$7#LzYfNIP@Son7Ydj?PtD0TqI zR{>#8Cf1aU+>#2Q*b|`s9uUs=6e-NfPX?;gzv7$UGK%=rGXsMloB1o#D+V?OUIsx124PiGR#8?{T}Cj)%_uJH#3=f2 z3!@KH`oGtVKL55Poishk*tpvAy!Ls^H4utP^zS4=rd*({3@i)_7#x@rm>n1-8DtsM z7>t09R1{S#0?#tEsoCZ__Z+xS+|T8KQYbD@dzO>z;O)c8T^99WPxr RT`!=W3=GMez2Xir0syEZlaBxZ delta 358 zcmZoT#MpCyQKa18&5ePP0SFR!7`Q=n{DFxg+V#7Wa}x^~7#K5vA}t_%^Z!iK^u%J2 z*c%|91BwOGb1Kt-VqX{-BG-WM!ao5u8L5dW3=Gi=fNIP@Soq-Y%^5&Jpx6x{Uj>9Y znOKuDa!V?JVt;`8fp##qq&*g7-z=G`f*Rx vH>nG$JE`x}h|%cNc%Ye}c~6T=D@*H