From cdaa633d47863061f532392d90fcf0cc499ae92c Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 22 Feb 2017 19:50:28 +0100 Subject: [PATCH] Styles fixes and bugfixes --- .../content/content-field.component.html | 2 +- .../schema/types/date-time-ui.component.html | 2 +- .../pages/clients/clients-page.component.html | 4 - .../angular/date-time-editor.component.ts | 15 +- .../shared/services/schemas.service.spec.ts | 21 ++- src/Squidex/app/theme/_bootstrap.scss | 2 +- src/Squidex/app/theme/icomoon/demo.html | 34 +++- .../app/theme/icomoon/fonts/icomoon.eot | Bin 13476 -> 14900 bytes .../app/theme/icomoon/fonts/icomoon.svg | 2 + .../app/theme/icomoon/fonts/icomoon.ttf | Bin 13312 -> 14736 bytes .../app/theme/icomoon/fonts/icomoon.woff | Bin 13388 -> 14812 bytes .../app/theme/icomoon/icons/client.svg | 29 ++++ .../theme/icomoon/icons/control-date-time.svg | 55 ++++++ .../app/theme/icomoon/icons/control-date.svg | 53 ++++++ src/Squidex/app/theme/icomoon/selection.json | 162 ++++++++++++------ src/Squidex/app/theme/icomoon/style.css | 16 +- src/Squidex/wwwroot/images/client.png | Bin 454 -> 888 bytes 17 files changed, 319 insertions(+), 78 deletions(-) create mode 100644 src/Squidex/app/theme/icomoon/icons/client.svg create mode 100644 src/Squidex/app/theme/icomoon/icons/control-date-time.svg create mode 100644 src/Squidex/app/theme/icomoon/icons/control-date.svg diff --git a/src/Squidex/app/features/content/pages/content/content-field.component.html b/src/Squidex/app/features/content/pages/content/content-field.component.html index ead778762..0f880e2e6 100644 --- a/src/Squidex/app/features/content/pages/content/content-field.component.html +++ b/src/Squidex/app/features/content/pages/content/content-field.component.html @@ -56,7 +56,7 @@
- +
diff --git a/src/Squidex/app/features/schemas/pages/schema/types/date-time-ui.component.html b/src/Squidex/app/features/schemas/pages/schema/types/date-time-ui.component.html index 8f66a87ba..ed868dabf 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/date-time-ui.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/types/date-time-ui.component.html @@ -24,7 +24,7 @@ diff --git a/src/Squidex/app/features/settings/pages/clients/clients-page.component.html b/src/Squidex/app/features/settings/pages/clients/clients-page.component.html index df59e5a9e..16d74a829 100644 --- a/src/Squidex/app/features/settings/pages/clients/clients-page.component.html +++ b/src/Squidex/app/features/settings/pages/clients/clients-page.component.html @@ -13,10 +13,6 @@
-
-
-
-
No client created yet.
diff --git a/src/Squidex/app/framework/angular/date-time-editor.component.ts b/src/Squidex/app/framework/angular/date-time-editor.component.ts index 9466eec83..2d5bc9e0a 100644 --- a/src/Squidex/app/framework/angular/date-time-editor.component.ts +++ b/src/Squidex/app/framework/angular/date-time-editor.component.ts @@ -93,11 +93,11 @@ export class DateTimeEditorComponent implements ControlValueAccessor, OnInit, Af public setDisabledState(isDisabled: boolean): void { if (isDisabled) { - this.dateControl.disable(); - this.timeControl.disable(); + this.dateControl.disable({ emitEvent: false }); + this.timeControl.disable({ emitEvent: false }); } else { - this.dateControl.enable(); - this.timeControl.enable(); + this.dateControl.enable({ emitEvent: false }); + this.timeControl.enable({ emitEvent: false }); } } @@ -112,6 +112,9 @@ export class DateTimeEditorComponent implements ControlValueAccessor, OnInit, Af public ngAfterViewInit() { this.picker = new Pikaday({ field: this.dateInput.nativeElement, format: 'YYYY-MM-DD', onSelect: () => { + if (this.suppressEvents) { + return; + } this.dateValue = this.picker.getMoment(); this.updateValue(); @@ -145,8 +148,6 @@ export class DateTimeEditorComponent implements ControlValueAccessor, OnInit, Af } } - console.error(result); - this.changeCallback(result); } @@ -160,7 +161,7 @@ export class DateTimeEditorComponent implements ControlValueAccessor, OnInit, Af if (this.timeValue && this.timeValue.isValid()) { this.timeControl.setValue(this.timeValue.format('HH:mm:ss'), { emitEvent: false }); } - if (this.dateValue && this.dateValue.isValid()) { + if (this.dateValue && this.dateValue.isValid() && this.picker) { this.dateControl.setValue(this.dateValue.format('YYYY-MM-DD'), { emitEvent: false }); this.picker.setMoment(this.dateValue); diff --git a/src/Squidex/app/shared/services/schemas.service.spec.ts b/src/Squidex/app/shared/services/schemas.service.spec.ts index bbcb471be..d7ca5a9ed 100644 --- a/src/Squidex/app/shared/services/schemas.service.spec.ts +++ b/src/Squidex/app/shared/services/schemas.service.spec.ts @@ -99,7 +99,7 @@ describe('SchemasService', () => { lastModified: '2017-12-12T10:10', lastModifiedBy: 'LastModifiedBy1', fields: [{ - fieldId: 123, + fieldId: 1, name: 'field1', isHidden: true, isDisabled: true, @@ -107,7 +107,7 @@ describe('SchemasService', () => { fieldType: 'number' } }, { - fieldId: 234, + fieldId: 2, name: 'field2', isHidden: true, isDisabled: true, @@ -115,13 +115,21 @@ describe('SchemasService', () => { fieldType: 'string' } }, { - fieldId: 345, + fieldId: 3, name: 'field3', isHidden: true, isDisabled: true, properties: { fieldType: 'boolean' } + }, { + fieldId: 4, + name: 'field4', + isHidden: true, + isDisabled: true, + properties: { + fieldType: 'dateTime' + } }] } }) @@ -139,9 +147,10 @@ describe('SchemasService', () => { new SchemaDetailsDto('id1', 'name1', 'label1', 'hints1', true, 'Created1', 'LastModifiedBy1', DateTime.parseISO_UTC('2016-12-12T10:10'), DateTime.parseISO_UTC('2017-12-12T10:10'), [ - new FieldDto(123, 'field1', true, true, createProperties('number')), - new FieldDto(234, 'field2', true, true, createProperties('string')), - new FieldDto(345, 'field3', true, true, createProperties('boolean')) + new FieldDto(1, 'field1', true, true, createProperties('number')), + new FieldDto(2, 'field2', true, true, createProperties('string')), + new FieldDto(3, 'field3', true, true, createProperties('boolean')), + new FieldDto(4, 'field4', true, true, createProperties('dateTime')) ])); authService.verifyAll(); diff --git a/src/Squidex/app/theme/_bootstrap.scss b/src/Squidex/app/theme/_bootstrap.scss index a6d9f71c1..beb1ee90a 100644 --- a/src/Squidex/app/theme/_bootstrap.scss +++ b/src/Squidex/app/theme/_bootstrap.scss @@ -182,7 +182,7 @@ body { & { @include box-shadow(0, 0, 10px, .5); background: $color-theme-blue; - border: 0; + border-color: $color-theme-blue; color: $color-accent-dark; } diff --git a/src/Squidex/app/theme/icomoon/demo.html b/src/Squidex/app/theme/icomoon/demo.html index eeae76328..e7bb54eb1 100644 --- a/src/Squidex/app/theme/icomoon/demo.html +++ b/src/Squidex/app/theme/icomoon/demo.html @@ -9,7 +9,7 @@
-

Font Name: icomoon (Glyphs: 54)

+

Font Name: icomoon (Glyphs: 56)

Grid Size: 32

@@ -147,6 +147,38 @@

Grid Size: 14

+
+
+ + + + icon-control-date +
+
+ + +
+
+ liga: + +
+
+
+
+ + + + icon-control-date-time +
+
+ + +
+
+ liga: + +
+
diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.eot b/src/Squidex/app/theme/icomoon/fonts/icomoon.eot index fe8a0f34d0594dc4d95c82ad4edeb2c4a1d8cd89..19060baeb136545d8dc87070d1375cc09d34916a 100644 GIT binary patch delta 1027 zcmah|UuaTM82`TOpO}|C$ke6GO`R!BuiLy=*L0gb^e~!2&|DEw*`}_TP1+!dK!b?A zm0b2PA?RU2!5&5qgos{7uooZt!w7l`Vp~0pqNkd6ju+SV)P?h%-|zeTRpb5@=Z-l|xk zdtbB*f}N{%3x9T4fU`(N9f|7*(Zv-@bj6zd&eJKcdDOib!n3UZueAKsIPh-4U$qX)sGclhpmI+7Fai1@qj`U4LU9RXvU%#@~Zyw~bc?G^X zl>;Uq!wgS28?$U`tp(_hRbo51ovDa4)D+(9_8KW2&j4XhBg}lVv)R|tKzk&P+pdD=m`Nbs+%s?3i;|Cyl z24-f)^^;Q=?HNrcFJbg%G~N7x(NJHV5u}2F!TMs~<#>LZuMFHQVE&a$Zu3D52>t)S pD(UrhdBUM2*T0O_-0j9?H0sbXN7tY{^?x!+ + + \ No newline at end of file diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf b/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf index ab2ac04080bbbf99e6fd58233fae8e1a8f90fcd1..cb25cfb2c472d245b8c25f816d5baa4c9f811fcf 100644 GIT binary patch delta 1009 zcmaiyO=uHQ5XWaWO|)6fGd4*{Fl~~?7EHEDv)NRWejxNvY@%X64kBu(%?4>~Fg-*s zi6GjW+R#G_-g;2zL5vU(5kC-m=|!a!JPFbkPl9;TCeF*6(w+?L%=~8N&HVFri|L2C z0w4g0Py`(W&y5B`?5LrIGOy^lI+;mkTPHrg2Eb#)V`?&&C4YpN`-AHAtyJaN<`?2T zKzJ@amAq!sk3Rv3P#Gd=N;C`lehN<#d()ZO{QAn_W#UW3Kc;6UPba5GE}sDCjZ@-w zCYjH|C|)F9C3f9NW~LU;H2)^vrX}~XGr3t3O21QFfD3fG=a1eDV(&bTU~f5&JpsiA zQ2X8ly1U>89}L3;OhFFrzyo*;EASFlVI97~Pef$sL?1?R7$-_+yU)_Y8X)zT)&p#eb&cMBb6Pd5bv zlxU-ZN!Z`sy8rMl^&{yG*_?=*VSY<>Qv-f8GH3Z;RG_ddEXk6q$c!SZ0TYd^$S)fc z)iQ6Y=TXaxY$t_@`cZChF{;M>{Ar4oLBA{7ga4SKzUV}YRNtJimXwS^o7-~v=` zL{<=--0`hzjX>qZVGCcV=x|AP-eA|PlYvz{tSBz|GLWz|3IaAFOZ0FT}#|sfNVw?AU`BMvA6(8 z3jp~bnj<}@GOe?ywg9(^<6aX!x*NyTiQ94F z-UBFeEb`Aczb3|GR{=UAr0HN`HIFPOh@^6su*9OAGxsEt(=)^^6W(UAzEb&QVseah z=QPXqK5T3XDIK!;AnL-D_lbmT!2oFkSbEB23w%2oV zu$K!dE!+uPV+$3%MAXxQl{+l2J-m4z^&oi)*0>Ni6?Q9nDgnC%nPGXiN>iERvU0$k z5qUu@fhh1|hFva3i#aCJc{F%I+=*jU-^vm$hSiAQA5p_y@u=S)jd!&U_eoOUaBG_} z7q9JWjfM=pE4#^M&fRMF`UIGDg;F$bfz*igdi3RG@ue(t9w#ALsy16L5G5yyxvhPObuZZ2hK`7Jl q=TCE4Rv2?BuWh%<*sV$JKP*g81{xonsc^J7`w6i#x^wq~Z}A^j5yxQw delta 323 zcmcapd?rJ<+~3WOfsp|SOnex)!Sv*VmXZ^7gzNc|a}x^~7#K5vq9GtG9(HL@dSWq1 zY!8sn0mTC8IhAQZu_Fu&`Ya&aSybDTk(!voz+i9!sKyM0`Is*5&HxHBFc<>43@RYZ z$;4`%ky}y$6a(>Jfbh9Byi0QOlY#2|jCgxqZQ45f-0LFogQF)2E zsX(zMK+D@ec%~QU?}Gf|5};>v;OdxxEN15QlX)2J8BHhqFnTkZZl1wtsILz8H3Nh7 z#lFk&{5D@1xLJTI85piya+{B!{~wrKVrI-}HF<^Ei^((0%Rrt6X|&obWpRiR0M!CW AasU7T diff --git a/src/Squidex/app/theme/icomoon/icons/client.svg b/src/Squidex/app/theme/icomoon/icons/client.svg new file mode 100644 index 000000000..bc0e64a7c --- /dev/null +++ b/src/Squidex/app/theme/icomoon/icons/client.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/Squidex/app/theme/icomoon/icons/control-date-time.svg b/src/Squidex/app/theme/icomoon/icons/control-date-time.svg new file mode 100644 index 000000000..8467eecaa --- /dev/null +++ b/src/Squidex/app/theme/icomoon/icons/control-date-time.svg @@ -0,0 +1,55 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/src/Squidex/app/theme/icomoon/icons/control-date.svg b/src/Squidex/app/theme/icomoon/icons/control-date.svg new file mode 100644 index 000000000..60865ecd4 --- /dev/null +++ b/src/Squidex/app/theme/icomoon/icons/control-date.svg @@ -0,0 +1,53 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/src/Squidex/app/theme/icomoon/selection.json b/src/Squidex/app/theme/icomoon/selection.json index b5dd7e9d0..b6da748d5 100644 --- a/src/Squidex/app/theme/icomoon/selection.json +++ b/src/Squidex/app/theme/icomoon/selection.json @@ -133,7 +133,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 9 + "iconIdx": 13 }, { "icon": { @@ -163,7 +163,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 10 + "iconIdx": 14 }, { "icon": { @@ -193,7 +193,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 11 + "iconIdx": 15 }, { "icon": { @@ -228,7 +228,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 12 + "iconIdx": 16 }, { "icon": { @@ -265,7 +265,65 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 13 + "iconIdx": 17 + }, + { + "icon": { + "paths": [ + "M947.2 102.4h-128v-25.6c0-14.131-11.469-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-512v-25.6c0-14.131-11.52-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-128c-42.342 0-76.8 34.458-76.8 76.8v716.8c0 42.342 34.458 76.8 76.8 76.8h870.4c42.342 0 76.8-34.458 76.8-76.8v-716.8c0-42.342-34.458-76.8-76.8-76.8zM972.8 896c0 14.131-11.469 25.6-25.6 25.6h-870.4c-14.080 0-25.6-11.469-25.6-25.6v-537.6h921.6v537.6zM972.8 307.2h-921.6v-128c0-14.080 11.52-25.6 25.6-25.6h128v76.8c0 14.080 11.52 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h512v76.8c0 14.080 11.469 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h128c14.131 0 25.6 11.52 25.6 25.6v128zM332.8 512h51.2c14.080 0 25.6-11.52 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.52-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.52-25.6 25.6s11.52 25.6 25.6 25.6zM640 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.52-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.52-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 614.4h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 614.4h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 716.8h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 716.8h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 819.2h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 819.2h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6z" + ], + "attrs": [ + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 14, + "tags": [ + "control-date" + ] + }, + "attrs": [ + {} + ], + "properties": { + "order": 71, + "id": 42, + "name": "control-date", + "prevSize": 28, + "code": 59702 + }, + "setIdx": 2, + "setId": 1, + "iconIdx": 0 + }, + { + "icon": { + "paths": [ + "M486.4 409.6h51.2c14.080 0 25.6 11.52 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.52-25.6-25.6s11.52-25.6 25.6-25.6zM230.4 614.4c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM230.4 512c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM51.2 742.4v-435.2h665.6v102.4h51.2v-281.6c0-42.342-34.458-76.8-76.8-76.8h-128v-25.6c0-14.131-11.469-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-256v-25.6c0-14.131-11.52-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-128c-42.342 0-76.8 34.458-76.8 76.8v614.4c0 42.342 34.458 76.8 76.8 76.8h332.8v-51.2h-332.8c-14.080 0-25.6-11.469-25.6-25.6zM51.2 128c0-14.080 11.52-25.6 25.6-25.6h128v76.8c0 14.080 11.52 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h256v76.8c0 14.080 11.469 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h128c14.131 0 25.6 11.52 25.6 25.6v128h-665.6v-128zM384 409.6c14.080 0 25.6 11.52 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.52-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM742.4 460.8c-155.546 0-281.6 126.054-281.6 281.6s126.054 281.6 281.6 281.6 281.6-126.054 281.6-281.6-126.054-281.6-281.6-281.6zM742.4 972.8c-127.232 0-230.4-103.168-230.4-230.4s103.168-230.4 230.4-230.4 230.4 103.168 230.4 230.4-103.168 230.4-230.4 230.4zM384 512c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM384 614.4c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM844.8 716.8c14.131 0 25.6 11.469 25.6 25.6s-11.469 25.6-25.6 25.6h-102.4c-14.131 0-25.6-11.469-25.6-25.6v-102.4c0-14.131 11.469-25.6 25.6-25.6s25.6 11.469 25.6 25.6v76.8h76.8z" + ], + "attrs": [ + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 14, + "tags": [ + "control-date-time" + ] + }, + "attrs": [ + {} + ], + "properties": { + "order": 70, + "id": 41, + "name": "control-date-time", + "prevSize": 28, + "code": 59703 + }, + "setIdx": 2, + "setId": 1, + "iconIdx": 1 }, { "icon": { @@ -287,7 +345,7 @@ {} ], "properties": { - "order": 1, + "order": 67, "id": 0, "prevSize": 28, "code": 59697, @@ -295,7 +353,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 0 + "iconIdx": 4 }, { "icon": { @@ -324,7 +382,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 1 + "iconIdx": 5 }, { "icon": { @@ -354,7 +412,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 2 + "iconIdx": 6 }, { "icon": { @@ -384,7 +442,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 3 + "iconIdx": 7 }, { "icon": { @@ -414,7 +472,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 4 + "iconIdx": 8 }, { "icon": { @@ -444,7 +502,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 5 + "iconIdx": 9 }, { "icon": { @@ -474,7 +532,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 6 + "iconIdx": 10 }, { "icon": { @@ -504,7 +562,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 7 + "iconIdx": 11 }, { "icon": { @@ -534,7 +592,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 8 + "iconIdx": 12 }, { "icon": { @@ -563,7 +621,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 14 + "iconIdx": 18 }, { "icon": { @@ -592,7 +650,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 15 + "iconIdx": 19 }, { "icon": { @@ -621,7 +679,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 16 + "iconIdx": 20 }, { "icon": { @@ -650,7 +708,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 17 + "iconIdx": 21 }, { "icon": { @@ -679,7 +737,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 18 + "iconIdx": 22 }, { "icon": { @@ -708,7 +766,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 19 + "iconIdx": 23 }, { "icon": { @@ -737,7 +795,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 20 + "iconIdx": 24 }, { "icon": { @@ -766,7 +824,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 21 + "iconIdx": 25 }, { "icon": { @@ -795,7 +853,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 22 + "iconIdx": 26 }, { "icon": { @@ -824,7 +882,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 23 + "iconIdx": 27 }, { "icon": { @@ -853,7 +911,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 24 + "iconIdx": 28 }, { "icon": { @@ -882,7 +940,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 25 + "iconIdx": 29 }, { "icon": { @@ -911,7 +969,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 26 + "iconIdx": 30 }, { "icon": { @@ -940,7 +998,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 27 + "iconIdx": 31 }, { "icon": { @@ -969,7 +1027,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 28 + "iconIdx": 32 }, { "icon": { @@ -998,7 +1056,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 29 + "iconIdx": 33 }, { "icon": { @@ -1027,7 +1085,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 30 + "iconIdx": 34 }, { "icon": { @@ -1056,7 +1114,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 31 + "iconIdx": 35 }, { "icon": { @@ -1085,7 +1143,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 32 + "iconIdx": 36 }, { "icon": { @@ -1114,7 +1172,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 33 + "iconIdx": 37 }, { "icon": { @@ -1143,7 +1201,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 34 + "iconIdx": 38 }, { "icon": { @@ -1172,7 +1230,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 35 + "iconIdx": 39 }, { "icon": { @@ -1201,7 +1259,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 36 + "iconIdx": 40 }, { "icon": { @@ -1230,7 +1288,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 37 + "iconIdx": 41 }, { "icon": { @@ -1259,7 +1317,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 38 + "iconIdx": 42 }, { "icon": { @@ -1288,7 +1346,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 39 + "iconIdx": 43 }, { "icon": { @@ -1317,7 +1375,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 40 + "iconIdx": 44 }, { "icon": { @@ -1346,7 +1404,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 41 + "iconIdx": 45 }, { "icon": { @@ -1375,7 +1433,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 42 + "iconIdx": 46 }, { "icon": { @@ -1404,7 +1462,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 43 + "iconIdx": 47 }, { "icon": { @@ -1433,7 +1491,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 44 + "iconIdx": 48 }, { "icon": { @@ -1462,7 +1520,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 45 + "iconIdx": 49 }, { "icon": { @@ -1491,7 +1549,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 46 + "iconIdx": 50 }, { "icon": { @@ -1520,7 +1578,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 47 + "iconIdx": 51 }, { "icon": { @@ -1549,7 +1607,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 48 + "iconIdx": 52 }, { "icon": { @@ -1578,7 +1636,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 49 + "iconIdx": 53 }, { "icon": { @@ -1607,7 +1665,7 @@ }, "setIdx": 2, "setId": 1, - "iconIdx": 50 + "iconIdx": 54 } ], "height": 1024, diff --git a/src/Squidex/app/theme/icomoon/style.css b/src/Squidex/app/theme/icomoon/style.css index 8dc3b858e..47842112a 100644 --- a/src/Squidex/app/theme/icomoon/style.css +++ b/src/Squidex/app/theme/icomoon/style.css @@ -1,10 +1,10 @@ @font-face { font-family: 'icomoon'; - src: url('fonts/icomoon.eot?7ja4lm'); - src: url('fonts/icomoon.eot?7ja4lm#iefix') format('embedded-opentype'), - url('fonts/icomoon.ttf?7ja4lm') format('truetype'), - url('fonts/icomoon.woff?7ja4lm') format('woff'), - url('fonts/icomoon.svg?7ja4lm#icomoon') format('svg'); + src: url('fonts/icomoon.eot?9dpklz'); + src: url('fonts/icomoon.eot?9dpklz#iefix') format('embedded-opentype'), + url('fonts/icomoon.ttf?9dpklz') format('truetype'), + url('fonts/icomoon.woff?9dpklz') format('woff'), + url('fonts/icomoon.svg?9dpklz#icomoon') format('svg'); font-weight: normal; font-style: normal; } @@ -48,6 +48,12 @@ .icon-bin2:before { content: "\e902"; } +.icon-control-date:before { + content: "\e936"; +} +.icon-control-date-time:before { + content: "\e937"; +} .icon-angle-right:before { content: "\e931"; } diff --git a/src/Squidex/wwwroot/images/client.png b/src/Squidex/wwwroot/images/client.png index d234bb53c569495335474ebd658d564339a74f83..e50f3c93b61b4de97d1152663a57ac6466ae7a00 100644 GIT binary patch delta 876 zcmV-y1C#v51Na7z8Gi!+005o0f$RVP0JKm{R7C&)0Mpyz)ZF9K+v3#P;M3dV)7#?H z+v3yP2cz)B{xdCYjMTR(}IhUWo>iD&egHGz=VyH!O76Hyu+}$zkY{}c!7p&b$e)Wcw=mG z$IsP}Q!lyz001d;QchC<><-ivesj&ljs@^mQu+4Zil(7~Bc@(7WFh+BytFVT%E`91 ziilZPtEq9u0Dk}iN=ZaPR9M5Mmuq*TFc5|l<)Rf-kZSF1yZ4=uTWQyJ-T(i;_MF8s z5Ev5V`IeKs?;(?9W)K{fXNT@uE|+rcZf)NZgSeSbL18+-F;!0-Qa3%EiO^$35?ExU z-O5fvFVg9iU(Z0x?3&m63ou~ear!wJGVhdMgYzktCkZUr%e3z(694<*0<9G-!ry=GUv9|;DhvPAjHPt_$RgA|W{ zp_BZGsefV+R68Jp7;|7qFjfp)AuJ_8Odz>=OL*f9d=UYWl;KxzHI2%{NPw_KNQ0Mi z{MB1cBRUI8EG`WSG&8`W9>p~cvYNs3fwn*+EXinQEhG()3>5ekQY^T0X|DlyjN6WjRPu%uZw-SiC(TCKKz}4@tT%{@ym6KNzLce(^My6ez$z08 zp-CtwXySI%4nJ zNUsNB#yF{oGC)De64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<_&ojqL~ zLn`LHopHPOu!4YVd&d6QMs5SufX3a0h9%804b}zhc@1o4`vaHUJ;8i&&p%!{FZcGg zd3t$4USVE^UwQAbPfV1EVcyprwR-jZYSt}$ce<~2UXXO)u1Mc-{nYDSOkSF1zLSqi zk0++3J+`>D@BRO6|3jaj*^&O+ezEa_^o?^i>z+{n#%WgRFSoLOh;I1TcR}(()Pt<~N765HW#~G*PyEYmvIyuZDOLwu4*#O` y