diff --git a/awx/ui/client/assets/fontcustom/fontcustom-preview.html b/awx/ui/client/assets/fontcustom/fontcustom-preview.html new file mode 100644 index 0000000000..385f401107 --- /dev/null +++ b/awx/ui/client/assets/fontcustom/fontcustom-preview.html @@ -0,0 +1,233 @@ + + + + fontcustom glyphs preview + + + + + + + + + +
+
+

fontcustom contains 2 glyphs:

+ Toggle Preview Characters +
+ + +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ + + +
+ + diff --git a/awx/ui/client/assets/fontcustom/fontcustom.css b/awx/ui/client/assets/fontcustom/fontcustom.css new file mode 100644 index 0000000000..1fead6332d --- /dev/null +++ b/awx/ui/client/assets/fontcustom/fontcustom.css @@ -0,0 +1,43 @@ +/* + Icon Font: fontcustom +*/ + +@font-face { + font-family: "fontcustom"; + src: url("./fontcustom_037607f2fd8b86abb9de4b13a05fde60.eot"); + src: url("./fontcustom_037607f2fd8b86abb9de4b13a05fde60.eot?#iefix") format("embedded-opentype"), + url("./fontcustom_037607f2fd8b86abb9de4b13a05fde60.woff") format("woff"), + url("./fontcustom_037607f2fd8b86abb9de4b13a05fde60.ttf") format("truetype"), + url("./fontcustom_037607f2fd8b86abb9de4b13a05fde60.svg#fontcustom") format("svg"); + font-weight: normal; + font-style: normal; +} + +@media screen and (-webkit-min-device-pixel-ratio:0) { + @font-face { + font-family: "fontcustom"; + src: url("./fontcustom_037607f2fd8b86abb9de4b13a05fde60.svg#fontcustom") format("svg"); + } +} + +[data-icon]:before { content: attr(data-icon); } + +[data-icon]:before, +.icon-google:before, +.icon-saml-02:before { + display: inline-block; + font-family: "fontcustom"; + font-style: normal; + font-weight: normal; + font-variant: normal; + line-height: 1; + text-decoration: inherit; + text-rendering: optimizeLegibility; + text-transform: none; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + font-smoothing: antialiased; +} + +.icon-google:before { content: "\f100"; } +.icon-saml-02:before { content: "\f101"; } diff --git a/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.eot b/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.eot new file mode 100644 index 0000000000..2bdff030a7 Binary files /dev/null and b/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.eot differ diff --git a/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.svg b/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.svg new file mode 100644 index 0000000000..dace3c481c --- /dev/null +++ b/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.svg @@ -0,0 +1,47 @@ + + + + + +Created by FontForge 20150401 at Fri Sep 25 14:52:01 2015 + By John Mitchell +Copyright (c) 2015, John Mitchell + + + + + + + + + + diff --git a/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.ttf b/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.ttf new file mode 100644 index 0000000000..edfa1ff528 Binary files /dev/null and b/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.ttf differ diff --git a/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.woff b/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.woff new file mode 100644 index 0000000000..dc683eb4fa Binary files /dev/null and b/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.woff 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 new file mode 100644 index 0000000000..3f5b945913 --- /dev/null +++ b/awx/ui/client/assets/fontcustom/new_icons/.fontcustom-manifest.json @@ -0,0 +1,54 @@ +{ + "checksum": { + "previous": "037607f2fd8b86abb9de4b13a05fde6090c547d09c5428dac65a185505077e6a", + "current": "037607f2fd8b86abb9de4b13a05fde6090c547d09c5428dac65a185505077e6a" + }, + "fonts": [ + "..//fontcustom_037607f2fd8b86abb9de4b13a05fde60.ttf", + "..//fontcustom_037607f2fd8b86abb9de4b13a05fde60.svg", + "..//fontcustom_037607f2fd8b86abb9de4b13a05fde60.woff", + "..//fontcustom_037607f2fd8b86abb9de4b13a05fde60.eot" + ], + "glyphs": { + "google": { + "codepoint": 61696, + "source": "./google.svg" + }, + "saml-02": { + "codepoint": 61697, + "source": "./saml-02.svg" + } + }, + "options": { + "autowidth": false, + "config": "fontcustom.yml", + "css_selector": ".icon-{{glyph}}", + "debug": false, + "font_ascent": 448, + "font_descent": 64, + "font_design_size": 16, + "font_em": 512, + "font_name": "fontcustom", + "force": false, + "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/new_icons/fontcustom.yml b/awx/ui/client/assets/fontcustom/new_icons/fontcustom.yml new file mode 100644 index 0000000000..69a38ba71b --- /dev/null +++ b/awx/ui/client/assets/fontcustom/new_icons/fontcustom.yml @@ -0,0 +1,96 @@ +# ============================================================================= +# Font Custom Configuration +# This file should live in the directory where you run `fontcustom compile`. +# For more info, visit . +# ============================================================================= + + +# ----------------------------------------------------------------------------- +# Project Info +# ----------------------------------------------------------------------------- + +# The font's name. Also determines the file names of generated templates. +#font_name: icons + +# Format of CSS selectors. {{glyph}} is substituted for the glyph name. +#css_selector: .i-{{glyph}} + +# Generate fonts without asset-busting hashes. +#no_hash: true + +# Encode WOFF fonts into the generated CSS. +#base64: true + +# Forces compilation, even if inputs have not changed +#force: true + +# Display (possibly useful) debugging messages. +#debug: true + +# Hide status messages. +#quiet: true + + +# ----------------------------------------------------------------------------- +# Input / Output Locations +# You can save generated fonts, CSS, and other files to different locations +# here. Font Custom can also read input vectors and templates from different +# places. +# +# NOTE: +# - Be sure to preserve the whitespace in these YAML hashes. +# - INPUT[:vectors] and OUTPUT[:fonts] are required. Everything else is +# optional. +# - Specify output locations for custom templates by including their file +# names as the key. +# ----------------------------------------------------------------------------- + +#input: +# vectors: my/vectors +# templates: my/templates + +#output: +# fonts: app/assets/fonts +# css: app/assets/stylesheets +# preview: app/views/styleguide +# my-custom-template.yml: path/to/template/output + + +# ----------------------------------------------------------------------------- +# Templates +# A YAML array of templates and files to generate alongside fonts. Custom +# templates should be saved in the INPUT[:templates] directory and referenced +# by their base file name. +# +# For Rails and Compass templates, set `preprocessor_path` as the relative +# path from OUTPUT[:css] to OUTPUT[:fonts]. By default, these are the same +# directory. +# +# Included in Font Custom: preview, css, scss, scss-rails +# Default: css, preview +# ----------------------------------------------------------------------------- + +#templates: +#- scss-rails +#- preview +#- my-custom-template.yml + +#preprocessor_path: ../fonts/ + + +# ----------------------------------------------------------------------------- +# Font Settings (defaults shown) +# ----------------------------------------------------------------------------- + +# Size (in pica points) for which your font is designed. +#font_design_size: 16 + +# The em size. Setting this will scale the entire font to the given size. +#font_em: 512 + +# The font's ascent and descent. Used to calculate the baseline. +#font_ascent: 448 +#font_descent: 64 + +# Horizontally fit glyphs to their individual vector widths. +#autowidth: false diff --git a/awx/ui/client/assets/fontcustom/new_icons/google.svg b/awx/ui/client/assets/fontcustom/new_icons/google.svg new file mode 100644 index 0000000000..530a136d6c --- /dev/null +++ b/awx/ui/client/assets/fontcustom/new_icons/google.svg @@ -0,0 +1,17 @@ + + + + + + diff --git a/awx/ui/client/assets/fontcustom/new_icons/saml-02.svg b/awx/ui/client/assets/fontcustom/new_icons/saml-02.svg new file mode 100644 index 0000000000..1f33a6c8fc --- /dev/null +++ b/awx/ui/client/assets/fontcustom/new_icons/saml-02.svg @@ -0,0 +1,15 @@ + + + + + + diff --git a/awx/ui/client/src/login/thirdPartySignOn.block.less b/awx/ui/client/src/login/thirdPartySignOn.block.less index fcf31cde10..5e251254a4 100644 --- a/awx/ui/client/src/login/thirdPartySignOn.block.less +++ b/awx/ui/client/src/login/thirdPartySignOn.block.less @@ -12,7 +12,7 @@ } .ThirdPartySignOn-item { - margin-left: 10px; + margin-left: 15px; } .ThirdPartySignOn-button { @@ -33,3 +33,7 @@ .ThirdPartySignOn-icon { font-size: 35px; } + +.ThirdPartySignOn-icon--fontCustom { + font-size: 30px; +} diff --git a/awx/ui/client/src/login/thirdPartySignOn.directive.js b/awx/ui/client/src/login/thirdPartySignOn.directive.js index b4952ed91e..46bf5528a7 100644 --- a/awx/ui/client/src/login/thirdPartySignOn.directive.js +++ b/awx/ui/client/src/login/thirdPartySignOn.directive.js @@ -19,21 +19,21 @@ export default scope.loginItems = [ { type: "foo", - icon: "fa-github", + icon: "ThirdPartySignOn-icon--fontCustom icon-google", link: "https://google.com", - tooltip: "Login in via Google" + tooltip: "Sign in with Google" }, { type: "foo", icon: "fa-github", link: "https://google.com", - tooltip: "Login in via Github" + tooltip: "Sign in with Github" }, { type: "foo", - icon: "fa-github", + icon: "ThirdPartySignOn-icon--fontCustom icon-saml-02", link: "https://google.com", - tooltip: "Login in via SAML" + tooltip: "Sign in with SAML" } ] diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html index 664b1474c1..74ce0464a2 100644 --- a/awx/ui/templates/ui/index.html +++ b/awx/ui/templates/ui/index.html @@ -7,6 +7,7 @@ +