From 571c72bd162f7d05d204f67d8d2b5833e78198bc Mon Sep 17 00:00:00 2001 From: Michael Krotscheck Date: Tue, 10 Jun 2014 14:51:12 -0700 Subject: [PATCH] New StoryBoard Logo This patch adds both the openstack and storyboard font glyph source SVG files to our repostiory, as well as a tool that allows us to convert those SVG files into a font (with the associated LESS). The tool at the moment still has to be run manually, because grunt-webtool requires fontforge which is not installable via NPM (you can run it manually using 'grunt webfont'). The old custom font has been removed. (Put up as a separate patch because it's likely to be contentious) Change-Id: I60be7ea3b8fce7cc210538719cc1ec5d20d50f60 --- Gruntfile.js | 20 +++++ package.json | 5 +- src/app/storyboard/template/header_menu.html | 5 +- src/fonts/custom_font_icons.eot | Bin 5136 -> 0 bytes src/fonts/custom_font_icons.ttf | Bin 4924 -> 0 bytes src/fonts/custom_font_icons.woff | Bin 3088 -> 0 bytes src/fonts/custom_icons.eot | Bin 0 -> 2472 bytes src/fonts/custom_icons.svg | 37 ++++++++ src/fonts/custom_icons.ttf | Bin 0 -> 2280 bytes src/fonts/custom_icons.woff | Bin 0 -> 1680 bytes src/fonts/src/openstack.svg | 87 +++++++++++++++++++ src/fonts/src/storyboard.svg | 21 +++++ src/theme/base/body.less | 6 +- src/theme/base/custom_font_icons.less | 40 --------- src/theme/base/custom_icons.less | 58 +++++++++++++ src/theme/main.less | 2 +- 16 files changed, 232 insertions(+), 49 deletions(-) delete mode 100644 src/fonts/custom_font_icons.eot delete mode 100644 src/fonts/custom_font_icons.ttf delete mode 100644 src/fonts/custom_font_icons.woff create mode 100644 src/fonts/custom_icons.eot create mode 100644 src/fonts/custom_icons.svg create mode 100644 src/fonts/custom_icons.ttf create mode 100644 src/fonts/custom_icons.woff create mode 100644 src/fonts/src/openstack.svg create mode 100644 src/fonts/src/storyboard.svg delete mode 100644 src/theme/base/custom_font_icons.less create mode 100644 src/theme/base/custom_icons.less diff --git a/Gruntfile.js b/Gruntfile.js index 4516193f..9ffe3269 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -178,6 +178,26 @@ module.exports = function (grunt) { } }, + /** + * Compile our SVG's into fonts. This is a utility method only which + * needs to be executed manually. + */ + webfont: { + custom_icons: { + src: dir.source + '/fonts/src/*.svg', + dest: dir.source + '/fonts', + destCss: dir.source + '/theme/base', + options: { + font: 'custom_icons', + syntax: 'bem', + htmlDemo: false, + stylesheet: 'css', + relativeFontPath: '../../fonts', + hashes: false + } + } + }, + /** * grunt html2js * diff --git a/package.json b/package.json index 1253b13a..083ad292 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "grunt-protractor-runner": "0.2.3", "selenium-standalone": "2.39.0-2.7.0", "karma-html-reporter": "0.1.1", - "grunt-connect-proxy": "0.1.10" - } + "grunt-connect-proxy": "0.1.10", + "grunt-webfont": "0.4.2" + } } diff --git a/src/app/storyboard/template/header_menu.html b/src/app/storyboard/template/header_menu.html index 61d0f646..f322976a 100644 --- a/src/app/storyboard/template/header_menu.html +++ b/src/app/storyboard/template/header_menu.html @@ -31,7 +31,10 @@
- StoryBoard + + + StoryBoard +