From a786e63059af7312465b14c6f152f20207ba0fb7 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Wed, 14 Jun 2017 21:30:34 +0200 Subject: [PATCH] Some style improvements. --- src/Squidex/app/theme/_vars.scss | 4 +- src/Squidex/app/theme/icomoon/demo.html | 4 +- .../app/theme/icomoon/fonts/icomoon.eot | Bin 17200 -> 17208 bytes .../app/theme/icomoon/fonts/icomoon.svg | 2 +- .../app/theme/icomoon/fonts/icomoon.ttf | Bin 17036 -> 17044 bytes .../app/theme/icomoon/fonts/icomoon.woff | Bin 17112 -> 17120 bytes src/Squidex/app/theme/icomoon/selection.json | 47 +++++------------- src/Squidex/app/theme/icomoon/style.css | 12 ++--- 8 files changed, 24 insertions(+), 45 deletions(-) diff --git a/src/Squidex/app/theme/_vars.scss b/src/Squidex/app/theme/_vars.scss index 968d6952a..d04a52deb 100644 --- a/src/Squidex/app/theme/_vars.scss +++ b/src/Squidex/app/theme/_vars.scss @@ -12,8 +12,8 @@ $color-control: rgba(0, 0, 0, .15); $color-input: #dbe4eb; $color-disabled: #eef1f4; -$color-extern-google: #d34836; -$color-extern-google-icon: #b02c1b; +$color-extern-google: #b02c1b; +$color-extern-google-icon: #d34836; $color-extern-microsoft: #004185; $color-extern-microsoft-icon: #1b67b7; $color-extern-github: #191919; diff --git a/src/Squidex/app/theme/icomoon/demo.html b/src/Squidex/app/theme/icomoon/demo.html index a36e790b2..a62b67de5 100644 --- a/src/Squidex/app/theme/icomoon/demo.html +++ b/src/Squidex/app/theme/icomoon/demo.html @@ -21,8 +21,8 @@ icon-webhook
- - + +
liga: diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.eot b/src/Squidex/app/theme/icomoon/fonts/icomoon.eot index 1e55992fd86a3146c807fa9d17fffcf2a4896d0a..fa1ece3820bea7b59349bd89448e0a581a05f1cb 100644 GIT binary patch delta 593 zcmdnc#<-)6k=4SPfnmx-R&$oG4%aIuI+WLIFfcIe0pf(@+{6O$uuCTx7#L-M{E+m- z;sPKo0OW&cj`W<$w7&Hh&I9=s3=Fmb8L5dW{5pr285rz%1s7E3vKRNNw%{Mz37#wVX@_o696$K2jYK&1pfipk>g}lVv)R|tK zzk&QWKn-mL`Nbs+K;s!0oJuCgFuF53PF})jt!)7m;9}rlU;;u$28EZ7|Ns8~4^jnW zGl1EQ{~wF90Ch5M7Gm0Nr2sVI|7#$BDuX^lJVOW2XeB--Q4uk5b}dF_B{tE?ns%zJ z##W5R;*$gHl(`xCm_BVqsBpjxbU+HC1I~X6#fH(iC$|Omx+77PnDKvNDQrRs%_kX$q&ZbDF6BTdD4B zC=C+P4Y1SXxXZ0A4Kh+%oBQ8Aka_NABFt0O93za(;uLqAsDR{nBP6+gh=_UVxF#gH za*J{a^UL!aML4R>Fi}-8`6R@}o#^74peSpgX$aD17~!PG$-aeKici(#-w7@qJ8vzJ zVtI2fZE+cp4jC~ukU^G_yk47++c+^QGlD~oq4K)J*LZ%LuMFHQV1cXYb_YQW5WTs> a-k*_?Ve$=!4mLRsIX$@*o6{UmF#-T|G?0A& delta 604 zcmdnd#<-!4k=4MNfuUz2t2qm6jg9BzMn{o}A<6Zc3=9l=fH)yJH?iPl-77r?21Xem zKPEk~xBy5C0QnU_nj<}@GA*Qn zO`Yk*`5VZ80@Tn}kY8NFzzmdOaLSn+!|2ZFGx+HSR3*Uo`aftewcL7Vvib0~v8LkvSB z&>kf|CQ%VFadtjNQ42=H$q#K*ndBKKbK5F&u>yred4D$Gc&iVNGo}pnt3rX1v9fKS^4S6Ypcmtsq)DSntFSi%9{u}%Y_+(^e9>R>If?E z2eYu~$p3rb8VyqGQ^>!aOF>v(TU%aOf$QI2kU?fzV$7k6KuNs-*;!25a`HMl@*D!} z_rwG(l})|ty-hg;*~NIJ`E>lO6uWffWwn@Zi*j&yo0@t{iJ7WugLHzV*jT2p3v$Zq z{1Gbl0`ZeP_=JEi))C^<202XEg*zA+RKQ>X0Z*G6)_8uKuMFHQVE)yVsdqsP2>pLM ks{`{{AQu?io9Ed(GBSove&Eo-CR-u + - \ 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 33a9560d3a398a9717769c3147e7a390fb2b74f6..ce2c5f39914c6c036345e78bdf404929fdff63eb 100644 GIT binary patch delta 593 zcmeBaWt`H=SkJ)7z`(%G(7?dVVBjCDZ^SRerU4Y$1H=i*xrqhhVV6!YFfhsh`620v z#RWiG0LTZ?9O*fgX?^Q2oCoqN7#M5=GEx&$_;n63Gcecz^)Q%a00lUiSlt;I?15Yc zm5khyihs%cPC&j2P>)1TezIlapPO%XFfcgS02TD*CRP+M#4<(!`DcK9g}lVv)R|tK zzk&QWKn-mL`NbtbhXR39$;2J*jE<8St+g$HTrLI<1|}e6WKekN`2X+!{~$F$HUpT= z`2Vpu3s4{9<~+vjRti7^{=WwDr!wd>#4~gN4OZe~5)}~>XV+p>R$>#K+-j@JYHY=5 zEIxUStui+wAG4^49Fwt;9n<8Sw$k;yMv+cx`f9~YEX=AVCaS8Y9PBd`RCJPDT@#s^ zyjWP&oFj}>O-)r9nHf73g*3%n6BAuEoW*UFlB|p(oYg?mVw%FK?3^a5|5mCy8%l#j zbOY=(Iqq_6OM{G**5>|q4`iOZnF#Y#HOB}evpB`wCMqB~-UvyqA0lF2I<5%`uH2$r z!u<05MiGu`GfY%fOg;&5aVNUCCMe1pXc~g_8Adp%ak6jWmf}-2`FDa#$Ie>|q*&hE zOIut9q(eqb4P=mIB(K+IWg90(Wl(Yeg39X-U*q|0zA|vLfcaO`?GAz%AbRr?JAXz- WhRG%l9c*$Oa(Z$rHXm|0#Rvc@D~$^P delta 609 zcmbQz%GlG&SkJ)7z`(%G(7?dVVBjCDZ^SRerU?|;1H=i*xrqfY>t5+GFfhsh`7!B< z#RWiG0LZTZ(j4hIm1&_xxyyn41_lOOhm6$36n^yrYX%0p13-DR44?of6RSIr{{zTZ z$;d6K_?OH-oq@p~Xda_PPJXgw;vdI1H4F?6CO`#!xrr4846%$+K>iURUm-6sH+7~L z=WihY2~a~@L4I)w(4j!!lrwRMJEPMiMr&gSAeV=MgMo>G1?U-tmv%3m{{Q{|AEXM% zV|eKR<}v<%EY2d%4Ac$u@a8ne?N*yRZ5EJDw3!buhcf6h#4t1hZBgQ55)}~> zXXj%SwO}-yY-^*+B+ocG-A1{d6(}Sk$7F0|W^OFU2&7C+)RdLj*cC-Z*p!vjOij$p z)tN+fe65sJ<>O>Eb>!u>nVH*Fq?No)&AgbHf|*&Ato(H3wbf*+RQcouO})KMg z<-&|XdX%hubp#dogIQQ~=z9eEA`_IqN2mdYSAIRx3oc%}Jt{HzqabmV2Vm~V@6aCn=VdP|9!s%nEY zf~443rmzcg%Io|QD)s{LlRWr@fG*Y%;?o8hqU*vP3=BX}>Hq>yn;O=5aekYx4BRYW lfvYJ~?}8X0dh;7Qe@4d8$uDq>Io<5-g@KuYaq}+5?N$oR3=IEY1Nl=K^cmtAfUaOv;$spO5ff+EVpLXQ z6PQxh|D zbtYb;NGCOYwPGd~W>pgtRaH|C_8AH)I!UgsiOfu1EG%ly5k{(}rmBq0jGc-?nqsbr ziLM&X;x{1suXx)9ns|7$ADHfxSN?Bg5ndhYmJ54mmx!6`T1SPcZ@j DAiI^> delta 630 zcmaFR%6OxdQKa18&5ePP0SKIKFmQwEo{1vb^_t1Ki3JP{j2S?o7!ZD0_ew84u^1$F z1jy%rVuAFW$~2(Z83qPh2M`V|%3Yq3nwY}CV9x_oV+O+f>IK#rKtZ6G3y`k@!kkR3 z?isly6+khd9gGqn{4be*dQN^aP@SDa15i;P2>)?>QkTL=EcMm%*>)><)g{bRZzAX{7iJ97qh#f)BdEY1%)+80 z|L=ioG)S#aA^&zR1z~w@ZFyk@u77_)2AOGzF^4JwCG`SiXEABZ$?NFIa|p2C6BD#l zHubLeHsugx7vq)Y)A6%X?9!2!)ndLa%E94nYU(W|W~!-UTrr^#ARw4$NnP fTwri-cC&Y6WDK3$;n2Y*TOs>NZoy_T$5V^|Lm7?G diff --git a/src/Squidex/app/theme/icomoon/selection.json b/src/Squidex/app/theme/icomoon/selection.json index db5683f9e..a5ff7503b 100644 --- a/src/Squidex/app/theme/icomoon/selection.json +++ b/src/Squidex/app/theme/icomoon/selection.json @@ -4,49 +4,27 @@ { "icon": { "paths": [ - "M533.333 106.667c-117.245 0-213.333 96.088-213.333 213.333 0 61.134 26.685 115.834 68.25 154.833l-94.167 154.625c-39.217 2.486-70.083 34.901-70.083 74.526 0 0.006 0 0.011 0 0.017-0 41.236 33.429 74.666 74.667 74.666s74.667-33.429 74.667-74.667c-0.036-10.883-2.395-21.206-6.607-30.511l135.732-222.197-36.083-22.25c-36.583-22.574-61.042-62.78-61.042-109.042 0-70.958 57.042-128 128-128s128 57.042 128 128c0 11.262-1.445 22.111-4.167 32.5l82.542 21.625c4.532-17.302 6.958-35.478 6.958-54.125 0-117.245-96.088-213.333-213.333-213.333zM533.333 245.333c-41.237 0-74.667 33.429-74.667 74.667 0.001 38.61 29.307 70.375 66.888 74.265l122.028 218.319 37.25-20.625c18.35-10.175 39.289-15.958 61.833-15.958 70.958 0 128 57.042 128 128s-57.042 128-128 128c-40.531 0-76.322-18.729-99.875-48.042l-66.5 53.458c39.082 48.64 99.386 79.917 166.375 79.917 117.245 0 213.333-96.088 213.333-213.333s-96.088-213.333-213.333-213.333c-22.149 0-43.176 4.328-63.375 10.667l-82.917-148.667c4.779-9.533 7.591-20.768 7.625-32.656 0-41.248-33.429-74.678-74.667-74.678zM245.292 497.417c-92.061 23.803-159.958 107.702-159.958 206.583 0 117.245 96.088 213.333 213.333 213.333 102.14 0 184.181-74.359 204.667-170.667h182.167c13.648 19.418 35.938 31.962 61.161 32 41.243 0 74.673-33.429 74.673-74.667s-33.429-74.667-74.667-74.667c-25.26 0.009-47.586 12.559-61.092 31.763l-258.908 0.237v42.667c0 70.958-57.042 128-128 128s-128-57.042-128-128c0-59.839 41.032-109.746 96-123.958l-21.375-82.625z" + "M524.792 42.667c-133.751 0-243.208 108.454-243.208 241 0 72.755 34.012 137.024 85.833 181.292l-115.167 187.458c-3.016-0.305-5.946-0.875-9.042-0.875-49.392 0-89.625 39.845-89.625 88.792s40.233 88.792 89.625 88.792c49.392 0 89.583-39.845 89.583-88.792 0-17.952-5.505-34.638-14.792-48.625l152.208-247.708-32.458-19.833c-47.549-29.077-79.333-80.999-79.333-140.5 0-91.263 74.283-164.875 166.375-164.875s166.417 73.612 166.417 164.875c0 14.491-1.921 28.493-5.458 41.875l74.292 19.292c5.167-19.548 7.958-40.089 7.958-61.167 0-132.546-109.457-241-243.208-241zM524.792 194.875c-49.392 0-89.583 39.845-89.583 88.792s40.191 88.792 89.583 88.792c1.932 0 3.765-0.422 5.667-0.542l136.375 242.5 33.5-18.417c23.855-13.109 51.195-20.583 80.458-20.583 92.092 0 166.417 73.654 166.417 164.917s-74.324 164.875-166.417 164.875c-52.606 0-99.199-24.144-129.792-61.875l-59.917 47.708c44.569 54.969 113.29 90.292 189.708 90.292 133.751 0 243.208-108.454 243.208-241s-109.457-241-243.208-241c-28.895 0-55.96 6.577-81.792 15.833l-101.333-180.208c10.44-14.518 16.75-32.153 16.75-51.292 0-48.947-40.233-88.792-89.625-88.792zM182.333 506.958c-104.909 26.881-182.333 121.59-182.333 233.375 0 132.546 109.457 241 243.208 241 120.157 0 216.178-89.065 235.375-202.958h221.625c14.445 29.878 44.991 50.75 80.583 50.75 49.392 0 89.625-39.845 89.625-88.792s-40.233-88.792-89.625-88.792c-35.592 0-66.138 20.831-80.583 50.708h-290.625v38.083c0 91.263-74.283 164.875-166.375 164.875s-166.417-73.612-166.417-164.875c0-76.963 53.266-141.381 124.792-159.708l-19.25-73.667z" ], "attrs": [ {} ], "isMulticolor": false, - "isMulticolor2": true, + "isMulticolor2": false, "grid": 0, "tags": [ "icons8-Webhook" - ], - "colorPermutations": { - "233309915571791": [ - { - "f": 0 - }, - { - "s": 0 - }, - { - "s": 0 - }, - { - "f": 1 - }, - { - "f": 0 - }, - { - "s": 1 - } - ] - } - }, - "attrs": [ - {} - ], - "properties": { - "order": 80, + ] + }, + "attrs": [ + {} + ], + "properties": { + "order": 82, "id": 0, "name": "webhook", "prevSize": 32, - "code": 59714 + "code": 59711 }, "setIdx": 0, "setId": 2, @@ -72,7 +50,7 @@ {} ], "properties": { - "order": 1, + "order": 77, "id": 0, "name": "github", "prevSize": 32, @@ -2016,6 +1994,7 @@ "bgColor": 16777215, "classSelector": ".icon" }, - "historySize": 100 + "historySize": 100, + "gridSize": 16 } } \ No newline at end of file diff --git a/src/Squidex/app/theme/icomoon/style.css b/src/Squidex/app/theme/icomoon/style.css index 8944d4ec1..4fc6d091e 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?xczofg'); - src: url('fonts/icomoon.eot?xczofg#iefix') format('embedded-opentype'), - url('fonts/icomoon.ttf?xczofg') format('truetype'), - url('fonts/icomoon.woff?xczofg') format('woff'), - url('fonts/icomoon.svg?xczofg#icomoon') format('svg'); + src: url('fonts/icomoon.eot?rfek6n'); + src: url('fonts/icomoon.eot?rfek6n#iefix') format('embedded-opentype'), + url('fonts/icomoon.ttf?rfek6n') format('truetype'), + url('fonts/icomoon.woff?rfek6n') format('woff'), + url('fonts/icomoon.svg?rfek6n#icomoon') format('svg'); font-weight: normal; font-style: normal; } @@ -25,7 +25,7 @@ } .icon-webhook:before { - content: "\e942"; + content: "\e93f"; } .icon-github:before { content: "\e941";