mirror of
https://github.com/ansible/awx.git
synced 2026-02-22 05:30:18 -03:30
Fixes based on feedback after demo
This commit is contained in:
Joe Fiorini
@@ -5,21 +5,11 @@
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Random" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
|
||||
<<<<<<< HEAD
|
||||
<g id="InventoryScripts" sketch:type="MSArtboardGroup" fill="#FFFFFF">
|
||||
<path d="M18.069332,19.643368 C15.4291803,19.643368 13.289335,17.5029916 13.289335,14.863371 C13.289335,12.2237504 15.4291803,10.0833739 18.069332,10.0833739 L18.069332,8.49004158 L22.0664718,10.8003735 L18.069332,13.1107054 L18.069332,11.1455955 C16.0192444,11.1455955 14.3515566,12.8132834 14.3515566,14.863371 C14.3515566,16.9134586 16.0192444,18.5811465 18.069332,18.5811465 C20.1188886,18.5811465 21.7871075,16.9134586 21.7871075,14.863371 L22.8493291,14.863371 C22.8493291,17.5029916 20.7084215,19.643368 18.069332,19.643368 L18.069332,19.643368 Z M23.1386641,23.3611435 L8.50668238,23.3611435 C4.99019788,23.3611435 2.13866408,20.5090786 2.13866408,16.9878141 C2.13866408,14.1941714 3.9423163,11.8254173 6.44650364,10.9650178 C6.78641455,8.95741907 8.52845792,7.42782001 10.6311255,7.42782001 C11.3162584,7.42782001 11.961558,7.59246435 12.5346266,7.88457528 C13.859748,5.11217699 16.6799462,3.19486706 19.9558375,3.19486706 C24.502677,3.19486706 28.1880547,6.8807759 28.1880547,11.4270842 C28.1880547,11.5120619 28.1779636,11.5970397 28.1758391,11.6767063 C29.6866205,11.6816924 31.0623568,12.2600933 32.0969473,13.2053689 L23.1386641,13.2053689 L23.1386641,23.3611435 Z" id="Fill-87" sketch:type="MSShapeGroup"></path>
|
||||
<path d="M35.6964491,18.9938144 L33.022193,16 L34.2563702,16 L36.9528193,18.9938144 L34.2563702,22 L33,22 L35.6964491,18.9938144 Z" id=">" sketch:type="MSShapeGroup"></path>
|
||||
<path d="M26.6964491,18.9938144 L24.022193,16 L25.2563702,16 L27.9528193,18.9938144 L25.2563702,22 L24,22 L26.6964491,18.9938144 Z" id=">-2" sketch:type="MSShapeGroup" transform="translate(25.976410, 19.000000) scale(-1, -1) translate(-25.976410, -19.000000) "></path>
|
||||
<path d="M32.4528193,15 L29.9528193,23 L28.9528193,23 L31.4528193,15 L32.4528193,15 Z" id="⁄" sketch:type="MSShapeGroup"></path>
|
||||
=======
|
||||
<g id="InventoryScripts" sketch:type="MSArtboardGroup" fill="#000000">
|
||||
<path d="M30,41.6578074 L10.4747864,41.6578074 C4.89348782,41.6461935 1.50985601,33.2876501 1.36842952,27.7211977 C1.26430016,23.6227358 4.26813909,15.5700299 8.02642216,15.5700299 C7.70161873,12.3219956 8.948769,10.0564324 10.3414111,8.65446838 C11.2507957,7.73899662 15.0285665,6.38049299 17.1816026,8.01701681 C19.2839677,1.96620547 23.6993475,5.24541679e-16 28.8987811,0 C33.2156363,0 41.5,7 41.7135366,15.5615059 C41.7181702,15.7472848 41.6975201,15.9215349 41.6941483,16.1073564 C46,14.5 49.7748589,24.4637093 49.9373048,28.8825819 C49.9607247,29.5196531 49.9124454,30.2375999 49.797374,31 L32.7415762,31 C35.4503573,29.2169277 37.2389899,26.1491174 37.2389899,22.6642111 L35.0228809,22.6642111 C35.0228809,26.9413014 31.5424818,30.4205924 27.2664995,30.4205924 C22.9894092,30.4205924 19.5101182,26.9413014 19.5101182,22.6642111 C19.5101182,18.3871208 22.9894092,14.9078297 27.2664995,14.9078297 L27.2664995,19.0076313 L35.6057175,14.1875943 L27.2664995,9.36755728 L27.2664995,12.6917207 C21.7583607,12.6917207 17.2940092,17.1571803 17.2940092,22.6642111 C17.2940092,28.1712418 21.7583607,32.6367014 27.2664995,32.6367014 C28.2142922,32.6367014 29.1312864,32.5043792 30,32.2571999 L30,41.6578074 Z" id="Fill-87" sketch:type="MSShapeGroup"></path>
|
||||
<g id=">-+->-2-+-⁄" sketch:type="MSLayerGroup" transform="translate(33.639630, 32.230464)">
|
||||
<path d="M12.5151949,4.27337953 L9.65374218,1.06999953 L10.9743112,1.06999952 L13.8595104,4.27337952 L10.9743112,7.48999663 L9.62999568,7.48999664 L12.5151949,4.27337953 Z" id=">" sketch:type="MSShapeGroup"></path>
|
||||
<path d="M2.88519926,4.27337953 L0.023746496,1.06999953 L1.34431551,1.06999952 L4.22951477,4.27337952 L1.34431551,7.48999663 L-1.83687704e-14,7.48999664 L2.88519926,4.27337953 Z" id=">-2" sketch:type="MSShapeGroup" transform="translate(2.114757, 4.279998) scale(-1, -1) translate(-2.114757, -4.279998) "></path>
|
||||
<path d="M9.04451261,8.62118116e-17 L6.36951381,8.55999616 L5.29951429,8.55999616 L7.97451309,8.62118116e-17 L9.04451261,8.62118116e-17 Z" id="⁄" sketch:type="MSShapeGroup"></path>
|
||||
</g>
|
||||
>>>>>>> 470dc9b... Update icons on setup menu
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 2.4 KiB |
@@ -5,17 +5,10 @@
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Random" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
|
||||
<<<<<<< HEAD
|
||||
<g id="MaintenanceJobs" sketch:type="MSArtboardGroup" fill="#FFFFFF">
|
||||
<path d="M22.7780898,23.3397977 L22.7780898,22.3006685 L22.0506329,22.1134422 C21.9919203,21.8918136 21.9063401,21.6817396 21.7977523,21.4867754 L22.1806538,20.8224647 L21.4668592,20.0876761 L20.8235604,20.4849764 C20.634065,20.3734563 20.4298915,20.2855681 20.2144936,20.2253379 L20.0290614,19.4772694 L19.0196215,19.4772694 L18.8377446,20.2261221 C18.6224482,20.2865615 18.4183763,20.3746588 18.2289825,20.486388 L17.5836521,20.0922247 L16.8698575,20.8270133 L17.2558063,21.4892327 C17.1474725,21.6843015 17.0620955,21.8944801 17.0035861,22.1162132 L16.276891,22.3070993 L16.276891,23.3462286 L17.0043479,23.5334548 C17.0630605,23.7550835 17.1486407,23.9651575 17.2572285,24.1601217 L16.874327,24.8244324 L17.5881216,25.559221 L18.2314204,25.1619207 C18.4209158,25.2734408 18.6250893,25.3613289 18.8404872,25.4215592 L19.0259194,26.1696277 L20.0353593,26.1696277 L20.2172362,25.420775 C20.4325326,25.3603355 20.6366045,25.2722383 20.8259983,25.1604567 L21.4712779,25.55462 L22.1850725,24.8198315 L21.7991237,24.1576121 C21.9074575,23.9625433 21.9928345,23.7523647 22.0513439,23.5306315 L22.7780391,23.3397455 L22.7780898,23.3397977 Z M19.5275666,24.6011307 C18.5738427,24.6011307 17.8007261,23.8052754 17.8007261,22.8235008 C17.8007261,21.8417263 18.5738427,21.0458709 19.5275666,21.0458709 C20.4812904,21.0458709 21.2544071,21.8417263 21.2544071,22.8235008 C21.2544071,23.8052754 20.4812904,24.6011307 19.5275666,24.6011307 L19.5275666,24.6011307 Z" id="Shape" sketch:type="MSShapeGroup" transform="translate(19.527490, 22.823449) rotate(-16.000000) translate(-19.527490, -22.823449) "></path>
|
||||
<path d="M26.2603822,19.2223114 L26.2603822,18.4196181 L25.6984455,18.2749919 C25.653092,18.1037911 25.5869841,17.9415157 25.5031036,17.7909123 L25.7988824,17.277754 L25.2474995,16.7101539 L24.7505722,17.0170554 C24.6041932,16.9309097 24.4464759,16.863019 24.280088,16.8164931 L24.1368477,16.2386347 L23.3570885,16.2386347 L23.2165945,16.8170989 C23.0502851,16.8637864 22.8926462,16.9318386 22.7463458,17.0181458 L22.2478491,16.7136676 L21.6964662,17.2812677 L21.994599,17.7928105 C21.9109147,17.9434947 21.8449637,18.1058508 21.7997671,18.2771324 L21.2384189,18.4245857 L21.2384189,19.227279 L21.8003556,19.3719051 C21.8457091,19.543106 21.911817,19.7053813 21.9956975,19.8559848 L21.6999187,20.3691431 L22.2513016,20.9367432 L22.7482289,20.6298417 C22.8946079,20.7159873 23.0523252,20.783878 23.2187131,20.830404 L23.3619534,21.4082624 L24.1417126,21.4082624 L24.2822066,20.8297982 C24.448516,20.7831107 24.6061549,20.7150584 24.7524554,20.6287109 L25.2509128,20.9331891 L25.8022957,20.365589 L25.5041629,19.8540462 C25.5878472,19.703362 25.6537982,19.5410059 25.6989948,19.3697242 L26.260343,19.222271 L26.2603822,19.2223114 Z M23.7494594,20.1966498 C23.012739,20.1966498 22.4155317,19.5818776 22.4155317,18.8234889 C22.4155317,18.0651002 23.012739,17.450328 23.7494594,17.450328 C24.4861798,17.450328 25.0833871,18.0651002 25.0833871,18.8234889 C25.0833871,19.5818776 24.4861798,20.1966498 23.7494594,20.1966498 L23.7494594,20.1966498 Z" id="Shape-2" sketch:type="MSShapeGroup" transform="translate(23.749401, 18.823449) rotate(-3.000000) translate(-23.749401, -18.823449) "></path>
|
||||
<path d="M24.2941158,6.29410711 C24.2941158,7.17094577 23.5827184,7.88234317 22.7058798,7.88234317 C21.8290411,7.88234317 21.1176437,7.17094577 21.1176437,6.29410711 C21.1176437,5.41726844 21.8290411,4.70587104 22.7058798,4.70587104 C23.5827184,4.70587104 24.2941158,5.41726844 24.2941158,6.29410711 L24.2941158,6.29410711 Z M14.4988011,26.6992243 L12.3823454,27.9338235 C12.2996247,27.9834559 12.2169041,28 12.1176393,28 C11.9852863,28 11.8529333,27.9503676 11.7371245,27.8511029 L10.6783004,26.7922788 C10.5459474,26.6433817 10.496315,26.4448522 10.5459474,26.2628668 L11.9521981,21.6966881 L7.30329877,17.0477888 L2.73712008,18.4540395 C2.68748771,18.4705836 2.63785533,18.4705836 2.58822295,18.4705836 C2.45586995,18.4705836 2.30697282,18.4209512 2.20770806,18.3216865 L1.14888402,17.2628624 C0.983442761,17.080877 0.95035451,16.816171 1.06616339,16.6176415 L4.77204754,10.2646973 C4.8713123,10.1158001 5.03675355,10.0165354 5.20219481,9.99999126 L11.4724184,9.66910874 C12.465066,8.49447582 13.4411694,7.40256353 14.3841846,6.44300424 C18.520216,2.32351694 21.680144,0.999986887 27.4374997,0.999986887 C27.735294,0.999986887 28,1.23160465 28,1.52939891 C28,7.02204864 26.4779404,10.6783004 22.5569827,14.6158023 C22.4272714,14.7432772 22.2951416,14.8713567 22.160716,14.9999999 L14.4988011,15 L14.4988011,26.6992243 Z" id="Type-something-2" sketch:type="MSShapeGroup"></path>
|
||||
=======
|
||||
<g id="MaintenanceJobs" sketch:type="MSArtboardGroup" fill="#000000">
|
||||
<path d="M38.5647189,33.2807958 L38.123629,31.7425324 L36.9672723,31.7741652 C36.7862808,31.4710021 36.5704209,31.1963485 36.3269157,30.9538288 L36.6117528,29.8078896 L35.2431916,29.0231454 L34.4595374,29.8843521 C34.131682,29.7997016 33.7921293,29.756265 33.4477007,29.758536 L32.8556579,28.7298535 L31.3613448,29.1583408 L31.4099786,30.3440998 C31.1169224,30.5249597 30.8522223,30.741998 30.6192823,30.9877891 L29.4966599,30.678224 L28.7519054,32.0689518 L29.6043396,32.8854332 C29.5267716,33.2201867 29.4896014,33.5675631 29.497109,33.9206394 L28.5023814,34.5116833 L28.9434713,36.0499467 L30.0998279,36.0183139 C30.2808194,36.321477 30.4966794,36.5961306 30.7401846,36.8386503 L30.4553475,37.9845895 L31.8239087,38.7693338 L32.6075628,37.908127 C32.9354183,37.9927775 33.274971,38.0362141 33.6193995,38.0339431 L34.2114424,39.0626257 L35.7057554,38.6341383 L35.6571217,37.4483793 C35.9501779,37.2675194 36.2148779,37.0504811 36.4477958,36.8046126 L37.570343,37.1141993 L38.3150975,35.7234715 L37.4626633,34.90699 C37.5402313,34.5722366 37.5774015,34.2248602 37.5698939,33.8717838 L38.5646215,33.28074 L38.5647189,33.2807958 Z M34.2882541,36.5277793 C32.8764196,36.9326163 31.39412,36.0826535 30.977376,34.6292944 C30.560632,33.1759354 31.3672817,31.669627 32.7791162,31.26479 C34.1909506,30.8599529 35.6732502,31.7099158 36.0899942,33.1632748 C36.5067382,34.6166338 35.7000885,36.1229422 34.2882541,36.5277793 L34.2882541,36.5277793 Z" id="Shape" sketch:type="MSShapeGroup"></path>
|
||||
<path d="M43.9290222,28.1472841 L43.8643274,26.9128339 L42.9884769,26.735706 C42.9049301,26.4760741 42.7901848,26.2318414 42.649048,26.0069912 L43.0625628,25.1939737 L42.1688522,24.3655098 L41.4293704,24.8775399 C41.1973133,24.7568555 40.9492904,24.665159 40.6896551,24.6070179 L40.4227942,23.7298828 L39.223614,23.7927291 L39.054173,24.6936641 C38.8021711,24.7788681 38.5652255,24.8962299 38.3471882,25.0407519 L37.5560175,24.6126767 L36.7538008,25.5300204 L37.2535238,26.2926858 C37.1369716,26.5311656 37.048632,26.7861661 36.9929297,27.0532203 L36.1415249,27.3252295 L36.2062197,28.5596796 L37.0820703,28.7368076 C37.1656171,28.9964395 37.2803624,29.2406721 37.4214992,29.4655224 L37.0079843,30.2785399 L37.901695,31.1070038 L38.6411767,30.5949736 C38.8732338,30.715658 39.1212568,30.8073546 39.3808921,30.8654957 L39.647753,31.7426308 L40.8469331,31.6797845 L41.0163742,30.7788495 C41.268376,30.6936455 41.5053217,30.5762837 41.7233557,30.4316996 L42.514466,30.8597779 L43.3166828,29.9424343 L42.8169598,29.1797688 C42.933512,28.9412891 43.0218515,28.6862886 43.0775539,28.4192344 L43.9289587,28.1472252 L43.9290222,28.1472841 Z M40.1460402,29.848078 C39.0130487,29.9074555 38.0450636,29.0101397 37.9839397,27.8438249 C37.9228157,26.6775102 38.791703,25.6839279 39.9246945,25.6245504 C41.0576859,25.5651728 42.0256711,26.4624887 42.086795,27.6288034 C42.147919,28.7951181 41.2790316,29.7887004 40.1460402,29.848078 L40.1460402,29.848078 Z" id="Shape-2" sketch:type="MSShapeGroup"></path>
|
||||
<path d="M40.8741328,8.15292232 C40.8741328,9.50325007 39.7785838,10.598799 38.4282561,10.598799 C37.0779283,10.598799 35.9823794,9.50325007 35.9823794,8.15292232 C35.9823794,6.80259456 37.0779283,5.70704562 38.4282561,5.70704562 C39.7785838,5.70704562 40.8741328,6.80259456 40.8741328,8.15292232 L40.8741328,8.15292232 Z M25.7893903,39.5767148 L22.5300576,41.4779923 C22.4026682,41.5544259 22.2752788,41.5799038 22.1224115,41.5799038 C21.9185884,41.5799038 21.7147653,41.5034702 21.5364202,41.3506029 L19.9058357,39.7200184 C19.7020126,39.4907175 19.625579,39.1849829 19.7020126,38.9047262 L21.8676326,31.8728307 L14.7083477,24.7135458 L7.67645223,26.8791658 C7.60001858,26.9046436 7.52358494,26.9046436 7.44715129,26.9046436 C7.24332823,26.9046436 7.01402729,26.82821 6.86116,26.6753427 L5.23057553,25.0447582 C4.97579671,24.7645015 4.92484095,24.3568554 5.10318612,24.0511208 L10.8102317,14.2676141 C10.963099,14.0383131 11.2178779,13.8854458 11.4726567,13.8599679 L21.128774,13.3504103 C22.657447,11.5414807 24.160642,9.85994043 25.6128813,8.38222326 C31.9823519,2.03823058 36.8486274,0 45.7149304,0 C46.1735323,0 46.5811784,0.356690351 46.5811784,0.815292232 C46.5811784,9.27394913 44.2372132,14.9045611 38.1989551,20.9682971 C37.9992004,21.1646078 37.7957211,21.3618497 37.5887062,21.5599597 L25.7893903,21.5599598 L25.7893903,39.5767148 Z" id="Type-something-2" sketch:type="MSShapeGroup"></path>
|
||||
>>>>>>> 470dc9b... Update icons on setup menu
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 5.1 KiB |
@@ -5,7 +5,6 @@
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Random" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
|
||||
<<<<<<< HEAD
|
||||
<g id="Organizations" sketch:type="MSArtboardGroup" fill="#FFFFFF">
|
||||
<g id="Organizations-back" sketch:type="MSLayerGroup" transform="translate(10.006000, 0.000000)">
|
||||
<path d="M7.38461538,4.10869565 L9.22707692,4.10869565 L9.22707692,6.45652174 L7.38461538,6.45652174 L7.38461538,4.10869565 Z M11.0732308,4.10869565 L13.5347692,4.10869565 L13.5347692,6.45652174 L11.0732308,6.45652174 L11.0732308,4.10869565 Z M11.0732308,8.80434783 L13.5347692,8.80434783 L13.5347692,11.1521739 L11.0732308,11.1521739 L11.0732308,8.80434783 Z M7.38461538,13.5 L9.22707692,13.5 L9.22707692,15.8478261 L7.38461538,15.8478261 L7.38461538,13.5 Z M11.0732308,13.5 L13.5347692,13.5 L13.5347692,15.8478261 L11.0732308,15.8478261 L11.0732308,13.5 Z M7.38461538,8.80434783 L9.22707692,8.80434783 L9.22707692,11.1521739 L7.38461538,11.1521739 L7.38461538,8.80434783 Z M8.61169231,22.3494391 L11.0769231,22.3494391 L11.0769231,27 L8.61169231,27 L8.61169231,22.3494391 Z M7.38092308,1.76086957 L0,1.76086957 L0,0 L16,0 L16,27 L7.38092308,27 L7.38092308,1.76086957 Z" sketch:type="MSShapeGroup"></path>
|
||||
@@ -13,11 +12,6 @@
|
||||
<g id="Organizations-front" sketch:type="MSLayerGroup" transform="translate(0.006000, 3.000000)">
|
||||
<path d="M2.45784615,4.10869565 L4.91938462,4.10869565 L4.91938462,6.45652174 L2.45784615,6.45652174 L2.45784615,4.10869565 Z M6.76553846,4.10869565 L9.22707692,4.10869565 L9.22707692,6.45652174 L6.76553846,6.45652174 L6.76553846,4.10869565 Z M11.0732308,4.10869565 L13.5347692,4.10869565 L13.5347692,6.45652174 L11.0732308,6.45652174 L11.0732308,4.10869565 Z M11.0732308,8.80434783 L13.5347692,8.80434783 L13.5347692,11.1521739 L11.0732308,11.1521739 L11.0732308,8.80434783 Z M2.45784615,13.5 L4.91938462,13.5 L4.91938462,15.8478261 L2.45784615,15.8478261 L2.45784615,13.5 Z M6.76553846,13.5 L9.22707692,13.5 L9.22707692,15.8478261 L6.76553846,15.8478261 L6.76553846,13.5 Z M11.0732308,13.5 L13.5347692,13.5 L13.5347692,15.8478261 L11.0732308,15.8478261 L11.0732308,13.5 Z M2.45784615,8.80434783 L4.91938462,8.80434783 L4.91938462,11.1521739 L2.45784615,11.1521739 L2.45784615,8.80434783 Z M6.76553846,8.80434783 L9.22707692,8.80434783 L9.22707692,11.1521739 L6.76553846,11.1521739 L6.76553846,8.80434783 Z M8.61169231,22.3494391 L11.0769231,22.3494391 L11.0769231,27 L8.61169231,27 L8.61169231,22.3494391 Z M4.91938462,22.3494391 L7.38461538,22.3494391 L7.38461538,27 L4.91938462,27 L4.91938462,22.3494391 Z M0,0 L16,0 L16,27 L0,27 L0,0 Z" sketch:type="MSShapeGroup"></path>
|
||||
</g>
|
||||
=======
|
||||
<g id="Organizations" sketch:type="MSArtboardGroup" fill="#242424">
|
||||
<path d="M31.7101936,5.93478261 L34.4738859,5.93478261 L34.4738859,9.32608696 L31.7101936,9.32608696 L31.7101936,5.93478261 Z M37.2431167,5.93478261 L40.9354244,5.93478261 L40.9354244,9.32608696 L37.2431167,9.32608696 L37.2431167,5.93478261 Z M37.2431167,12.7173913 L40.9354244,12.7173913 L40.9354244,16.1086957 L37.2431167,16.1086957 L37.2431167,12.7173913 Z M31.7101936,19.5 L34.4738859,19.5 L34.4738859,22.8913043 L31.7101936,22.8913043 L31.7101936,19.5 Z M37.2431167,19.5 L40.9354244,19.5 L40.9354244,22.8913043 L37.2431167,22.8913043 L37.2431167,19.5 Z M31.7101936,12.7173913 L34.4738859,12.7173913 L34.4738859,16.1086957 L31.7101936,16.1086957 L31.7101936,12.7173913 Z M36,32.2825232 L37.2486551,32.2825232 L37.2486551,39 L36,39 L36,32.2825232 Z M36,2 L20.6332705,2 L20.6332705,0 L44.6332705,0 L44.6332705,39 L36,39 L36,2 Z" id="Organizations-back" sketch:type="MSShapeGroup"></path>
|
||||
<path d="M14.6927692,8.82296376 L18.3850769,8.82296376 L18.3850769,12.2142681 L14.6927692,12.2142681 L14.6927692,8.82296376 Z M21.1543077,8.82296376 L24.8466154,8.82296376 L24.8466154,12.2142681 L21.1543077,12.2142681 L21.1543077,8.82296376 Z M27.6158462,8.82296376 L31.3081538,8.82296376 L31.3081538,12.2142681 L27.6158462,12.2142681 L27.6158462,8.82296376 Z M27.6158462,15.6055725 L31.3081538,15.6055725 L31.3081538,18.9968768 L27.6158462,18.9968768 L27.6158462,15.6055725 Z M14.6927692,22.3881812 L18.3850769,22.3881812 L18.3850769,25.7794855 L14.6927692,25.7794855 L14.6927692,22.3881812 Z M21.1543077,22.3881812 L24.8466154,22.3881812 L24.8466154,25.7794855 L21.1543077,25.7794855 L21.1543077,22.3881812 Z M27.6158462,22.3881812 L31.3081538,22.3881812 L31.3081538,25.7794855 L27.6158462,25.7794855 L27.6158462,22.3881812 Z M14.6927692,15.6055725 L18.3850769,15.6055725 L18.3850769,18.9968768 L14.6927692,18.9968768 L14.6927692,15.6055725 Z M21.1543077,15.6055725 L24.8466154,15.6055725 L24.8466154,18.9968768 L21.1543077,18.9968768 L21.1543077,15.6055725 Z M23.9235385,35.1707044 L27.6213846,35.1707044 L27.6213846,41.8881812 L23.9235385,41.8881812 L23.9235385,35.1707044 Z M18.3850769,35.1707044 L22.0829231,35.1707044 L22.0829231,41.8881812 L18.3850769,41.8881812 L18.3850769,35.1707044 Z M11.006,3 L35,3 L35,41.8881812 L11.006,41.8881812 L11.006,3 Z" id="Organizations-front" sketch:type="MSShapeGroup"></path>
|
||||
>>>>>>> 470dc9b... Update icons on setup menu
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 3.0 KiB |
@@ -5,17 +5,12 @@
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Random" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
|
||||
<<<<<<< HEAD
|
||||
<g id="PortalMode--exit" sketch:type="MSArtboardGroup" fill="#FFFFFF">
|
||||
<g id="PortalMode--exit-arrow" sketch:type="MSLayerGroup" transform="translate(2.000000, 8.000000)">
|
||||
<path d="M11,8.25000041 L32.5589445,8.25 L32.5589445,13.451166 L11,13.4511664 L11,8.25000041 Z" id="Signout-arrow-line" sketch:type="MSShapeGroup"></path>
|
||||
<path d="M0.66,10.56 L11.22,0.66 L11.22,20.46 L0.66,10.56 L0.66,10.56 Z" id="Signout-arrowhead" sketch:type="MSShapeGroup"></path>
|
||||
</g>
|
||||
<path d="M7,8 L38,8 L38,31 L7,31 L7,8 Z M59,36 L59,0 L7,0 L7,36 L32,36 L32,44 L25,44 L25,46 L41,46 L41,44 L34,44 L34,36 L59,36" sketch:type="MSShapeGroup"></path>
|
||||
=======
|
||||
<g id="PortalMode" sketch:type="MSArtboardGroup" fill="#000000">
|
||||
<path d="M51,32.8695652 L51,0 L3,0 L3,32.8695652 L26.0769231,32.8695652 L26.0769231,40.173913 L19.6153846,40.173913 L19.6153846,42 L34.3846154,42 L34.3846154,40.173913 L27.9230769,40.173913 L27.9230769,32.8695652 L51,32.8695652" sketch:type="MSShapeGroup"></path>
|
||||
>>>>>>> 470dc9b... Update icons on setup menu
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.2 KiB |
15
awx/ui/static/img/User.svg
Normal file
15
awx/ui/static/img/User.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 6.5 KiB |
@@ -22,7 +22,8 @@ export default function() {
|
||||
restrict: 'E',
|
||||
templateUrl: '/static/js/main-menu/main-menu.partial.html',
|
||||
scope: {
|
||||
style: '&menuStyle'
|
||||
style: '&menuStyle',
|
||||
currentUser: '='
|
||||
},
|
||||
link: link
|
||||
};
|
||||
|
||||
@@ -4,5 +4,4 @@
|
||||
<menu-toggle-button width="15" height="15" bar-height="2"></menu-toggle-button>
|
||||
</a>
|
||||
<include-partial ng-include="menuStylePartialUrl"></include-partial>
|
||||
<web-socket-status class="MenuItem MenuItem--fixed"></web-socket-status>
|
||||
</nav>
|
||||
|
||||
@@ -5,9 +5,13 @@ import portalModeLink from './portal-mode-link.directive';
|
||||
import webSocketStatus from './web-socket-status.directive';
|
||||
|
||||
import includePartial from 'tower/shared/include-partial/main';
|
||||
import shared from 'tower/shared/main';
|
||||
|
||||
export default
|
||||
angular.module('mainMenu', [includePartial.name])
|
||||
angular.module('mainMenu',
|
||||
[ includePartial.name,
|
||||
shared.name
|
||||
])
|
||||
.directive('portalModeLink', portalModeLink)
|
||||
.directive('menuItem', menuItem)
|
||||
.directive('menuToggleButton', menuToggle)
|
||||
|
||||
@@ -1,45 +1,30 @@
|
||||
<a menu-item href="#/projects" title="Projects" class="MenuItem MenuItem--hoverable HoverIcon HoverIcon--onlyLarge">
|
||||
<i class="MenuItem-hoverIcon HoverIcon-icon HoverIcon-icon--opacity HoverIcon-icon--height">
|
||||
<aw-icon name="Projects"></aw-icon>
|
||||
</i>
|
||||
<a menu-item href="#/projects" title="Projects" class="MenuItem">
|
||||
Projects
|
||||
</a>
|
||||
<a menu-item href="#/inventories" title="Inventories" class="MenuItem MenuItem--hoverable HoverIcon HoverIcon--onlyLarge">
|
||||
<i class="MenuItem-hoverIcon HoverIcon-icon HoverIcon-icon--opacity HoverIcon-icon--height">
|
||||
<aw-icon name="CloudSync"></aw-icon>
|
||||
</i>
|
||||
<!-- <img src="/static/img/CloudSync.svg" class="MenuItem-hoverIcon HoverIcon-icon HoverIcon-icon--opacity HoverIcon-icon--height"> -->
|
||||
<a menu-item href="#/inventories" title="Inventories" class="MenuItem">
|
||||
Inventories
|
||||
</a>
|
||||
<a menu-item href="#/job_templates" title="Job Templates" class="MenuItem MenuItem--hoverable HoverIcon HoverIcon--onlyLarge">
|
||||
<i class="MenuItem-hoverIcon HoverIcon-icon HoverIcon-icon--opacity HoverIcon-icon--height">
|
||||
<aw-icon name="JobTemplates"></aw-icon>
|
||||
</i>
|
||||
<!-- <img src="/static/img/JobTemplates.svg" class="MenuItem-hover-icon HoverIcon-icon HoverIcon-icon--opacity HoverIcon-icon--height"> -->
|
||||
<a menu-item href="#/job_templates" title="Job Templates" class="MenuItem">
|
||||
Job Templates
|
||||
</a>
|
||||
<a menu-item href="#/jobs" title="Jobs" class="MenuItem MenuItem--hoverable HoverIcon HoverIcon--onlyLarge">
|
||||
<i class="MenuItem-hoverIcon HoverIcon-icon HoverIcon-icon--opacity HoverIcon-icon--height">
|
||||
<aw-icon name="Jobs"></aw-icon>
|
||||
</i>
|
||||
<!-- <img src="/static/img/Jobs.svg" class="MenuItem-hover-icon HoverIcon-icon HoverIcon-icon--opacity HoverIcon-icon--height"> -->
|
||||
<a menu-item href="#/jobs" title="Jobs" class="MenuItem">
|
||||
Jobs
|
||||
</a>
|
||||
<a href="#/setup" class="MenuItem MenuItem--right MenuItem--fixed" title="Setup">
|
||||
<img src="/static/img/Setup.svg" class="MenuItem-icon">
|
||||
<a href="/#/users/{{currentUser.id}}" class="MenuItem MenuItem--right MenuItem--fixed MenuItem-username">
|
||||
<img src="/static/img/User.svg" class="MenuItem-icon MenuItem-icon--labelled">
|
||||
<span class="u-truncatedText">
|
||||
{{currentUser.username}}
|
||||
</span>
|
||||
</a>
|
||||
<a href="#/setup" class="MenuItem MenuItem--fixed">
|
||||
<img title="Setup" data-placement="bottom" src="/static/img/Setup.svg" class="MenuItem-icon">
|
||||
<span class="MenuItem-helpTitle">Setup</span>
|
||||
</a>
|
||||
<a portal-mode-link class="MenuItem MenuItem--fixed" title="Portal Mode">
|
||||
<img src="/static/img/PortalMode.svg" class="MenuItem-icon">
|
||||
<a portal-mode-link class="MenuItem MenuItem--fixed">
|
||||
<img src="/static/img/PortalMode.svg" title="Portal Mode" data-placement="bottom" class="MenuItem-icon">
|
||||
<span class="MenuItem-helpTitle">Portal Mode</span>
|
||||
</a>
|
||||
<a href="#/logout" title="Sign out" class="MenuItem MenuItem--fixed">
|
||||
<img src="/static/img/Signout.svg" class="MenuItem-icon">
|
||||
<span class="MenuItem-helpTitle">Sign Out</span>
|
||||
</a>
|
||||
<a href="#setup" class="MenuItem MenuItem--setup" title="Setup">
|
||||
Setup
|
||||
</a>
|
||||
<a href="#logout" title="Sign out" class="MenuItem MenuItem--fixed">
|
||||
<img src="/static/img/Signout.svg" class="MenuItem-icon">
|
||||
<a href="#/logout"class="MenuItem MenuItem--fixed MenuItem-signout">
|
||||
<img src="/static/img/Signout.svg" title="Sign out" data-placement="bottom" class="MenuItem-icon">
|
||||
<span class="MenuItem-helpTitle">Sign Out</span>
|
||||
</a>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<button menu-toggle class="Menu-toggle MenuToggle Button--pseudo">
|
||||
<button menu-toggle class="MenuToggle Button--pseudo">
|
||||
<svg class="MenuToggle-icon" width="12" height="10">
|
||||
<rect class="MenuToggle-bar MenuToggle-topBar" x="0" y="0" width="100%" height="2" />
|
||||
<rect class="MenuToggle-bar MenuToggle-crossBar1" x="0" y="4" width="100%" height="2" />
|
||||
|
||||
@@ -33,17 +33,16 @@
|
||||
&-icon {
|
||||
// height: 28px;
|
||||
&--aside {
|
||||
width: @icon-small-size;
|
||||
align-self: flex-start;
|
||||
}
|
||||
|
||||
flex: none; // do not let the flex container adjust this width!
|
||||
flex: none; // do not let the flex container adjust this width!
|
||||
width: @icon-large-size;
|
||||
align-self: center;
|
||||
}
|
||||
|
||||
&--noIcon {
|
||||
margin-left: @icon-small-size + 1.4rem; // 1.4rem comes from Media-figure margin
|
||||
margin-left: @icon-large-size + 1.4rem; // 1.4rem comes from Media-figure margin
|
||||
}
|
||||
|
||||
&--button {
|
||||
|
||||
@@ -31,8 +31,6 @@
|
||||
font-family: merriweather;
|
||||
font-weight: lighter;
|
||||
color: black;
|
||||
padding: 1.4rem;
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 930px) {
|
||||
|
||||
@@ -5,15 +5,38 @@
|
||||
.MenuItem {
|
||||
display: flex;
|
||||
flex: none;
|
||||
padding: 2.8rem 0;
|
||||
padding: 0 1rem;
|
||||
min-height: 5.8rem;
|
||||
min-width: 9.2rem;
|
||||
color: black;
|
||||
margin-right: 2rem;
|
||||
align-items: center;
|
||||
|
||||
&:hover {
|
||||
color: black;
|
||||
}
|
||||
|
||||
&:last-child {
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 570px) {
|
||||
flex: 1 1 0;
|
||||
padding: 0 1rem;
|
||||
margin-right: 0;
|
||||
border-bottom: solid thin rgb(202, 202, 202);
|
||||
|
||||
.tooltip, &+.tooltip {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
&--logo {
|
||||
position: relative;
|
||||
border: none;
|
||||
}
|
||||
}
|
||||
|
||||
&--fixed {
|
||||
@media screen and (max-width: 570px) {
|
||||
flex: 1 0 100% !important;
|
||||
justify-content: center;
|
||||
}
|
||||
flex: none;
|
||||
min-width: 0;
|
||||
margin-right: 0 !important;
|
||||
@@ -25,12 +48,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
&--logo {
|
||||
@media screen and (max-width: 570px) {
|
||||
justify-content: center;
|
||||
}
|
||||
}
|
||||
|
||||
&-hoverIcon {
|
||||
width: 28px;
|
||||
}
|
||||
@@ -46,24 +63,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
&--hoverable {
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
transition: background-color 0.3s;
|
||||
}
|
||||
&--context {
|
||||
// Push this and all following elements to the right
|
||||
margin-left: auto;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
|
||||
.MenuItem {
|
||||
// Make sure items in this container are aligned to
|
||||
// the right-hand side (on rtl platforms)
|
||||
align-self: flex-end;
|
||||
}
|
||||
}
|
||||
|
||||
&--right {
|
||||
// Push this and all following elements to the right
|
||||
margin-left: auto;
|
||||
@@ -95,17 +94,35 @@
|
||||
&-logo {
|
||||
height: 34px;
|
||||
width: auto;
|
||||
@media screen and (max-width: 570px) {
|
||||
height: 25px;
|
||||
}
|
||||
}
|
||||
|
||||
&-icon {
|
||||
height: 13px;
|
||||
width: auto;
|
||||
flex: none;
|
||||
&--labelled {
|
||||
margin-right: 0.25rem;
|
||||
}
|
||||
@media screen and (max-width: 570px) {
|
||||
display: none;
|
||||
margin-right: 1.4rem;
|
||||
}
|
||||
}
|
||||
|
||||
&-username {
|
||||
padding-right: 0.25rem;
|
||||
@media screen and (max-width: 570px) {
|
||||
order: 1; // moves this to the bottom
|
||||
}
|
||||
@media screen and (min-width: 571px) {
|
||||
max-width: 110px;
|
||||
}
|
||||
}
|
||||
|
||||
&-signout {
|
||||
@media screen and (min-width: 571px) {
|
||||
padding-left: 0.25rem;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -7,40 +7,25 @@
|
||||
|
||||
&--main {
|
||||
background-color: white;
|
||||
padding: 0 1rem;
|
||||
margin: 0;
|
||||
.MenuItem {
|
||||
color: black;
|
||||
margin-right: 2rem;
|
||||
padding: 0 1rem;
|
||||
align-items: center;
|
||||
&:last-child {
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
|
||||
@media screen and (max-width: 570px) {
|
||||
position: relative;
|
||||
transition: height 1s;
|
||||
transition: height 0.5s ease-out;
|
||||
justify-content: flex-start;
|
||||
flex-wrap: wrap;
|
||||
flex-direction: column;
|
||||
height: 56px;
|
||||
overflow: hidden;
|
||||
|
||||
&.Menu--open {
|
||||
height: 348px !important;
|
||||
border-bottom: solid thin black;
|
||||
height: 523px !important;
|
||||
// border-bottom: solid thin black;
|
||||
}
|
||||
|
||||
.MenuItem {
|
||||
flex: 1 0 50%;
|
||||
padding: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
&--logo {
|
||||
flex: 2 0 100%;
|
||||
}
|
||||
}
|
||||
@media screen and (min-width: 571px) {
|
||||
padding: 0 1rem;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -67,6 +52,7 @@
|
||||
@media screen and (min-width: 571px) {
|
||||
display: none;
|
||||
}
|
||||
margin-left: auto;
|
||||
}
|
||||
|
||||
&--fixed-top {
|
||||
|
||||
4
awx/ui/static/js/shared/utilities/truncated-text.less
Normal file
4
awx/ui/static/js/shared/utilities/truncated-text.less
Normal file
@@ -0,0 +1,4 @@
|
||||
.u-truncatedText {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
@@ -26,14 +26,22 @@
|
||||
<script src="{{ STATIC_URL }}tower.concat.js?v={{version}}"></script>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
<body data-user-agent="{{userAgent}}">
|
||||
|
||||
<include-svg href="{{ STATIC_URL }}img/icons.svg"></include-svg>
|
||||
|
||||
<main-menu
|
||||
menu-style="portalMode ? 'minimal' : 'default'">
|
||||
menu-style="portalMode ? 'minimal' : 'default'"
|
||||
current-user="current_user">
|
||||
</main-menu>
|
||||
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-lg-11"></div>
|
||||
<div class="col-lg-1">
|
||||
<web-socket-status></web-socket-status>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container-fluid" id="#content-container">
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
|
||||
Reference in New Issue
Block a user