From 54b93a56d270ae8b72cb9ac900333eec9247530b Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Tue, 10 Jan 2017 17:36:13 -0400 Subject: [PATCH] fix(GUI): fix path to Glyphicons Bootstrap font (#1011) We've recently moved the compiled CSS output to `lib/gui/css/main.css`, however we didn't update the relative path to Bootstrap icon web font, causing every icon to break. See: https://github.com/resin-io/etcher/pull/1002 Change-Type: patch Signed-off-by: Juan Cruz Viotti --- lib/gui/css/main.css | 4 ++-- lib/gui/scss/main.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/gui/css/main.css b/lib/gui/css/main.css index b7e7f080..35c3438d 100644 --- a/lib/gui/css/main.css +++ b/lib/gui/css/main.css @@ -255,8 +255,8 @@ th { @font-face { font-family: 'Glyphicons Halflings'; - src: url("../../node_modules/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.eot"); - src: url("../../node_modules/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"), url("../../node_modules/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2") format("woff2"), url("../../node_modules/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff") format("woff"), url("../../node_modules/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf") format("truetype"), url("../../node_modules/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg"); } + src: url("../../../node_modules/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.eot"); + src: url("../../../node_modules/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"), url("../../../node_modules/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2") format("woff2"), url("../../../node_modules/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff") format("woff"), url("../../../node_modules/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf") format("truetype"), url("../../../node_modules/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg"); } .glyphicon, .tick { position: relative; diff --git a/lib/gui/scss/main.scss b/lib/gui/scss/main.scss index 00d45b08..5dc335b6 100644 --- a/lib/gui/scss/main.scss +++ b/lib/gui/scss/main.scss @@ -14,7 +14,7 @@ * limitations under the License. */ -$icon-font-path: "../../node_modules/bootstrap-sass/assets/fonts/bootstrap/"; +$icon-font-path: "../../../node_modules/bootstrap-sass/assets/fonts/bootstrap/"; $font-size-base: 13px; $cursor-disabled: initial; $link-hover-decoration: none;