From 569a1932cbe33a0f7803e339ebe4ae5fb171db47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Fri, 4 Jun 2021 09:50:24 +0100 Subject: [PATCH 1/4] Update cptools icon font --- .../fonts/cptools/fonts/cptools.svg | 13 ++- .../fonts/cptools/fonts/cptools.ttf | Bin 6320 -> 10000 bytes .../fonts/cptools/fonts/cptools.woff | Bin 6396 -> 10076 bytes customize.dist/fonts/cptools/style.css | 85 ++++++++++++------ 4 files changed, 67 insertions(+), 31 deletions(-) diff --git a/customize.dist/fonts/cptools/fonts/cptools.svg b/customize.dist/fonts/cptools/fonts/cptools.svg index 776b66ba3..08d0c5040 100644 --- a/customize.dist/fonts/cptools/fonts/cptools.svg +++ b/customize.dist/fonts/cptools/fonts/cptools.svg @@ -3,7 +3,7 @@ Generated by IcoMoon - + @@ -23,9 +23,18 @@ + - + + + + + + + + + \ No newline at end of file diff --git a/customize.dist/fonts/cptools/fonts/cptools.ttf b/customize.dist/fonts/cptools/fonts/cptools.ttf index cfc9d1e3ca7d09f1e53675b85c93b2bea7528e87..88ab53d943c0aeec680fcd563c2aebb03b5580bb 100644 GIT binary patch delta 4361 zcmbUkZEPIXao&4-yZ7PSy|3M~liZ!{v(HJBJL5b1E=@um+o^FOj$>m{8MV#1iDO6d z$Ca4Kp|p!o9R);GiYXzYs!#z7Dv?mR?JpFl5(%VAZ58pORb3>Cs;W|@R>hzSeCN*F zy*uyOKAW<4Z+GU+%zN`@=FPnKM%&XTbRYoWg2#ZtT?6;GCKaDphdpm%%buPZ%>^I0 z^D+S0gZS|H==mIeJ&5zKeSGrb**E6udl8=lXnc8MZ1haX`?HS$nmB)Y0z0Jt3i}Wr zM!acaYIg3C3${ZDB0pT7oH^Y!`sD8(e+r-(ap;{Ioy$Qh`32&Ah}Tb#PK{l=*YO$R z6FAAG+|2n|R1}}szd0QkyYr*BJ4xsna(Mqi>~Vq}DE= z%9EvOa@C`|;6XUS{?7J76O6)7;W{i6LSp1Tk|U3i>o{S1td%54v{6(@OYticHK0XE zn52^FPVyDfVdG301gbMjl|n&NSm)9WUsRe4qkj8IqZlFq?J!BEJ2LGt)KwBo`k_|% zPbD=qAfgUszVGY%~!^GJZ8m^An85nrP{wvo`pkY|YIc*h;4G z5fucAY61M#Es#BQgAIYqle5Q4HqMH|j93t~VEa?QDo$Kw2544<;*+fxf4 zm9#!<1XVF|`uRxnmblu2+J@xWqKz3V=^DTYaY!iblq82>(`1Q>xJ*=e7oJg*CI#HaA?v~TkDzSFZ#o+qlnMPqp0x7)^xoTX6OP348X8Z%l4ODFaWb~4Q|4R zh9fEryRmX?%)02P3jQjN(YG&+ILprU^K*HxN)^&8OEH~a_a2!k+7=CL_3AnY{mVK> zQ#r41DjT@}v1}BslrsZzl=6;lRu;};NgWmjE4^^d2q+#rM!aAgm1Y2Cj&n;u;1kcQua3xgRUVb~OF5+RV2KwM@>{FIO zs1}b>cfs9oFMJ(NLk=E=%kV6Kzfr_f6IO3LB=H1LMy#;SIHyD#V;$}3poOPGpc2tl zi;S(BOtndV6+e13&KsF5LZq_@tbV5W{fg}O%bR%Cx#NoN^C6QjpV`D!9;q;19EoMj z$x5v2-{U?-!GRRt&HtA}Umv93FPjtbbSxPzSwWZZbbJ5~!dGDkzP)ooCRQ6-ja%Um zZ;4Ci{>0o-k<_ba+ST8b^xbIPQa|goW@fro{v@xJtaRL`Z!}!tlM?Z8InAOqy4U_D zF!lmyXpK0uK?i&pgVYF1Z_3+%;dq#+DO`+^uJC-$5BR|-KkDneW6zQ&uyj81IxnM& z+D9d?0+ZV&X041UULWL1Mbzo8kDd*@UCCZ|JSCMWZLvsWzEN!8E_iV2)^!_!UJ@cle`f6t4|972bS;rP~fVE|}UFm?YW}4D%-qu~DFPvx>-5i7k`?aT9TSfv26huqvoA#Knn#wM37;pipY+y85{Fv$ zg?2|=ez#no?2}~a{&HB;%$@GOy^`B5Mvg|>e=Ip1=Ba{Amk%B24&$-E|I+VIDMvmA zmtf$_@89U;fcag!EuPvgQ#Z7|ad52CaaTN>M-(R#rx^g<7| z0c?H6){Wo6VjEfbrS_%0&gWetLIM7OwG(p!#S)VGZ+Um_?uq%ZLnc@OUjm=Lu2C)PmVr>NpB3s;bEA>3;sh} KaxNUL&HWD$7=ZWy delta 675 zcmZvZPfQb05XQgPS4;nhMR(g;+e3{74H{H598gml^(x)c>|RW9vt8PdZo8o+)QfQ9 zjMT=HhAYUyq=W=xOf`gf^kkx#XyQTlu18pBs|ON0o7vg#H}mGrd%JS)<<&(n00At4 z`81 z>|X#vzbHReBGC7ae+I&rNGD51y)pI5^@MbWbfH|;((1T7l_Ri4;JTqUOe7hN6#hv% zQBe(jXLdLSM7*@gvRSRwX;8A$D^4DquRZRhSZI~qxHduLIJ|JdO@~TYK`Ue**fvqB zv|yd=DrSF=xFejp&@Sy6_H>}V9zMbQ681;_jc+vHM01O8h1hK|9v7cw6s2-LCCi!3 zj4T@$CKN^5loZ+MvRS7jE%dkgM})%ytHgx8gXippC%{|W!{5vf y?uIn8UagjE&|spDDm`V?niq%8=6Ys&!mM7LFROFNLPrtv)Ir5u&&uZ7kogDCeWH>8 diff --git a/customize.dist/fonts/cptools/fonts/cptools.woff b/customize.dist/fonts/cptools/fonts/cptools.woff index 80432d647c818a554ca3f80e53c7bc5b7a2c8429..320f803e6ad92cb55647ccdfc027c127d179a393 100644 GIT binary patch delta 4429 zcmbUkZEPIX@y&aCyZ5>Gxw~h=-Pyj_PMX}g_Stu75^!Rt#sxbju0>@;n{yL?M6zR- zm^7iZTcJ7vl!&%&2@zG57O)Bu3CJx!Dil)168vhbh##%$BBiLRkSg^D236p@>%85& z^WNEKQ}%9l=e?PEZ{EzjnfKP(R*r_gJJ{PxfZ)^e2yq!--@=`6_$PY$E&dUTc$ zn8f~J4%$PvUz!*_!~5RCw!H|xiK+AB*tbkb<4YV~KUd#7IW~HdkeysM%^~9d^~aOg ziG5eGy_19VUt#y;^xQc_QIc@^=4$u7Y$&1sY=WybtpJBV+ zfL3_p^yu^$_Wc$ozrf+j{f^IOXU@#wat@aH7-EdwUT{MfL>Bttz@B~B<3#l-{(#hf z7%Aim1?)O(ctl3XJz0MHB%z%2X_uHn=j z&8?7xc%$frmf}|iC8Wk63aR#V7u*Y-HqMkmq&BluDWsXgI+t$vqS9O#_1goDVgy3! z0ccNmW;&WtS4k}Chg#u3)vhWb5p^i@b)>nzdQ)wU*OzA~xSb9BUt}bmo3+w1s1=&C z)|%Q?wE5O+qQ78Np*F@uI+mm&#jir~8K5G=<~(Jvo6=;G_vtEUw6R3e6fhV~l7j5a zMw1C7<5#6LH_2!sL0Nftlv*DiDfn`W$1X@xS{FVH52PZJf|5_RF7ZVa%yfC4ZO zb%`;D&Ed5>oGRmN4$&3PT{XwSS;tG`FiP2gspCAQ@Sugm(2to*G;!qEjt&C`ht8K) zW0D-8&W7TQamC{v09t1%E=km)cQY02l1pO(4u&gcbj)fcoQa~L zOvGh+1W{3!1_A*lc?y3P(rjsATp8AHD$xhjSWLY>lFgpq+nddfylrB~kB{6K$sRwy z_de`9%USvq@5|nllHUi{$pG%)^JDoAQOjzB&G)&u$(?d_EpU`A;^d>!mP57dWuC z4hvznr|g13GDohE8{`AS5fz55t{l}_7adi>U&Ar_)};|=*}i^$F7MT-LV9H>rt|CG zgPEdj(ZE)(u5-}8uXF4y=k*O`1NT3cjr^r@WI) z7mTA)Z7K#7d|C`W%@0qM(dWw8<#NCnQ8VY$F?Qer&rr29Z~ot##?DcmnJ?fEi-h84FN z=ahJ3b7x0dv+z_1R5o~WncfzX& z0>~7|Wj1h?N6JqWM`9UsvJ&h1w?E+Z;y~WOjsKTJUms*3D4P@UbSxPzSw)xdbi9}B zBVQ#$Nr`x%oMzD)-GzS&jJ-fqv_^uokxudz3{oR3{V9I~hT{QHQn(l+UE%qhAMmv} zKkD^MA)rStLEcp3F7eN@8w>k;$W_mpTzuv_W^IKTPQwD2pnKhsMd#)cCijd09>UgAN~9)v-Jz9Mwv_gE1|eyV+Gm-Bg-+x0Ei4R_T2 zW6y)~Gu|QZUwrMpi@x9Zhj0?Eej{8b?uC1`W#!a~ndzCC)8rIZmKltX8T_4I(83MF jn^HFI92%Q=Y-;pTOon4*f;>j1@Z$gIrko2G!?XVbC4Pz0 delta 750 zcmZvZPiWIn9LImJuXb(PxoOhWtvyuiHW@PT-wso0i@MXW?N*YDbcD7xjHC%`N9V=f zc9&SZ=?L97hsX-XL$Ja`gx1qU7^;B~ic@%Pdp1N#f#y!ZY5e((3*OS%sZuZoS# z>?{z#xNrzTcYF)PN>7MSubgk5`B~Hz6M(3gdB|kv?5`E2##jfv|3t$T?eQaIUjT$U zQ|3wel3G?u0AdPjrkO_9xQ2=l*(&-3)4(VCL)Gi(#TV$Y9!d)zJkKjQ)rq7eWjC{uq+d?Sa&9vxOS;RJSV@{6YzWj(!cpB?7`pJ<)ho=wa4dawrJ4DPR)KIYA@aWzBqLI z0D@jdVXs|0H98$H&@BY)=Dol*bjR5N{17bg%{rZqkzS^U*fR9fv+52jCb( z Date: Fri, 4 Jun 2021 10:14:13 +0100 Subject: [PATCH 2/4] Use new icons --- www/form/inner.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/www/form/inner.js b/www/form/inner.js index 7b37ff4b1..1baecd238 100644 --- a/www/form/inner.js +++ b/www/form/inner.js @@ -746,12 +746,12 @@ define([ }; }, printResults: function () { return; }, - icon: h('i.fa.fa-info') + icon: h('i.cptools.cptools-form-paragraph') }, page: { get: function () { var tag = h('div.cp-form-page-break-edit', [ - h('i.fa.fa-hand-o-right'), + h('i.cptools.cptools-form-page-break'), h('span', Messages.form_type_page) ]); return { @@ -760,7 +760,7 @@ define([ }; }, printResults: function () { return; }, - icon: h('i.fa.fa-hand-o-right') + icon: h('i.cptools.cptools-form-page-break') }, }; var TYPES = { @@ -791,7 +791,7 @@ define([ return h('div.cp-form-results-type-text', results); }, - icon: h('i.fa.fa-font') + icon: h('i.cptools.cptools-form-text') }, radio: { defaultOpts: { @@ -868,7 +868,7 @@ define([ return h('div.cp-form-results-type-radio', results); }, - icon: h('i.fa.fa-list-ul') + icon: h('i.cptools.cptools-form-list-radio') }, multiradio: { defaultOpts: { @@ -980,7 +980,7 @@ define([ return h('div.cp-form-results-type-radio', results); }, - icon: h('i.fa.fa-list-ul') + icon: h('i.cptools.cptools-form-grid-radio') }, checkbox: { defaultOpts: { @@ -1069,7 +1069,7 @@ define([ return h('div.cp-form-results-type-radio', results); }, - icon: h('i.fa.fa-check-square-o') + icon: h('i.cptools.cptools-form-list-check') }, multicheck: { defaultOpts: { @@ -1193,7 +1193,7 @@ define([ return h('div.cp-form-results-type-radio', results); }, - icon: h('i.fa.fa-list-ul') + icon: h('i.cptools.cptools-form-grid-check') }, poll: { defaultOpts: { @@ -1281,7 +1281,7 @@ define([ var lines = makePollTable(_answers, form[uid].opts); return h('div.cp-form-type-poll', lines); }, - icon: h('i.cptools.cptools-poll') + icon: h('i.cptools.cptools-form-poll') }, }; From 97eea3a7f040a70f5bfbb33e28246a445d74f410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Fri, 4 Jun 2021 13:14:11 +0100 Subject: [PATCH 3/4] Layout of inline add menu - one one line and left aligned - using large cptools icons --- www/form/app-form.less | 20 ++++++++++++++++---- www/form/inner.js | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/www/form/app-form.less b/www/form/app-form.less index 484033c90..65672ec26 100644 --- a/www/form/app-form.less +++ b/www/form/app-form.less @@ -13,6 +13,7 @@ flex-flow: column; font: @colortheme_app-font; color: @cryptpad_text_col; + background-color: @cp_app-bg; #cp-app-form-editor { flex: 1; @@ -84,7 +85,7 @@ .cp-form-creator-add-inline { display: flex; - flex-flow: column; + flex-flow: row; align-items: center; margin-bottom: 20px; button { @@ -94,6 +95,8 @@ } } .cp-form-creator-inline-add { + font-size: 25px; + margin-right: 30px; .add-close { display: none; } &.displayed { .add-close { display: inline; } @@ -103,12 +106,21 @@ .cp-form-creator-control-inline { display: flex; justify-content: space-around; - margin-top: 10px; button:not(:last-child) { margin-right: 5px; } - .cp-form-creator-types:first-child { - margin-right: 50px; + .cp-form-creator-types { + button { + border: 0px; + //padding-bottom: 3px; + i { + font-size: 35px; + line-height: 35px; + } + } + &:first-child { + margin-right: 50px; + } } } } diff --git a/www/form/inner.js b/www/form/inner.js index 1baecd238..6a866c4e0 100644 --- a/www/form/inner.js +++ b/www/form/inner.js @@ -1547,7 +1547,7 @@ define([ var full = !uid; var idx = content.order.indexOf(uid); var addControl = function (type) { - var btn = h('button.btn.small', { + var btn = h('button.btn.btn-default', { title: full ? undefined : Messages['form_type_'+type] }, [ (TYPES[type] || STATIC_TYPES[type]).icon.cloneNode(), From 1cd9808f44f26eb7afc090bdabe49207a085ab75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Fri, 4 Jun 2021 14:38:45 +0100 Subject: [PATCH 4/4] Layout of full add menu --- www/form/app-form.less | 24 ++++++++++++++++++++---- www/form/inner.js | 2 +- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/www/form/app-form.less b/www/form/app-form.less index 65672ec26..649bf84d9 100644 --- a/www/form/app-form.less +++ b/www/form/app-form.less @@ -127,14 +127,18 @@ .cp-form-creator-add-full { display: flex; align-items: center; - margin-bottom: 20px; + margin: 50px 0px 100px 0px; &> div:first-child { - border-right: 1px solid black; + border-right: 1px solid fade(@cryptpad_text_col, 25%); display: flex; height: 100%; align-items: center; padding-right: 10px; margin-right: 10px; + i { + color: fade(@cryptpad_text_col, 25%); + font-size: 30px; + } } .cp-form-creator-control-inline { display: flex; @@ -143,8 +147,20 @@ button:not(:last-child) { margin-right: 5px; } - .cp-form-creator-types:first-child { - margin-right: 50px; + .cp-form-creator-types { + button { + border: 0px; + padding:5px; + margin-right: 10px; + i { + font-size: 35px; + line-height: 35px; + } + } + &:first-child { + margin-bottom: 20px; + margin-right: 50px; + } } } } diff --git a/www/form/inner.js b/www/form/inner.js index 6a866c4e0..9e0bc644a 100644 --- a/www/form/inner.js +++ b/www/form/inner.js @@ -1578,7 +1578,7 @@ define([ h('div.cp-form-creator-types', controls), h('div.cp-form-creator-types', staticControls) ]); - var add = h('div', Messages.tag_add); + var add = h('div', [h('i.fa.fa-plus')]); if (!full) { add = h('button.btn.cp-form-creator-inline-add', { title: Messages.tag_add