Skip to content

Commit ed0edc8

Browse files
committed
Merge pull request #27 from Avinava/glyphicon-link-update
glyph fix for #26
2 parents 123c20f + bf13c83 commit ed0edc8

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

resource-bundles/VisualStrap_Resources.resource/css/visualstrap.css

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,11 +245,6 @@
245245
border: 1px solid #ddd !important;
246246
}
247247
}
248-
@font-face {
249-
font-family: 'Glyphicons Halflings';
250-
src: url('../fonts/glyphicons-halflings-regular.eot');
251-
src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), 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');
252-
}
253248
.visualstrap .glyphicon {
254249
position: relative;
255250
top: 1px;

src/components/importvisualstrap.component

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818
)
1919
)
2020
}"/>
21+
<style type="text/css">
22+
@font-face {
23+
font-family: 'Glyphicons Halflings';
24+
src: url("{!URLFOR($Resource.VisualStrap_Resources, '/fonts/glyphicons-halflings-regular.eot')}");
25+
src: url("{!URLFOR($Resource.VisualStrap_Resources, '/fonts/glyphicons-halflings-regular.eot?#iefix')}") format('embedded-opentype'), url("{!URLFOR($Resource.VisualStrap_Resources, '/fonts/glyphicons-halflings-regular.woff2')}") format('woff2'), url("{!URLFOR($Resource.VisualStrap_Resources, '/fonts/glyphicons-halflings-regular.woff')}") format('woff'), url("{!URLFOR($Resource.VisualStrap_Resources, '/fonts/glyphicons-halflings-regular.ttf')}") format('truetype'), url("{!URLFOR($Resource.VisualStrap_Resources, '/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular')}") format('svg');
26+
}
27+
</style>
2128
<apex:includeScript value="{!URLFOR($Resource.VisualStrap_Resources, 'js/jquery.min.js')}"/>
2229
<apex:includeScript value="{!URLFOR($Resource.VisualStrap_Resources, 'js/bootstrap.min.js')}" />
2330
<apex:stylesheet value="{!URLFOR($Resource.VisualStrap_Resources, 'css/visualstrap'+themeName+'.css')}" />

0 commit comments

Comments
 (0)