Description: Replace urls with local path The lib is using external resources to Google, which isn't at all compliant with what we do at Debian. From: Thomas Goirand Forwarded: not-needed Last-Update: 2017-10-13 diff --git a/cosmo/_bootswatch.scss b/cosmo/_bootswatch.scss index 23161a7e..90da2fee 100644 --- a/cosmo/_bootswatch.scss +++ b/cosmo/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700" !default; +$web-font-path: "source-sans-pro-debian.css" !default; @import url($web-font-path); // Navbar ===================================================================== diff --git a/cosmo/bootstrap.css b/cosmo/bootstrap.css index 970e2377..08570a5a 100644 --- a/cosmo/bootstrap.css +++ b/cosmo/bootstrap.css @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700"); +@import url("source-sans-pro-debian.css"); /*! * bootswatch v3.3.7 * Homepage: http://bootswatch.com diff --git a/cosmo/bootswatch.less b/cosmo/bootswatch.less index 1a4ebd79..d2dcc61b 100644 --- a/cosmo/bootswatch.less +++ b/cosmo/bootswatch.less @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700"; +@web-font-path: "source-sans-pro-debian.css"; .web-font(@path) { @import url("@{path}"); diff --git a/cosmo/source-sans-pro-debian.css b/cosmo/source-sans-pro-debian.css new file mode 100644 index 00000000..bad7c310 --- /dev/null +++ b/cosmo/source-sans-pro-debian.css @@ -0,0 +1,18 @@ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 300; + src: local('Source Sans Pro Light'), local('SourceSansPro-Light'); +} +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 400; + src: local('Source Sans Pro'), local('SourceSansPro-Regular'); +} +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 700; + src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'); +} diff --git a/cyborg/_bootswatch.scss b/cyborg/_bootswatch.scss index 9c369a87..8add769c 100644 --- a/cyborg/_bootswatch.scss +++ b/cyborg/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,700" !default; +$web-font-path: "roboto-debian.css" !default; @import url($web-font-path); // Navbar ===================================================================== diff --git a/cyborg/bootstrap.css b/cyborg/bootstrap.css index 1caace23..2a24a7ca 100644 --- a/cyborg/bootstrap.css +++ b/cyborg/bootstrap.css @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css?family=Roboto:400,700"); +@import url("roboto-debian.css"); /*! * bootswatch v3.3.7 * Homepage: http://bootswatch.com diff --git a/cyborg/bootswatch.less b/cyborg/bootswatch.less index d6a24ddb..bc4b5a00 100644 --- a/cyborg/bootswatch.less +++ b/cyborg/bootswatch.less @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,700"; +@web-font-path: "roboto-debian.css"; .web-font(@path) { @import url("@{path}"); diff --git a/cyborg/roboto-debian.css b/cyborg/roboto-debian.css new file mode 100644 index 00000000..a911a88e --- /dev/null +++ b/cyborg/roboto-debian.css @@ -0,0 +1,12 @@ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'); +} +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'); +} diff --git a/darkly/_bootswatch.scss b/darkly/_bootswatch.scss index 0c596848..d3bc4ef5 100644 --- a/darkly/_bootswatch.scss +++ b/darkly/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic" !default; +$web-font-path: "lato-debian.css" !default; @import url($web-font-path); // Navbar ===================================================================== diff --git a/darkly/bootstrap.css b/darkly/bootstrap.css index a91672f5..569ee6aa 100644 --- a/darkly/bootstrap.css +++ b/darkly/bootstrap.css @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css?family=Lato:400,700,400italic"); +@import url("lato-debian.css"); /*! * bootswatch v3.3.7 * Homepage: http://bootswatch.com diff --git a/darkly/bootswatch.less b/darkly/bootswatch.less index e0be0065..6732efdb 100644 --- a/darkly/bootswatch.less +++ b/darkly/bootswatch.less @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic"; +@web-font-path: "lato-debian.css"; .web-font(@path) { @import url("@{path}"); diff --git a/darkly/lato-debian.css b/darkly/lato-debian.css new file mode 100644 index 00000000..57db753f --- /dev/null +++ b/darkly/lato-debian.css @@ -0,0 +1,18 @@ +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 400; + src: local('Lato Regular'), local('Lato-Regular'); +} +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 700; + src: local('Lato Bold'), local('Lato-Bold'); +} +@font-face { + font-family: 'Lato'; + font-style: italic; + font-weight: 400; + src: local('Lato Italic'), local('Lato-Italic'); +} diff --git a/flatly/_bootswatch.scss b/flatly/_bootswatch.scss index a9c2a778..5bc2e19f 100644 --- a/flatly/_bootswatch.scss +++ b/flatly/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic" !default; +$web-font-path: "lato-debian.css" !default; @import url($web-font-path); // Navbar ===================================================================== diff --git a/flatly/bootstrap.css b/flatly/bootstrap.css index d919b97f..a60fde55 100644 --- a/flatly/bootstrap.css +++ b/flatly/bootstrap.css @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css?family=Lato:400,700,400italic"); +@import url("lato-debian.css"); /*! * bootswatch v3.3.7 * Homepage: http://bootswatch.com diff --git a/flatly/bootswatch.less b/flatly/bootswatch.less index 71ae90a7..3b7ad1af 100644 --- a/flatly/bootswatch.less +++ b/flatly/bootswatch.less @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic"; +@web-font-path: "lato-debian.css"; .web-font(@path) { @import url("@{path}"); diff --git a/flatly/lato-debian.css b/flatly/lato-debian.css new file mode 100644 index 00000000..57db753f --- /dev/null +++ b/flatly/lato-debian.css @@ -0,0 +1,18 @@ +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 400; + src: local('Lato Regular'), local('Lato-Regular'); +} +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 700; + src: local('Lato Bold'), local('Lato-Bold'); +} +@font-face { + font-family: 'Lato'; + font-style: italic; + font-weight: 400; + src: local('Lato Italic'), local('Lato-Italic'); +} diff --git a/journal/_bootswatch.scss b/journal/_bootswatch.scss index 0beec2bd..620fb14d 100644 --- a/journal/_bootswatch.scss +++ b/journal/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=News+Cycle:400,700" !default; +$web-font-path: "news-cycle-debian.css" !default; @import url($web-font-path); // Navbar ===================================================================== diff --git a/journal/bootstrap.css b/journal/bootstrap.css index 8b7e9660..7fa68ab3 100644 --- a/journal/bootstrap.css +++ b/journal/bootstrap.css @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css?family=News+Cycle:400,700"); +@import url("news-cycle-debian.css"); /*! * bootswatch v3.3.7 * Homepage: http://bootswatch.com diff --git a/journal/bootswatch.less b/journal/bootswatch.less index 8c9cf548..0d4af504 100644 --- a/journal/bootswatch.less +++ b/journal/bootswatch.less @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@web-font-path: "https://fonts.googleapis.com/css?family=News+Cycle:400,700"; +@web-font-path: "news-cycle-debian.css"; .web-font(@path) { @import url("@{path}"); diff --git a/journal/news-cycle-debian.css b/journal/news-cycle-debian.css new file mode 100644 index 00000000..18bc682c --- /dev/null +++ b/journal/news-cycle-debian.css @@ -0,0 +1,12 @@ +@font-face { + font-family: 'News Cycle'; + font-style: normal; + font-weight: 400; + src: local('News Cycle'), local('NewsCycle'); +} +@font-face { + font-family: 'News Cycle'; + font-style: normal; + font-weight: 700; + src: local('News Cycle Bold'), local('NewsCycle-Bold'); +} diff --git a/lumen/_bootswatch.scss b/lumen/_bootswatch.scss index 2d35f522..89df30f1 100644 --- a/lumen/_bootswatch.scss +++ b/lumen/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic" !default; +$web-font-path: "source-sans-pro-debian.css" !default; @import url($web-font-path); @mixin shadow($width: 4px){ diff --git a/lumen/bootstrap.css b/lumen/bootstrap.css index 10c0e41a..2907af87 100644 --- a/lumen/bootstrap.css +++ b/lumen/bootstrap.css @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic"); +@import url("source-sans-pro-debian.css"); /*! * bootswatch v3.3.7 * Homepage: http://bootswatch.com @@ -269,8 +269,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.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'); + src: url('source-sans-pro-debian.css') + src: url('source-sans-pro-debian.css') } .glyphicon { position: relative; diff --git a/lumen/bootswatch.less b/lumen/bootswatch.less index 1ef2831e..7ce72bcf 100644 --- a/lumen/bootswatch.less +++ b/lumen/bootswatch.less @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic"; +@web-font-path: "source-sans-pro-debian.css"; .web-font(@path) { @import url("@{path}"); diff --git a/lumen/source-sans-pro-debian.css b/lumen/source-sans-pro-debian.css new file mode 100644 index 00000000..29ab5f8b --- /dev/null +++ b/lumen/source-sans-pro-debian.css @@ -0,0 +1,24 @@ +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 300; + src: local('Source Sans Pro Light'), local('SourceSansPro-Light'); +} +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 400; + src: local('Source Sans Pro'), local('SourceSansPro-Regular'); +} +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 700; + src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'); +} +@font-face { + font-family: 'Source Sans Pro'; + font-style: italic; + font-weight: 400; + src: local('Source Sans Pro Italic'), local('SourceSansPro-It'); +} diff --git a/paper/_bootswatch.scss b/paper/_bootswatch.scss index 56275ec7..909b9baf 100644 --- a/paper/_bootswatch.scss +++ b/paper/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" !default; +$web-font-path: "roboto-debian.css" !default; @import url($web-font-path); // Navbar ===================================================================== diff --git a/paper/bootstrap.css b/paper/bootstrap.css index 7326dea9..b4046147 100644 --- a/paper/bootstrap.css +++ b/paper/bootstrap.css @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css?family=Roboto:300,400,500,700"); +@import url("roboto-debian.css"); /*! * bootswatch v3.3.7 * Homepage: http://bootswatch.com diff --git a/paper/bootswatch.less b/paper/bootswatch.less index 1d32ced7..e10088b8 100644 --- a/paper/bootswatch.less +++ b/paper/bootswatch.less @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700"; +@web-font-path: "roboto-debian.css"; .web-font(@path) { @import url("@{path}"); diff --git a/paper/roboto-debian.css b/paper/roboto-debian.css new file mode 100644 index 00000000..fe5a2c9d --- /dev/null +++ b/paper/roboto-debian.css @@ -0,0 +1,24 @@ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url(fonts/Roboto-Light.woff2) format('woff2'); +} +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url(fonts/Roboto-Regular.woff2) format('woff2'); +} +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url(fonts/Roboto-Medium.woff2) format('woff2'); +} +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url(fonts/Roboto-Bold.woff2) format('woff2'); +} diff --git a/readable/_bootswatch.scss b/readable/_bootswatch.scss index edf7a172..80194534 100644 --- a/readable/_bootswatch.scss +++ b/readable/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Raleway:400,700" !default; +$web-font-path: "raleway-debian.css" !default; @import url($web-font-path); // Navbar ===================================================================== diff --git a/readable/bootstrap.css b/readable/bootstrap.css index b1f873a7..d5eff3dc 100644 --- a/readable/bootstrap.css +++ b/readable/bootstrap.css @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css?family=Raleway:400,700"); +@import url("raleway-debian.css"); /*! * bootswatch v3.3.7 * Homepage: http://bootswatch.com diff --git a/readable/bootswatch.less b/readable/bootswatch.less index 9e02fb65..db55a109 100644 --- a/readable/bootswatch.less +++ b/readable/bootswatch.less @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@web-font-path: "https://fonts.googleapis.com/css?family=Raleway:400,700"; +@web-font-path: "raleway-debian.css"; .web-font(@path) { @import url("@{path}"); diff --git a/readable/raleway-debian.css b/readable/raleway-debian.css new file mode 100644 index 00000000..6b8e252b --- /dev/null +++ b/readable/raleway-debian.css @@ -0,0 +1,12 @@ +@font-face { + font-family: 'Raleway'; + font-style: normal; + font-weight: 400; + src: local('Raleway'); +} +@font-face { + font-family: 'Raleway'; + font-style: normal; + font-weight: 700; + src: local('Raleway Bold'), local('Raleway-Bold'); +} diff --git a/sandstone/_bootswatch.scss b/sandstone/_bootswatch.scss index e576413b..b033f236 100644 --- a/sandstone/_bootswatch.scss +++ b/sandstone/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,500,700" !default; +$web-font-path: "roboto-debian.css" !default; @import url($web-font-path); // Navbar ===================================================================== diff --git a/sandstone/bootstrap.css b/sandstone/bootstrap.css index d91aa7e7..5fad60bd 100644 --- a/sandstone/bootstrap.css +++ b/sandstone/bootstrap.css @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css?family=Roboto:400,500,700"); +@import url("roboto-debian.css"); /*! * bootswatch v3.3.7 * Homepage: http://bootswatch.com @@ -269,8 +269,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.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'); + src: url('roboto-debian.css') + src: url('roboto-debian.css') } .glyphicon { position: relative; diff --git a/sandstone/bootswatch.less b/sandstone/bootswatch.less index e5db6277..42c1edd2 100644 --- a/sandstone/bootswatch.less +++ b/sandstone/bootswatch.less @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,500,700"; +@web-font-path: "roboto-debian.css"; .web-font(@path) { @import url("@{path}"); diff --git a/sandstone/roboto-debian.css b/sandstone/roboto-debian.css new file mode 100644 index 00000000..a73d8524 --- /dev/null +++ b/sandstone/roboto-debian.css @@ -0,0 +1,12 @@ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'); +} +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'); +} diff --git a/simplex/_bootswatch.scss b/simplex/_bootswatch.scss index a3babc45..4ed46f7f 100644 --- a/simplex/_bootswatch.scss +++ b/simplex/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400,700" !default; +$web-font-path: "open-sans-debian.css" !default; @import url($web-font-path); @mixin btn-shadow($color){ diff --git a/simplex/bootstrap.css b/simplex/bootstrap.css index 764e1bda..e9459a06 100644 --- a/simplex/bootstrap.css +++ b/simplex/bootstrap.css @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,700"); +@import url("open-sans-debian.css"); /*! * bootswatch v3.3.7 * Homepage: http://bootswatch.com diff --git a/simplex/bootswatch.less b/simplex/bootswatch.less index 9bf6ab8c..d4409b4f 100644 --- a/simplex/bootswatch.less +++ b/simplex/bootswatch.less @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400,700"; +@web-font-path: "open-sans-debian.css"; .web-font(@path) { @import url("@{path}"); diff --git a/simplex/open-sans-debian.css b/simplex/open-sans-debian.css new file mode 100644 index 00000000..a1beee10 --- /dev/null +++ b/simplex/open-sans-debian.css @@ -0,0 +1,12 @@ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans'), local('OpenSans'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'); +} diff --git a/spacelab/_bootswatch.scss b/spacelab/_bootswatch.scss index b3623cfe..1b5a0d51 100644 --- a/spacelab/_bootswatch.scss +++ b/spacelab/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700" !default; +$web-font-path: "open-sans-debian.css" !default; @import url($web-font-path); @mixin btn-shadow($color){ diff --git a/spacelab/bootstrap.css b/spacelab/bootstrap.css index 0f796e6e..34591c6d 100644 --- a/spacelab/bootstrap.css +++ b/spacelab/bootstrap.css @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700"); +@import url("open-sans-debian.css"); /*! * bootswatch v3.3.7 * Homepage: http://bootswatch.com diff --git a/spacelab/bootswatch.less b/spacelab/bootswatch.less index 78209bf3..44694fa7 100644 --- a/spacelab/bootswatch.less +++ b/spacelab/bootswatch.less @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700"; +@web-font-path: "open-sans-debian.css"; .web-font(@path) { @import url("@{path}"); diff --git a/spacelab/open-sans-debian.css b/spacelab/open-sans-debian.css new file mode 100644 index 00000000..6bbd5589 --- /dev/null +++ b/spacelab/open-sans-debian.css @@ -0,0 +1,24 @@ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans'), local('OpenSans'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 400; + src: local('Open Sans Italic'), local('OpenSans-Italic'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 700; + src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'); +} diff --git a/superhero/_bootswatch.scss b/superhero/_bootswatch.scss index c23166bd..85192413 100644 --- a/superhero/_bootswatch.scss +++ b/superhero/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Lato:300,400,700" !default; +$web-font-path: "lato-debian.css" !default; @import url($web-font-path); // Navbar ===================================================================== diff --git a/superhero/bootstrap.css b/superhero/bootstrap.css index d99a3125..34dbfac4 100644 --- a/superhero/bootstrap.css +++ b/superhero/bootstrap.css @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css?family=Lato:300,400,700"); +@import url("lato-debian.css"); /*! * bootswatch v3.3.7 * Homepage: http://bootswatch.com diff --git a/superhero/bootswatch.less b/superhero/bootswatch.less index c1a04b48..f7f138f8 100644 --- a/superhero/bootswatch.less +++ b/superhero/bootswatch.less @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@web-font-path: "https://fonts.googleapis.com/css?family=Lato:300,400,700"; +@web-font-path: "lato-debian.css"; .web-font(@path) { @import url("@{path}"); diff --git a/superhero/lato-debian.css b/superhero/lato-debian.css new file mode 100644 index 00000000..2dddae51 --- /dev/null +++ b/superhero/lato-debian.css @@ -0,0 +1,18 @@ +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 300; + src: local('Lato Light'), local('Lato-Light'); +} +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 400; + src: local('Lato Regular'), local('Lato-Regular'); +} +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 700; + src: local('Lato Bold'), local('Lato-Bold'); +} diff --git a/united/_bootswatch.scss b/united/_bootswatch.scss index e7dae2c0..6f240e06 100644 --- a/united/_bootswatch.scss +++ b/united/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Ubuntu:400,700" !default; +$web-font-path: "ubuntu-debian.css" !default; @import url($web-font-path); // Navbar ===================================================================== diff --git a/united/bootstrap.css b/united/bootstrap.css index 73049b9d..bc9428ea 100644 --- a/united/bootstrap.css +++ b/united/bootstrap.css @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css?family=Ubuntu:400,700"); +@import url("ubuntu-debian.css"); /*! * bootswatch v3.3.7 * Homepage: http://bootswatch.com diff --git a/united/bootswatch.less b/united/bootswatch.less index 5e81a4cc..ebce6212 100644 --- a/united/bootswatch.less +++ b/united/bootswatch.less @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@web-font-path: "https://fonts.googleapis.com/css?family=Ubuntu:400,700"; +@web-font-path: "ubuntu-debian.css"; .web-font(@path) { @import url("@{path}"); diff --git a/united/ubuntu-debian.css b/united/ubuntu-debian.css new file mode 100644 index 00000000..4a825605 --- /dev/null +++ b/united/ubuntu-debian.css @@ -0,0 +1,12 @@ +@font-face { + font-family: 'Ubuntu'; + font-style: normal; + font-weight: 400; + src: local('Ubuntu'); +} +@font-face { + font-family: 'Ubuntu'; + font-style: normal; + font-weight: 700; + src: local('Ubuntu Bold'), local('Ubuntu-Bold'); +} diff --git a/yeti/_bootswatch.scss b/yeti/_bootswatch.scss index 3e5158c8..33fbbd59 100644 --- a/yeti/_bootswatch.scss +++ b/yeti/_bootswatch.scss @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700" !default; +$web-font-path: "open-sans-debian.css" !default; @import url($web-font-path); // Navbar ===================================================================== diff --git a/yeti/bootstrap.css b/yeti/bootstrap.css index f90228fc..9e5d9049 100644 --- a/yeti/bootstrap.css +++ b/yeti/bootstrap.css @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700"); +@import url("open-sans-debian.css"); /*! * bootswatch v3.3.7 * Homepage: http://bootswatch.com diff --git a/yeti/bootswatch.less b/yeti/bootswatch.less index 5c915cd0..486154cc 100644 --- a/yeti/bootswatch.less +++ b/yeti/bootswatch.less @@ -2,7 +2,7 @@ // Bootswatch // ----------------------------------------------------- -@web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700"; +@web-font-path: "open-sans-debian.css"; .web-font(@path) { @import url("@{path}"); diff --git a/yeti/open-sans-debian.css b/yeti/open-sans-debian.css new file mode 100644 index 00000000..8671fe83 --- /dev/null +++ b/yeti/open-sans-debian.css @@ -0,0 +1,36 @@ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 300; + src: local('Open Sans Light'), local('OpenSans-Light'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans'), local('OpenSans'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 300; + src: local('Open Sans Light Italic'), local('OpenSansLight-Italic'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 400; + src: local('Open Sans Italic'), local('OpenSans-Italic'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 700; + src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'); +} -- 2.11.0