Skip to content

Commit

Permalink
Serve fonts from local host. Fixes #32
Browse files Browse the repository at this point in the history
  • Loading branch information
wch committed Apr 21, 2015
1 parent cdf36b0 commit e9e63d1
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 2 deletions.
65 changes: 64 additions & 1 deletion inst/AdminLTE/AdminLTE.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,67 @@
@import url(//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic);
@font-face {
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 300;
src:
local('Source Sans Pro Light'),
local('SourceSansPro-Light'),
url('Source_Sans_Pro_300.ttf') format('truetype');
}
@font-face {
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 400;
src:
local('Source Sans Pro'),
local('SourceSansPro-Regular'),
url('Source_Sans_Pro_400.ttf') format('truetype');
}
@font-face {
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 600;
src:
local('Source Sans Pro Semibold'),
local('SourceSansPro-Semibold'),
url('Source_Sans_Pro_600.ttf') format('truetype');
}
@font-face {
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 700;
src:
local('Source Sans Pro Bold'),
local('SourceSansPro-Bold'),
url('Source_Sans_Pro_700.ttf') format('truetype');
}
@font-face {
font-family: 'Source Sans Pro';
font-style: italic;
font-weight: 300;
src:
local('Source Sans Pro Light Italic'),
local('SourceSansPro-LightIt'),
url('Source_Sans_Pro_300italic.ttf') format('truetype');
}
@font-face {
font-family: 'Source Sans Pro';
font-style: italic;
font-weight: 400;
src:
local('Source Sans Pro Italic'),
local('SourceSansPro-It'),
url('Source_Sans_Pro_400italic.ttf') format('truetype');
}
@font-face {
font-family: 'Source Sans Pro';
font-style: italic;
font-weight: 600;
src:
local('Source Sans Pro Semibold Italic'),
local('SourceSansPro-SemiboldIt'),
url('Source_Sans_Pro_600italic.ttf') format('truetype');
}

/*!
* AdminLTE v2.0.
* Author: Almsaeed Studio
Expand Down
2 changes: 1 addition & 1 deletion inst/AdminLTE/AdminLTE.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions inst/AdminLTE/README-shiny-mods.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
This branch of AdminLTE contains the following changes from the stock version, to make it work better with Shiny.

* Attached collapse click event handler to document, instead of to each collapse button. This is the same fix as https://github.com/almasaeed2010/AdminLTE/pull/304; if that is merged, then it should be possible to go to the stock version.
* In AdminLTE.css, the fonts are fetched from the local host, instead of from Google fonts.

0 comments on commit e9e63d1

Please sign in to comment.