From 2f5dc8a887a6d0169a9405dfa577cda3972acd2f Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 15 Nov 2016 12:24:14 -0800 Subject: [PATCH] [Frontend] Styling for controls Fixes #1324 New reset glyph; Reset button complete, final sanding. --- .../icomoon-project-openmct-symbols-16px.json | 234 +++++++++++++++--- .../fonts/symbols/openmct-symbols-16px.eot | Bin 14536 -> 14728 bytes .../fonts/symbols/openmct-symbols-16px.svg | 3 +- .../fonts/symbols/openmct-symbols-16px.ttf | Bin 14320 -> 14512 bytes .../fonts/symbols/openmct-symbols-16px.woff | Bin 14396 -> 14588 bytes .../commonUI/general/res/sass/_glyphs.scss | 2 + .../general/res/sass/controls/_controls.scss | 4 +- .../general/res/sass/features/_imagery.scss | 27 +- .../imagery/res/templates/imagery.html | 34 +-- 9 files changed, 249 insertions(+), 55 deletions(-) diff --git a/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json b/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json index 3351eb3318..986474ad5f 100644 --- a/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json +++ b/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json @@ -1,8 +1,8 @@ { "metadata": { "name": "openmct-symbols-16px", - "lastOpened": 1469724858940, - "created": 1469724856623 + "lastOpened": 1479173088107, + "created": 1479173085258 }, "iconSets": [ { @@ -540,13 +540,37 @@ "code": 921654, "tempChar": "" }, + { + "order": 117, + "id": 103, + "name": "icon-brightness", + "prevSize": 24, + "code": 921656, + "tempChar": "" + }, + { + "order": 118, + "id": 102, + "name": "icon-contrast", + "prevSize": 24, + "code": 921657, + "tempChar": "" + }, + { + "order": 119, + "id": 104, + "name": "icon-reset", + "prevSize": 24, + "code": 921664, + "tempChar": "" + }, { "order": 37, "prevSize": 24, "name": "icon-activity", "id": 32, "code": 921856, - "tempChar": "" + "tempChar": "" }, { "order": 36, @@ -554,7 +578,7 @@ "name": "icon-activity-mode", "id": 31, "code": 921857, - "tempChar": "" + "tempChar": "" }, { "order": 52, @@ -562,7 +586,7 @@ "name": "icon-autoflow-tabular", "id": 47, "code": 921858, - "tempChar": "" + "tempChar": "" }, { "order": 55, @@ -570,7 +594,7 @@ "name": "icon-clock", "id": 50, "code": 921859, - "tempChar": "" + "tempChar": "" }, { "order": 58, @@ -578,7 +602,7 @@ "name": "icon-database", "id": 53, "code": 921860, - "tempChar": "" + "tempChar": "" }, { "order": 57, @@ -586,7 +610,7 @@ "name": "icon-database-query", "id": 52, "code": 921861, - "tempChar": "" + "tempChar": "" }, { "order": 17, @@ -594,7 +618,7 @@ "name": "icon-dataset", "id": 12, "code": 921862, - "tempChar": "" + "tempChar": "" }, { "order": 22, @@ -602,7 +626,7 @@ "name": "icon-datatable", "id": 17, "code": 921863, - "tempChar": "" + "tempChar": "" }, { "order": 59, @@ -610,7 +634,7 @@ "name": "icon-dictionary", "id": 54, "code": 921864, - "tempChar": "" + "tempChar": "" }, { "order": 62, @@ -618,7 +642,7 @@ "name": "icon-folder", "id": 57, "code": 921865, - "tempChar": "" + "tempChar": "" }, { "order": 66, @@ -626,7 +650,7 @@ "name": "icon-image", "id": 61, "code": 921872, - "tempChar": "" + "tempChar": "" }, { "order": 68, @@ -634,7 +658,7 @@ "name": "icon-layout", "id": 63, "code": 921873, - "tempChar": "" + "tempChar": "" }, { "order": 77, @@ -642,7 +666,7 @@ "name": "icon-object", "id": 72, "code": 921874, - "tempChar": "" + "tempChar": "" }, { "order": 78, @@ -650,7 +674,7 @@ "name": "icon-object-unknown", "id": 73, "code": 921875, - "tempChar": "" + "tempChar": "" }, { "order": 79, @@ -658,7 +682,7 @@ "name": "icon-packet", "id": 74, "code": 921876, - "tempChar": "" + "tempChar": "" }, { "order": 80, @@ -666,7 +690,7 @@ "name": "icon-page", "id": 75, "code": 921877, - "tempChar": "" + "tempChar": "" }, { "order": 114, @@ -674,7 +698,7 @@ "name": "icon-plot-overlay", "prevSize": 24, "code": 921878, - "tempChar": "" + "tempChar": "" }, { "order": 113, @@ -682,7 +706,7 @@ "name": "icon-plot-stacked", "prevSize": 24, "code": 921879, - "tempChar": "" + "tempChar": "" }, { "order": 10, @@ -690,7 +714,7 @@ "name": "icon-session", "id": 5, "code": 921880, - "tempChar": "" + "tempChar": "" }, { "order": 24, @@ -698,7 +722,7 @@ "name": "icon-tabular", "id": 19, "code": 921881, - "tempChar": "" + "tempChar": "" }, { "order": 7, @@ -706,7 +730,7 @@ "name": "icon-tabular-lad", "id": 2, "code": 921888, - "tempChar": "" + "tempChar": "" }, { "order": 6, @@ -714,7 +738,7 @@ "name": "icon-tabular-lad-set", "id": 1, "code": 921889, - "tempChar": "" + "tempChar": "" }, { "order": 8, @@ -722,7 +746,7 @@ "name": "icon-tabular-realtime", "id": 3, "code": 921890, - "tempChar": "" + "tempChar": "" }, { "order": 23, @@ -730,7 +754,7 @@ "name": "icon-tabular-scrolling", "id": 18, "code": 921891, - "tempChar": "" + "tempChar": "" }, { "order": 112, @@ -738,7 +762,7 @@ "name": "icon-telemetry", "id": 86, "code": 921892, - "tempChar": "" + "tempChar": "" }, { "order": 90, @@ -746,7 +770,7 @@ "name": "icon-telemetry-panel", "id": 85, "code": 921893, - "tempChar": "" + "tempChar": "" }, { "order": 93, @@ -754,7 +778,7 @@ "name": "icon-timeline", "id": 88, "code": 921894, - "tempChar": "" + "tempChar": "" }, { "order": 116, @@ -762,7 +786,7 @@ "name": "icon-timer-v1.5", "prevSize": 24, "code": 921895, - "tempChar": "" + "tempChar": "" }, { "order": 11, @@ -770,7 +794,7 @@ "name": "icon-topic", "id": 6, "code": 921896, - "tempChar": "" + "tempChar": "" }, { "order": 115, @@ -778,13 +802,13 @@ "name": "icon-box-with-dashed-lines", "id": 29, "code": 921897, - "tempChar": "" + "tempChar": "" } ], "metadata": { "name": "openmct-symbols-16px", "importSize": { - "width": 448, + "width": 512, "height": 512 }, "designer": "Charles Hacskaylo", @@ -1973,7 +1997,7 @@ }, { "paths": [ - "M1012.8 414.2v-391.6l-127.6 127.4c-96.6-96.8-225.2-150-362-150s-265.2 53.2-362 150c-96.8 96.8-150 225.2-150 362s53.2 265.4 150 362c96.8 96.8 225.2 150 362 150s265.4-53.2 362-150l-136.6-136.6c-124.2 124.2-326.4 124.2-450.8 0-124.2-124.2-124.2-326.4 0-450.8 124.2-124.2 326.4-124.2 450.8 0l-127.4 127.4h391.6z" + "M1024 460.8v-460.8l-175.8 175.8c-85.2-69.6-190.8-107.6-302-107.6-127.6 0-247.6 49.8-338 140s-140 210.4-140 338 49.8 247.6 140 338 210.4 140 338 140 247.6-49.8 338-140c74-74 120.8-167.8 135-269.6h-138.6c-32 155.4-169.8 272.8-334.6 272.8-188.2 0-341.4-153.2-341.4-341.4s153.4-341.2 341.6-341.2c76.8 0 147.6 25.4 204.8 68.2l-187.8 187.8h460.8z" ], "grid": 16, "tags": [ @@ -1981,9 +2005,19 @@ ], "defaultCode": 114, "id": 27, - "attrs": [], + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, "colorPermutations": { - "1161751207457516161751": [] + "1161751207457516161751": [ + { + "f": 1 + } + ] } }, { @@ -2125,6 +2159,134 @@ "1161751207457516161751": [] } }, + { + "id": 103, + "paths": [ + "M253.414 318.061l-155.172-116.384c-50.233 66.209-85.127 146.713-97.91 234.39l191.586 30.216c8.145-56.552 29.998-106.879 62.068-149.006z", + "M191.98 557.717l-191.919 27.434c13.115 90.459 48.009 170.963 99.174 238.453l154.18-117.665c-31.476-41.347-53.309-91.675-61.231-146.504z", + "M466.283 191.98l-27.434-191.919c-90.459 13.115-170.963 48.009-238.453 99.174l117.665 154.18c41.347-31.476 91.675-53.309 146.504-61.231z", + "M822.323 98.242c-66.209-50.233-146.713-85.127-234.39-97.91l-30.216 191.586c56.552 8.145 106.879 29.998 149.006 62.068z", + "M832.020 466.283l191.919-27.434c-13.115-90.459-48.009-170.963-99.174-238.453l-154.18 117.665c31.476 41.347 53.309 91.675 61.231 146.504z", + "M201.677 925.758c66.209 50.233 146.713 85.127 234.39 97.91l30.216-191.586c-56.552-8.145-106.879-29.998-149.006-62.068z", + "M770.586 705.939l155.131 116.343c50.233-66.209 85.127-146.713 97.91-234.39l-191.586-30.216c-8.125 56.564-29.966 106.906-62.028 149.049z", + "M557.717 832.020l27.434 191.919c90.459-13.115 170.963-48.009 238.453-99.174l-117.665-154.18c-41.347 31.476-91.675 53.309-146.504 61.231z", + "M770.586 512c0 142.813-115.773 258.586-258.586 258.586s-258.586-115.773-258.586-258.586c0-142.813 115.773-258.586 258.586-258.586s258.586 115.773 258.586 258.586z" + ], + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 16, + "tags": [ + "icon-brightness" + ], + "colorPermutations": { + "1161751207457516161751": [ + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + } + ] + } + }, + { + "id": 102, + "paths": [ + "M512 0c-282.78 0-512 229.24-512 512s229.22 512 512 512 512-229.24 512-512-229.22-512-512-512zM783.52 783.52c-69.111 69.481-164.785 112.481-270.502 112.481-0.358 0-0.716-0-1.074-0.001l0.055-768c212.070 0.010 383.982 171.929 383.982 384 0 106.034-42.977 202.031-112.462 271.52z" + ], + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 16, + "tags": [ + "icon-contrast" + ], + "colorPermutations": { + "1161751207457516161751": [ + { + "f": 1 + } + ] + } + }, + { + "id": 104, + "paths": [ + "M460.8 460.8l-187.8-187.8c57.2-42.8 128-68.2 204.8-68.2 188.2 0 341.6 153.2 341.6 341.4s-153.2 341.2-341.4 341.2c-165 0-302.8-117.6-334.6-273h-138.4c14.2 101.8 61 195.6 135 269.6 90.2 90.2 210.4 140 338 140s247.6-49.8 338-140 140-210.4 140-338-49.8-247.6-140-338-210.4-140-338-140c-111.4 0-217 38-302 107.6l-176-175.6v460.8h460.8z" + ], + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 16, + "tags": [ + "icon-reset" + ], + "colorPermutations": { + "1161751207457516161751": [ + { + "f": 1 + } + ] + } + }, { "paths": [ "M576 64h-256l320 320h-290.256c-44.264-76.516-126.99-128-221.744-128h-128v512h128c94.754 0 177.48-51.484 221.744-128h290.256l-320 320h256l448-448-448-448z" diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.eot b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.eot index c3a3688fffc5eeec7d7cf0371da12f8145832658..d22bc7851c896decc92eb120c79ad345b0f0340a 100755 GIT binary patch delta 749 zcmX?6*ip>ZVadR-!D1qt8H={-p8FFWR@aL%Ffi-^;)LYf!~(`O4L}8qGC=H*o>*J} z6c=D%V2T0K9O*fgX};NK4+8lq3=D<}8L5dW+z0D(85oRPfbwP;KmqncEb2f$$UK#d z+>(kOPL}OJ{sW+Sb8_;N6Mu@a9${cGtpUnk$W5#$U?|dKC z@^gTeC>7)vmoP8`Wf&|bfaDpNncqyF!FZn&XapGWPi|mp(-UxD-~(a?1`h^4K?We^ z1hPGWv;YuG0@=YpS^OpslVSy_pXiJgyGR78$R zT#nh;$d1X}j?rA14=AC>WNKo^WNaiR&aTM9utCAyCs4~ECd^Ms$wXOLSlL8L$uBI% z04!qR%GJeV7m;u0UK49-8e8jTm7%?d@hszK#XWO2-Fwq zf{Ki1_h@HWxz&OkQR8lxA8E_e#qDa2aHx_A#AdLFR-li&!Um8t_b8~C#nifi9HHr% zV(ly6Wsaf}?rJ`14e1U4j5iy}mx;*S-{Yzs&u{aUftv*wzzhsm0%d_w3ZW+-F*avR zpZv%8H>V3o7KoW9Z!l4xtZe!ryn*`^j~!1G&kmj^yd1nXyqEYm_@emg__p!g;Sb`U z!2e9ZN??V+H9-+U7r_F-J|P|3edb6Ir+(nKUv?rV_+}=*>^5Cv7&&XP>-REfx)x~D4>v+n44<; zODzq^Ujwv6sUW|&gn=1kmiYycJOeZH>&Y`1?{n?|i2(uM0ciyw)&#O+7#JBC|Nm#;pB%ufxjB{DOst;!{{iN&%m)~ZfDRL6*JD;z;$vdx zV-^*WV-lBRHa4B@{w_`LC6K7Xs{@S1t5|dFWUzkfGne*ukX4*j|sRP{l$NqPJ5Y2tbPUK#cm$)>5LZo4?2x zh{$}mb^jjEZ}XLbn+50r28JsEVhJ#Ma)XIEW7^~$CcinsvOpC~n-7=@Glo}jAK|g! z3E|nqbB~va*NpcJ9}}M%UmRZx-!Fa({yzRk0s#Vb0(%7B2ucW=32qU*Cd44rAj~B^ oON2orPvn*8G|_Wneqx8jxx~H1?@0ht3NYXp7}7Rtna42!0O&%8B>(^b diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg index c0fbe06e76..68ac62d103 100755 --- a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg +++ b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg @@ -65,7 +65,7 @@ - + @@ -75,6 +75,7 @@ + diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.ttf b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.ttf index 4ba5deaccc7d7fb9b9fc7c2cb1aff90601c0d15b..e6b00bcbe16899bace8ffc608b1438501cd41561 100755 GIT binary patch delta 721 zcmey6zoD?6fsuiMft#U$ftkU;KUm+0Ur1IID6$8L6OwZi3mDflSTZm$$^fxLdSY<_ zP+Wk4fhh(^bEM}~ruk-{JqYBdFfbS@WTYmha38GCWneIF0m_?Y00r0&v8V(2AoEl* za!V?DI9av>`452R&B@76c1-*!#(IQ-!L$ab;6iR82AJkfS41= z_5{)bKr9Jl2LovZAl3x3V>bsdrHgU8{6E0Lz;E5M z-UD(GFr?J&7>$kOm_$YRm_UwFSC(TGmt!_IvSTv0V>UGbis%7d%g4m7E~v0J(FIf{Iy8tsBT0nw}}vzVcn>C@P`; zRuSTp){x%t&v{XMSQ@%%Pl8Ms+ME@!wBC<}}|2tE0YkvU`fWEJDzj4qQE zOtdGvn|ujx;6BA;#}mb~gXak^2d@q9B|Z+mD84$rZG3n5gZL-#KNGMLSRrstP(;v0 zut2a+h(}0IC_?ClaFXyRkqD7vqE4dk#MH!=iA#wmi7%2clb8Tb!0DSOnZ_{z0Mvr1 A!T>VSL|pm{TL@{=7Cf3m)L$G~6$vhZAPVnqQ%AwwAhgJ}B0f;q$?3m3lOzC2r-2V?Se`P+vU^MxRgjBscAET0*x*ns6nYkUKk(fBUBJKQ;j`G0_g0q6uShRubN?5vw*o5>7(ID~ zu{mSf0B+e!7C4NuB0%#W~ MQKW4SGK*sZ00muxZ~y=R diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.woff b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.woff index 9263a50af312f8e8919cbe4065bc5bac84575be7..72433dabfc662c4a035e78139bad09adcd78d765 100755 GIT binary patch delta 765 zcmdl}@TX9$+~3WOfsp|SEdDTXgXs+nOp_HY#3t$p*NZ0SCKfO-FlGR;0|+y&X|POB zECz}(tpFmS~b04hF%>W8AFqnY! zsemy1Ar|$F+>#2Qm=4hVIUwA_$+A5sKN+ab&-4UP5y*fGKgC#&YzNSCB@j0MrIuEZUt9w8&mFirW+021`ORb=#`~N{fNT)ppZtZfO;5mq zfe(lo7(5vG1Q~#s6Ug=i(gHv%31kNYX$2tG1hQi{&tXaz<8=9dfQ5ni0E5M39!aTs zJ4SP5K4xVlJtk8VJ0@czF>!W97KRN9?mmH91~FlNN=hcm!otcXN=klVF$Q1}3s(WoJ&b1=KQo@)Af+M0hpJl1L`6tQ#YD-x%f~9kQ`0oI#vP)M4$T3kT(RX5MV#~y(#FNAqNtj7Y N04MbH&G$^>m;e$rus8q! delta 609 zcmexUxTip@+~3WOfsp|SENmFKLA3b?2BygmEyO132-k}w=Oz{~Ffe8Su?Yw>PKZxT zPb>zCG0g$0<$z*=^qk5xpx6=y1_Pj+L4oV7>E#)zi75;W#v(v9W+2SHztAxQCFD2 zCUH4tVYK#^o) zutyz8(+(8Tt*39ZX7$?e&-nRV+jydOP)j0HjzC#HioAUQ(2GbB26@h|G6e z_wVuiHeVUIS%8jaV7L+>mH?wCe=#;^Oq;A@@|zPZ3sk{0`GJY@ -
- - - - - + + + + + + + + +