From d591b31d889cdfae9b4488f5ce57c4e7b7a71c1a Mon Sep 17 00:00:00 2001 From: tmtabor Date: Thu, 2 Apr 2015 12:29:44 -0400 Subject: [PATCH 1/2] Path to glyphicon fonts (used by Bootstrap) was incorrect. Fixed paths to coincide with where the appropriate Bootstrap resources are when IPython-components is attached. Useful for those using Bootstrap classes in custom themes. --- IPython/html/static/style/style.min.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index 5b52663ac..4fbc99f2f 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -260,8 +260,8 @@ th { } @font-face { font-family: 'Glyphicons Halflings'; - src: url('../fonts/glyphicons-halflings-regular.eot'); - src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); + src: url('../components/bootstrap/fonts/glyphicons-halflings-regular.eot'); + src: url('../components/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../components/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../components/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../components/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); } .glyphicon { position: relative; From 5dc6b5d13e890bb63568d1af16daafdb09e7e32c Mon Sep 17 00:00:00 2001 From: tmtabor Date: Thu, 2 Apr 2015 14:47:34 -0400 Subject: [PATCH 2/2] Added glyphicon update to LESS. --- IPython/html/static/base/less/variables.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/IPython/html/static/base/less/variables.less b/IPython/html/static/base/less/variables.less index d57f1d9b0..e5d1640c6 100644 --- a/IPython/html/static/base/less/variables.less +++ b/IPython/html/static/base/less/variables.less @@ -13,8 +13,9 @@ @logo_height: 28px; @border-radius-small: 1px; @border-radius-base: 2px; -@border-radius-large: 3px;; +@border-radius-large: 3px; @grid-gutter-width: 0px; +@icon-font-path: "../components/bootstrap/fonts/"; // Disable modal slide-in from top animation. .modal {