From d7759fbf4d5b9003ff7beb2c03584524f23abb65 Mon Sep 17 00:00:00 2001 From: Matt Ickstadt Date: Tue, 15 May 2018 12:18:02 -0500 Subject: [PATCH] Remove underscore from FontAwesome directory --- src/renderer/html_handlebars/hbs_renderer.rs | 14 +++++++------- .../css/font-awesome.min.css | 0 .../fonts/FontAwesome.otf | Bin .../fonts/fontawesome-webfont.eot | Bin .../fonts/fontawesome-webfont.svg | 0 .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin .../fonts/fontawesome-webfont.woff2 | Bin src/theme/index.hbs | 2 +- src/theme/mod.rs | 14 +++++++------- 10 files changed, 15 insertions(+), 15 deletions(-) rename src/theme/{_FontAwesome => FontAwesome}/css/font-awesome.min.css (100%) rename src/theme/{_FontAwesome => FontAwesome}/fonts/FontAwesome.otf (100%) rename src/theme/{_FontAwesome => FontAwesome}/fonts/fontawesome-webfont.eot (100%) rename src/theme/{_FontAwesome => FontAwesome}/fonts/fontawesome-webfont.svg (100%) rename src/theme/{_FontAwesome => FontAwesome}/fonts/fontawesome-webfont.ttf (100%) rename src/theme/{_FontAwesome => FontAwesome}/fonts/fontawesome-webfont.woff (100%) rename src/theme/{_FontAwesome => FontAwesome}/fonts/fontawesome-webfont.woff2 (100%) diff --git a/src/renderer/html_handlebars/hbs_renderer.rs b/src/renderer/html_handlebars/hbs_renderer.rs index 8fe37e47..e195dc76 100644 --- a/src/renderer/html_handlebars/hbs_renderer.rs +++ b/src/renderer/html_handlebars/hbs_renderer.rs @@ -155,37 +155,37 @@ impl HtmlHandlebars { write_file(destination, "clipboard.min.js", &theme.clipboard_js)?; write_file( destination, - "_FontAwesome/css/font-awesome.css", + "FontAwesome/css/font-awesome.css", theme::FONT_AWESOME, )?; write_file( destination, - "_FontAwesome/fonts/fontawesome-webfont.eot", + "FontAwesome/fonts/fontawesome-webfont.eot", theme::FONT_AWESOME_EOT, )?; write_file( destination, - "_FontAwesome/fonts/fontawesome-webfont.svg", + "FontAwesome/fonts/fontawesome-webfont.svg", theme::FONT_AWESOME_SVG, )?; write_file( destination, - "_FontAwesome/fonts/fontawesome-webfont.ttf", + "FontAwesome/fonts/fontawesome-webfont.ttf", theme::FONT_AWESOME_TTF, )?; write_file( destination, - "_FontAwesome/fonts/fontawesome-webfont.woff", + "FontAwesome/fonts/fontawesome-webfont.woff", theme::FONT_AWESOME_WOFF, )?; write_file( destination, - "_FontAwesome/fonts/fontawesome-webfont.woff2", + "FontAwesome/fonts/fontawesome-webfont.woff2", theme::FONT_AWESOME_WOFF2, )?; write_file( destination, - "_FontAwesome/fonts/FontAwesome.ttf", + "FontAwesome/fonts/FontAwesome.ttf", theme::FONT_AWESOME_TTF, )?; diff --git a/src/theme/_FontAwesome/css/font-awesome.min.css b/src/theme/FontAwesome/css/font-awesome.min.css similarity index 100% rename from src/theme/_FontAwesome/css/font-awesome.min.css rename to src/theme/FontAwesome/css/font-awesome.min.css diff --git a/src/theme/_FontAwesome/fonts/FontAwesome.otf b/src/theme/FontAwesome/fonts/FontAwesome.otf similarity index 100% rename from src/theme/_FontAwesome/fonts/FontAwesome.otf rename to src/theme/FontAwesome/fonts/FontAwesome.otf diff --git a/src/theme/_FontAwesome/fonts/fontawesome-webfont.eot b/src/theme/FontAwesome/fonts/fontawesome-webfont.eot similarity index 100% rename from src/theme/_FontAwesome/fonts/fontawesome-webfont.eot rename to src/theme/FontAwesome/fonts/fontawesome-webfont.eot diff --git a/src/theme/_FontAwesome/fonts/fontawesome-webfont.svg b/src/theme/FontAwesome/fonts/fontawesome-webfont.svg similarity index 100% rename from src/theme/_FontAwesome/fonts/fontawesome-webfont.svg rename to src/theme/FontAwesome/fonts/fontawesome-webfont.svg diff --git a/src/theme/_FontAwesome/fonts/fontawesome-webfont.ttf b/src/theme/FontAwesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from src/theme/_FontAwesome/fonts/fontawesome-webfont.ttf rename to src/theme/FontAwesome/fonts/fontawesome-webfont.ttf diff --git a/src/theme/_FontAwesome/fonts/fontawesome-webfont.woff b/src/theme/FontAwesome/fonts/fontawesome-webfont.woff similarity index 100% rename from src/theme/_FontAwesome/fonts/fontawesome-webfont.woff rename to src/theme/FontAwesome/fonts/fontawesome-webfont.woff diff --git a/src/theme/_FontAwesome/fonts/fontawesome-webfont.woff2 b/src/theme/FontAwesome/fonts/fontawesome-webfont.woff2 similarity index 100% rename from src/theme/_FontAwesome/fonts/fontawesome-webfont.woff2 rename to src/theme/FontAwesome/fonts/fontawesome-webfont.woff2 diff --git a/src/theme/index.hbs b/src/theme/index.hbs index f81a94a6..0e5fa009 100644 --- a/src/theme/index.hbs +++ b/src/theme/index.hbs @@ -18,7 +18,7 @@ - + diff --git a/src/theme/mod.rs b/src/theme/mod.rs index f80b8dcc..e2ac620e 100644 --- a/src/theme/mod.rs +++ b/src/theme/mod.rs @@ -21,18 +21,18 @@ pub static TOMORROW_NIGHT_CSS: &'static [u8] = include_bytes!("tomorrow-night.cs pub static HIGHLIGHT_CSS: &'static [u8] = include_bytes!("highlight.css"); pub static AYU_HIGHLIGHT_CSS: &'static [u8] = include_bytes!("ayu-highlight.css"); pub static CLIPBOARD_JS: &'static [u8] = include_bytes!("clipboard.min.js"); -pub static FONT_AWESOME: &'static [u8] = include_bytes!("_FontAwesome/css/font-awesome.min.css"); +pub static FONT_AWESOME: &'static [u8] = include_bytes!("FontAwesome/css/font-awesome.min.css"); pub static FONT_AWESOME_EOT: &'static [u8] = - include_bytes!("_FontAwesome/fonts/fontawesome-webfont.eot"); + include_bytes!("FontAwesome/fonts/fontawesome-webfont.eot"); pub static FONT_AWESOME_SVG: &'static [u8] = - include_bytes!("_FontAwesome/fonts/fontawesome-webfont.svg"); + include_bytes!("FontAwesome/fonts/fontawesome-webfont.svg"); pub static FONT_AWESOME_TTF: &'static [u8] = - include_bytes!("_FontAwesome/fonts/fontawesome-webfont.ttf"); + include_bytes!("FontAwesome/fonts/fontawesome-webfont.ttf"); pub static FONT_AWESOME_WOFF: &'static [u8] = - include_bytes!("_FontAwesome/fonts/fontawesome-webfont.woff"); + include_bytes!("FontAwesome/fonts/fontawesome-webfont.woff"); pub static FONT_AWESOME_WOFF2: &'static [u8] = - include_bytes!("_FontAwesome/fonts/fontawesome-webfont.woff2"); -pub static FONT_AWESOME_OTF: &'static [u8] = include_bytes!("_FontAwesome/fonts/FontAwesome.otf"); + include_bytes!("FontAwesome/fonts/fontawesome-webfont.woff2"); +pub static FONT_AWESOME_OTF: &'static [u8] = include_bytes!("FontAwesome/fonts/FontAwesome.otf"); /// The `Theme` struct should be used instead of the static variables because