From 0ec64098d977834d951186c8a149ac19bed4840a Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Tue, 6 Dec 2016 02:28:40 +0100 Subject: [PATCH] Update style --- src/editor/config/config.js | 2 +- styles/css/main.css | 18 ++-- styles/fonts/main-fonts.eot | Bin 4290 -> 5798 bytes styles/fonts/main-fonts.svg | 174 ++++++++++++++++++++++++++++++++--- styles/fonts/main-fonts.ttf | Bin 4120 -> 5628 bytes styles/fonts/main-fonts.woff | Bin 2116 -> 2700 bytes styles/scss/main.scss | 16 ++-- 7 files changed, 179 insertions(+), 31 deletions(-) diff --git a/src/editor/config/config.js b/src/editor/config/config.js index 5770ba2523..2d0487aa9e 100644 --- a/src/editor/config/config.js +++ b/src/editor/config/config.js @@ -215,7 +215,7 @@ define(function () { id: 'quo', label: 'Quote', content: '
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore ipsum dolor sit
', - attributes: {class:'gjs-fonts gjs-f-quo'} + attributes: {class:'fa fa-quote-right'} },{ id: 'link', label: 'Link', diff --git a/styles/css/main.css b/styles/css/main.css index 6df66474fa..5711672c19 100644 --- a/styles/css/main.css +++ b/styles/css/main.css @@ -2570,8 +2570,8 @@ $fontColorActive: #4f8ef7; /* #515151 */ @font-face { font-family: 'font3336'; - src: url("../fonts/main-fonts.eot?v=5"); - src: url("../fonts/main-fonts.woff?v=5") format("woff"), url("../fonts/main-fonts.ttf?v=5") format("truetype"), url("../fonts/main-fonts.svg?v=5") format("svg"), url("../fonts/main-fonts.eot?v=5") format("embedded-opentype"); + src: url("../fonts/main-fonts.eot?v=20"); + src: url("../fonts/main-fonts.woff?v=20") format("woff"), url("../fonts/main-fonts.ttf?v=20") format("truetype"), url("../fonts/main-fonts.svg?v=20") format("svg"), url("../fonts/main-fonts.eot?v=20") format("embedded-opentype"); font-weight: normal; font-style: normal; } @@ -2584,19 +2584,19 @@ $fontColorActive: #4f8ef7; font-size: 5em; } .gjs-f-b1::before { - content: 'q'; } + content: 'Q'; } .gjs-f-b2::before { - content: 'w'; } + content: 'W'; } .gjs-f-b3::before { - content: 'e'; } + content: 'E'; } .gjs-f-b37::before { - content: 'r'; } + content: 'R'; } .gjs-f-hero::before { - content: 't'; } + content: 'T'; } .gjs-f-h1p::before { content: 'y'; } @@ -2605,7 +2605,7 @@ $fontColorActive: #4f8ef7; content: 'u'; } .gjs-f-image::before { - content: 'i'; } + content: 'I'; } .gjs-f-text::before { content: 'o'; } @@ -3898,7 +3898,7 @@ ol.example li.placeholder:before { float: left; } .gjs-am-file-uploader > form { background-color: rgba(0, 0, 0, 0.1); - border: 2px dashed #999999; + border: 2px dashed; border-radius: 3px; position: relative; text-align: center; diff --git a/styles/fonts/main-fonts.eot b/styles/fonts/main-fonts.eot index 5882dcaffca0478fb7e199049fe25c02946e6143..b0a083bf024b097c85282e807b58b9be4e9d0d56 100644 GIT binary patch delta 1837 zcma)6U1%It6h7zPnc2-wc4s#GgC();X7jVP3C7)Y8)?NF8l;qB6JsnY$ab^s2D8bs z*=X8_?t_tnEn*yz6hZQ!X`T#Pt)NlCJ~Wg*h^^W7MP5S}xGywFabE*8pvwLmvjGa$#aB;Y_2$VkOcDgBawrH!|7C` z9(k9}3*`g3)L0(d;19CjN9(Oasa&RR<%26T05u}uQhs=(xaEsC`T#<0wBeF*1fz{X zK#~a;J&R|b*LMF2szeHat1nzQd7B&W<0cFm^Eiv0#u)1~-eGkFxA7?pq^?;W0KNfk zNiD=ZK@IV}4urnTf$+4?f$-SvfO<%Y+0cmhI-pRLtPLOWi~~k|z=n@*3RDXl zs*#t{+p3`hW?%_B@FP~wd-x>3BqgP1qz|R<~*Huc3tJdWA&BwMD!d}$TwF=1boW99;D zG8det*xeLOc@&<2C+T&nSMJAPco)W#k09mLXs;8IyVs>VipZJ+%^MZr43i`_CrJ4{ zLGc$${@#*%1U1hKdPtC&wKIj=Id9~WM1;?Cev-rzQU2DddQ~c{n?Jj7B2&d0z$j(O zBcTX)(I5oF@nm}wWob`DW#``h895Gpa^Um2=H`xA%p9+{SIHjs@p2#H{!^%k4IRzT zt&2@xB+)g44T1`_H2pMuR9~tdRaX>uUD&@}E?jcC%oE}@;2uFuiT!5Q;1w2S^qL{U%3cApZRp>z#tI>--)KEu1)?fgG7&2bfcN|a- zj~0u=L+)ZB-#U^>7nNa)x%&?fT7oOFv$a6_s%)lUn_L6A)X_}qh;!1_Kk(u}f2JVn F{vXO1VNd`7 delta 488 zcmX|7&r2IY6#m}KX0z^w8h<4zDoxLCTPS&2;M|g zq%s6N3W9hjinT{ixm0^94fG_&ga1Kk4uLj(yJp^+p(og%9+! z*3P$T2btZ?Z`lEW_5i%fx^^ji6|Dn;%S7Z|p}Lr!`}G3QGJsLYIrdw#K7Y)$_l$Io zh2VSnk@G7?GUt{nDNeZG1BXi1L5#4e2dnkGF>r;muEm zp^oHh^;ITD1areL>oZA1Ajs2nHK}clBjn55euVb~9?^qmTKWq^%?7ej{tHaw6djtT sPvV(;DG%irEq(bt;2M{$!MKcCBuJ7*0n#Z*2KA9i7KKzYG9|gyAGH) + + + + + + + + + + + + image/svg+xml - + @@ -154,18 +213,18 @@ transform="translate(0,-52.36227)"> Borders: 20pxBorders: 30pxCanvas: 1000x1000px + id="flowPara4179">Canvas: 1000x1000px + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/styles/fonts/main-fonts.ttf b/styles/fonts/main-fonts.ttf index a93ed4513282c7124c84b47f3dc47fb101a36346..4399759ffee5241e01d260bc77461ec79ff7cf9a 100644 GIT binary patch delta 1827 zcmb7EOKcle6utMo`8XasGmbwLHKcKzI4(&<6sK-bftIKds!Bx@LR#^ao0vKxP9n#F zwu^c}P?4xm%OI4BO%{A2AvJ>XSzusMsZ>>k5G|-msMG}u#7`i~FX=ekHy+g{P8WE5 z?z`{a_wIjYw(&;WiEw^l*av{e0bpo2lbpPJVaE*s)=jv0aP08YznM8NfZPt?b){3u z5$)?Cb}S!+JYZZl7_+BlMhdT5}hvEqqB zj2_As{AAk)UeL);Ek*1C&3uvVZzqk14p2+%pI7MVK;=)Q=OSpPho2g~?x_5<_ByDe zb*BR%?{gq5?{XkK^gEyiQ;H?%v<^BT*OYb%wdQHQu_i-10nI$ehc|nm2j*cJd+>eM z#0U5+zaS-~N2T|qZ{(0XD4$mprAL_oII}~_xSp{4!e3=8lr@FrZ&HH3KqwyWN^J3U zM(4%G6lCiD$HJ%mp)>$}_0}Zw)+skalyie)MPm7HI z6vke#Ej};yma(*iM=)KSWh+#P&+Mw)FZ5+TW-YR)wdi!AR0Pq5?eGvhOm9$=at8)N z+psHfFH%=qN_)}e%6pEkBrRRz?UdS<`>9OKJ&gYq&{Ovdq@6>-B z$!oeOi}cr#{h%ne^W$P>xXYd#SvdEu5j5Wn=P_Ng-_rucGRGdM+?{#H)4(?ekWn2a zluX>qFsw1P%j*g_VqVE3!YOYq+ delta 414 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 delta 1603 zcmV-J2E6%<6~qt}cTYw}00961000O?01E&B000mekrX|D(qj>0ZDDW#00D>q005u> z00I^eycd;cYr@&WR*8$e@U19 z6<66uS_&dJdPXK@mTi;Y?1AUU{z_1e>4~!xWw#{N460busD4yXf8;k(h&JC+7u0~i z{}*z|=jxWGuBq-=*S%xi4^9$y$KoH3ZEke5RqbWRwmmtGm>v58ixb~&o)%wQVc&0lzwZri zzwevhdjkma;tv!F07opt;tzI4rD8$+eb#~`i~*#ITG}u(j#YJQ#_U8%wW?B=tfEx! z=!t~R9use@S>gT)%;x^_>H>>d^mB zA^pEKfCqUs30@^w3t6+BYLl@h!@?TpYa9!KVy#%j+Z3^wU``}9h#Sn?WQ;ki_by9Q zg8Dw_^lb|20Ju-@%KOZ*rzlT6N9f_qJp@(|n|FbZ?FY zC_!al|GRlPe?|$VJKoZwQSCPojfyJ-xI)@f?%&5H{M=t=t*G#R5V|f{o#wmT^zO15 z?{4S)cl*m1$JhpRNz;DfT5{dM?!KYzZ!6r~NH5#V!#-Y)@f5&B;e zen&9C%g-vj%;i<)N|)VG_)VfWxpJ=?l_je|-S36Ie}4wf230>vB~Ps1q*U-vLSG}~ zLxekz4(9Bk!j_3FGvyD3XDRb6S1v1TlzJfHa^EPGHPYGBE1lXL>G}qofHQC&F2URI zA$$T~z$$FO&+u!wAG&+_fW4k2@9mDFW@f7H?1Z{YtX4jY6s>;3B2rrUe4TH`9 zG|g6Y;jdCAxF~cM)%;b;4HqfY(3%n$p;A&T*`}4Kz%lO<~%qm5P;#n&DJ4*-X}{Jc^9)(r9Y>bkwjj z7|)cA#EbUKkgkphK7MO*CZhRnHJKeAP7T%Z$I(N>dQF}{A66^!B|Q( z7S2YJ5pi#?lokC2%=}K=004NLV_;-pe_#OO+WVIK;`wd9GH|mnfWYPBU6+w*<`-ab z4hAL=1pr9N3hMxPoMT{QU|?SMe;ES<3j+u+zhGcwKn2_YS7`%F0001ZoMT~NU|=B< z0{{d}04)Fj000aCH~^>s`T;lrv;ranQUjO+$^q(0BVqErv8=J#D;{fz+oG%NH?qCWi!l8v5rT zAfcdPU{Rq)1BaGW?7L1z?`0g`M>X@2<=k)9$1o*6^|FS form { background-color: $mainDklColor; - border: 2px dashed #999999; + border: 2px dashed; border-radius: 3px; position: relative; text-align: center;