diff --git a/awx/ui/client/assets/fontcustom/.fontcustom-manifest.json b/awx/ui/client/assets/fontcustom/.fontcustom-manifest.json new file mode 100644 index 0000000000..06fddffd64 --- /dev/null +++ b/awx/ui/client/assets/fontcustom/.fontcustom-manifest.json @@ -0,0 +1,50 @@ +{ + "checksum": { + "previous": "e4442d278bfc4c1a673bdd29512213a18cfaf74decd9bb21ecd698b4860e7453", + "current": "e4442d278bfc4c1a673bdd29512213a18cfaf74decd9bb21ecd698b4860e7453" + }, + "fonts": [ + "..//fontcustom_e4442d278bfc4c1a673bdd29512213a1.ttf", + "..//fontcustom_e4442d278bfc4c1a673bdd29512213a1.svg", + "..//fontcustom_e4442d278bfc4c1a673bdd29512213a1.woff", + "..//fontcustom_e4442d278bfc4c1a673bdd29512213a1.eot" + ], + "glyphs": { + "fontcustom_fbf6cfce71d2c35351b84596defbfd01": { + "codepoint": 61696, + "source": "./fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg" + } + }, + "options": { + "autowidth": false, + "config": false, + "css_selector": ".icon-{{glyph}}", + "debug": false, + "font_ascent": 448, + "font_descent": 64, + "font_design_size": 16, + "font_em": 512, + "font_name": "fontcustom", + "force": true, + "input": { + "templates": ".", + "vectors": "." + }, + "no_hash": false, + "output": { + "css": "../", + "fonts": "../", + "preview": "../" + }, + "preprocessor_path": null, + "quiet": false, + "templates": [ + "css", + "preview" + ] + }, + "templates": [ + "../fontcustom.css", + "../fontcustom-preview.html" + ] +} \ No newline at end of file diff --git a/awx/ui/client/assets/fontcustom/fontcustom-preview.html b/awx/ui/client/assets/fontcustom/fontcustom-preview.html index 48cb53f8af..becd88eca8 100644 --- a/awx/ui/client/assets/fontcustom/fontcustom-preview.html +++ b/awx/ui/client/assets/fontcustom/fontcustom-preview.html @@ -141,11 +141,11 @@ @font-face { font-family: "fontcustom"; - src: url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot"); - src: url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot?#iefix") format("embedded-opentype"), - url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.woff") format("woff"), - url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.ttf") format("truetype"), - url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg#fontcustom") format("svg"); + src: url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot"); + src: url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot?#iefix") format("embedded-opentype"), + url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.woff") format("woff"), + url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.ttf") format("truetype"), + url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg#fontcustom") format("svg"); font-weight: normal; font-style: normal; } @@ -153,7 +153,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: "fontcustom"; - src: url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg#fontcustom") format("svg"); + src: url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg#fontcustom") format("svg"); } } @@ -163,6 +163,9 @@ .icon-activity-stream:before, .icon-google:before, .icon-launch:before, +.icon-launch-circle:before, +.icon-launch-new:before, +.icon-launch2:before, .icon-saml-02:before, .icon-user:before { display: inline-block; @@ -182,6 +185,9 @@ .icon-activity-stream:before { content: "\f102"; } .icon-google:before { content: "\f100"; } .icon-launch:before { content: "\f103"; } +.icon-launch-circle:before { content: "\f105"; } +.icon-launch-new:before { content: "\f107"; } +.icon-launch2:before { content: "\f106"; } .icon-saml-02:before { content: "\f101"; } .icon-user:before { content: "\f104"; } @@ -199,7 +205,7 @@
-

fontcustom contains 5 glyphs:

+

fontcustom contains 8 glyphs:

Toggle Preview Characters
@@ -243,6 +249,45 @@
+
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+
PpPpPpPpPpPpPpPpPpPp diff --git a/awx/ui/client/assets/fontcustom/fontcustom.css b/awx/ui/client/assets/fontcustom/fontcustom.css index 996fef5fe0..39ab124bda 100644 --- a/awx/ui/client/assets/fontcustom/fontcustom.css +++ b/awx/ui/client/assets/fontcustom/fontcustom.css @@ -4,11 +4,11 @@ @font-face { font-family: "fontcustom"; - src: url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot"); - src: url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot?#iefix") format("embedded-opentype"), - url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.woff") format("woff"), - url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.ttf") format("truetype"), - url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg#fontcustom") format("svg"); + src: url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot"); + src: url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot?#iefix") format("embedded-opentype"), + url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.woff") format("woff"), + url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.ttf") format("truetype"), + url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg#fontcustom") format("svg"); font-weight: normal; font-style: normal; } @@ -16,7 +16,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: "fontcustom"; - src: url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg#fontcustom") format("svg"); + src: url("./fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg#fontcustom") format("svg"); } } @@ -26,6 +26,9 @@ .icon-activity-stream:before, .icon-google:before, .icon-launch:before, +.icon-launch-circle:before, +.icon-launch-new:before, +.icon-launch2:before, .icon-saml-02:before, .icon-user:before { display: inline-block; @@ -45,5 +48,8 @@ .icon-activity-stream:before { content: "\f102"; } .icon-google:before { content: "\f100"; } .icon-launch:before { content: "\f103"; } +.icon-launch-circle:before { content: "\f105"; } +.icon-launch-new:before { content: "\f107"; } +.icon-launch2:before { content: "\f106"; } .icon-saml-02:before { content: "\f101"; } .icon-user:before { content: "\f104"; } diff --git a/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot b/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot new file mode 100644 index 0000000000..739e0b64f5 Binary files /dev/null and b/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot differ diff --git a/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg b/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg new file mode 100644 index 0000000000..f1fe2ac03d --- /dev/null +++ b/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg @@ -0,0 +1,108 @@ + + + + + +Created by FontForge 20150401 at Thu Nov 12 14:46:50 2015 + By John Mitchell +Copyright (c) 2015, John Mitchell + + + + + + + + + + + + + + + + diff --git a/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.ttf b/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.ttf new file mode 100644 index 0000000000..5d151b75b0 Binary files /dev/null and b/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.ttf differ diff --git a/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.woff b/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.woff new file mode 100644 index 0000000000..4c79bee685 Binary files /dev/null and b/awx/ui/client/assets/fontcustom/fontcustom_d77a9996ed04d45b02f5c06874cd36db.woff differ diff --git a/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot b/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot deleted file mode 100644 index bbac28619d..0000000000 Binary files a/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot and /dev/null differ diff --git a/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg b/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg deleted file mode 100644 index 6a8eea52fa..0000000000 --- a/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg +++ /dev/null @@ -1,72 +0,0 @@ - - - - - -Created by FontForge 20150401 at Wed Nov 4 19:00:26 2015 - By John Mitchell -Copyright (c) 2015, John Mitchell - - - - - - - - - - - - - diff --git a/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.ttf b/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.ttf deleted file mode 100644 index ee6d0e05a7..0000000000 Binary files a/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.ttf and /dev/null differ diff --git a/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.woff b/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.woff deleted file mode 100644 index 566b28175a..0000000000 Binary files a/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.woff and /dev/null differ diff --git a/awx/ui/client/assets/fontcustom/new_icons/.fontcustom-manifest.json b/awx/ui/client/assets/fontcustom/new_icons/.fontcustom-manifest.json index cbff15adcb..3177b52034 100644 --- a/awx/ui/client/assets/fontcustom/new_icons/.fontcustom-manifest.json +++ b/awx/ui/client/assets/fontcustom/new_icons/.fontcustom-manifest.json @@ -1,13 +1,13 @@ { "checksum": { - "previous": "fbf6cfce71d2c35351b84596defbfd01ac87f29865d8f21d344cf5021e1345b0", - "current": "fbf6cfce71d2c35351b84596defbfd01ac87f29865d8f21d344cf5021e1345b0" + "previous": "d77a9996ed04d45b02f5c06874cd36db7f5daa9833b1a6c36bef7029a767a34f", + "current": "d77a9996ed04d45b02f5c06874cd36db7f5daa9833b1a6c36bef7029a767a34f" }, "fonts": [ - "..//fontcustom_fbf6cfce71d2c35351b84596defbfd01.ttf", - "..//fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg", - "..//fontcustom_fbf6cfce71d2c35351b84596defbfd01.woff", - "..//fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot" + "..//fontcustom_d77a9996ed04d45b02f5c06874cd36db.ttf", + "..//fontcustom_d77a9996ed04d45b02f5c06874cd36db.svg", + "..//fontcustom_d77a9996ed04d45b02f5c06874cd36db.woff", + "..//fontcustom_d77a9996ed04d45b02f5c06874cd36db.eot" ], "glyphs": { "activity-stream": { @@ -22,6 +22,18 @@ "codepoint": 61699, "source": "./launch.svg" }, + "launch-circle": { + "codepoint": 61701, + "source": "./launch-circle.svg" + }, + "launch-new": { + "codepoint": 61703, + "source": "./launch-new.svg" + }, + "launch2": { + "codepoint": 61702, + "source": "./launch2.svg" + }, "saml-02": { "codepoint": 61697, "source": "./saml-02.svg" diff --git a/awx/ui/client/assets/fontcustom/new_icons/activity-stream.svg b/awx/ui/client/assets/fontcustom/new_icons/activity-stream.svg index a085ffefb6..2915f904da 100644 --- a/awx/ui/client/assets/fontcustom/new_icons/activity-stream.svg +++ b/awx/ui/client/assets/fontcustom/new_icons/activity-stream.svg @@ -1,15 +1,15 @@ + viewBox="0 0 200 200" style="enable-background:new 0 0 200 200;" xml:space="preserve"> - - + + l3.5-4.6c1.2-1.4,3.2-2.4,5.3-2.4h17.5c0.5-4.1,0.8-8.3,0.8-12.6c0-55.2-44.8-100-100-100S0.1,44.8,0.1,100c0,5.1,0.4,10.1,1.1,15 + H31.8z"/> diff --git a/awx/ui/client/assets/fontcustom/new_icons/launch.svg b/awx/ui/client/assets/fontcustom/new_icons/launch.svg index 396289cde6..22eec6bab0 100644 --- a/awx/ui/client/assets/fontcustom/new_icons/launch.svg +++ b/awx/ui/client/assets/fontcustom/new_icons/launch.svg @@ -1,28 +1,18 @@ + viewBox="0 0 200 200" style="enable-background:new 0 0 200 200;" xml:space="preserve"> - - - - - - - - - - - - + diff --git a/awx/ui/client/assets/fontcustom/new_icons/user.svg b/awx/ui/client/assets/fontcustom/new_icons/user.svg index 5637e50c0e..7b38db83e6 100644 --- a/awx/ui/client/assets/fontcustom/new_icons/user.svg +++ b/awx/ui/client/assets/fontcustom/new_icons/user.svg @@ -1,11 +1,11 @@ - + viewBox="0 0 200 200" style="enable-background:new 0 0 200 200;" xml:space="preserve"> + diff --git a/awx/ui/client/src/main-menu/main-menu.block.less b/awx/ui/client/src/main-menu/main-menu.block.less index e7363659f8..4c9c12d43b 100644 --- a/awx/ui/client/src/main-menu/main-menu.block.less +++ b/awx/ui/client/src/main-menu/main-menu.block.less @@ -123,18 +123,6 @@ margin-right: -1px; } - // the user item is a little different based on the icon being - // strangely positioned - .MainMenu-item--user { - margin-top: -3px; - padding-left: 25px; - } - - .MainMenu-item--user:hover, - .MainMenu-item--user.is-currentRoute { - padding-left: 26px; - } - .MainMenu-item:hover, .MainMenu-item.is-currentRoute { padding-top: 5px; @@ -151,8 +139,7 @@ .MainMenu-itemImage--user { font-size: 21px; - margin-top: -9px; - margin-right: -9px; + margin-right: -5px; } .MainMenu-itemImage--docs {