--- a/src/pyams_default_theme/__init__.py Mon Oct 29 16:48:50 2018 +0100
+++ b/src/pyams_default_theme/__init__.py Mon Oct 29 16:49:17 2018 +0100
@@ -15,6 +15,7 @@
from fanstatic import Resource, Library
from pyams_skin import myams_js, bootstrap_css, bootstrap
+from pyams_utils.fanstatic import ExternalResource
from pyramid.i18n import TranslationStringFactory
_ = TranslationStringFactory('pyams_default_theme')
@@ -22,9 +23,12 @@
library = Library('pyams_default_theme', 'resources')
+pyams_default_theme_fonts = ExternalResource(library, 'https://fonts.googleapis.com/css?family=Advent+Pro|Oswald',
+ resource_type='css')
+
pyams_default_theme_css = Resource(library, 'css/pyams-default.css',
minified='css/pyams-default.min.css',
- depends=[bootstrap_css, ])
+ depends=[bootstrap_css, pyams_default_theme_fonts])
pyams_default_theme = Resource(library, 'js/pyams-default.js',
minified='js/pyams-default.min.js',
--- a/src/pyams_default_theme/resources/css/pyams-default.css Mon Oct 29 16:48:50 2018 +0100
+++ b/src/pyams_default_theme/resources/css/pyams-default.css Mon Oct 29 16:49:17 2018 +0100
@@ -1,4 +1,5 @@
body {
+ font-family: "Advent Pro", Helvetica, Arial, sans-serif;
margin: 0 auto;
}
body .header-simple .regularbanner {
@@ -15,6 +16,14 @@
left: 10px;
max-height: calc(80%);
}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+ font-family: Oswald, Helvetica, Arial, Sans-Serif;
+}
@media only screen and (min-width: 1200px) {
.portal-page .slot.col-lg-0 {
display: none;
--- a/src/pyams_default_theme/resources/css/pyams-default.css.map Mon Oct 29 16:48:50 2018 +0100
+++ b/src/pyams_default_theme/resources/css/pyams-default.css.map Mon Oct 29 16:49:17 2018 +0100
@@ -1,1 +1,1 @@
-{"version":3,"sources":["../../../../../../../../../home/tflorac/Dropbox/src/PyAMS/pyams_default_theme/src/pyams_default_theme/resources/less/pyams-default.less"],"names":[],"mappings":"AAAA;EACC,cAAA;;AADD,IAGC,eACC;EACC,kBAAA;;AAIC,IANH,eACC,eAGC,QAEE;AAAD,IANH,eACC,eAIC,IACE;EACA,WAAA;;AAED,IATH,eACC,eAGC,QAKE;AAAD,IATH,eACC,eAIC,IAIE;EACA,kBAAA;EACA,SAAA;EACA,UAAA;EACA,YAAY,SAAZ;;AAUH,wBAA2C;EAC1C,YAFF,MAEG;IACA,aAAA;;;AAGF,wBAA0C,uBAAwB;EACjE,YAPF,MAOG;IACA,aAAA;;;AAGF,wBAA0C,uBAAuB;EAChE,YAZF,MAYG;IACA,aAAA;;;AAGF,wBAA0C;EACzC,YAjBF,MAiBG;IACA,aAAA;;;AAQH,cAAC;EACA,mBAAA;;AAED,cAAC;EACA,mBAAA","file":"pyams-default.css"}
\ No newline at end of file
+{"version":3,"sources":["../../../../../../../../../home/tflorac/Dropbox/src/PyAMS/pyams_default_theme/src/pyams_default_theme/resources/less/pyams-default.less"],"names":[],"mappings":"AACA;EACC,aAAa,0CAAb;EACA,cAAA;;AAFD,IAIC,eACC;EACC,kBAAA;;AAIC,IANH,eACC,eAGC,QAEE;AAAD,IANH,eACC,eAIC,IACE;EACA,WAAA;;AAED,IATH,eACC,eAGC,QAKE;AAAD,IATH,eACC,eAIC,IAIE;EACA,kBAAA;EACA,SAAA;EACA,UAAA;EACA,YAAY,SAAZ;;AAOL;AACA;AACA;AACA;AACA;AACA;EACC,iDAAA;;AAKC,wBAA2C;EAC1C,YAFF,MAEG;IACA,aAAA;;;AAGF,wBAA0C,uBAAwB;EACjE,YAPF,MAOG;IACA,aAAA;;;AAGF,wBAA0C,uBAAuB;EAChE,YAZF,MAYG;IACA,aAAA;;;AAGF,wBAA0C;EACzC,YAjBF,MAiBG;IACA,aAAA;;;AAQH,cAAC;EACA,mBAAA;;AAED,cAAC;EACA,mBAAA","file":"pyams-default.css"}
\ No newline at end of file
--- a/src/pyams_default_theme/resources/css/pyams-default.min.css Mon Oct 29 16:48:50 2018 +0100
+++ b/src/pyams_default_theme/resources/css/pyams-default.min.css Mon Oct 29 16:49:17 2018 +0100
@@ -1,1 +1,1 @@
-body{margin:0 auto}body .header-simple .regularbanner{position:relative}body .header-simple .regularbanner img.regularbanner__media,body .header-simple .regularbanner picture.regularbanner__media{width:100%}body .header-simple .regularbanner img.logo,body .header-simple .regularbanner picture.logo{position:absolute;top:10px;left:10px;max-height:calc(80%)}@media only screen and (min-width:1200px){.portal-page .slot.col-lg-0{display:none}}@media only screen and (min-width:992px) and (max-width:1199px){.portal-page .slot.col-md-0{display:none}}@media only screen and (min-width:768px) and (max-width:991px){.portal-page .slot.col-sm-0{display:none}}@media only screen and (max-width:767px){.portal-page .slot.col-xs-0{display:none}}.margin-bottom-10{margin-bottom:10px}.margin-bottom-20{margin-bottom:20px}
+body{font-family:"Advent Pro",Helvetica,Arial,sans-serif;margin:0 auto}body .header-simple .regularbanner{position:relative}body .header-simple .regularbanner img.regularbanner__media,body .header-simple .regularbanner picture.regularbanner__media{width:100%}body .header-simple .regularbanner img.logo,body .header-simple .regularbanner picture.logo{position:absolute;top:10px;left:10px;max-height:calc(80%)}h1,h2,h3,h4,h5,h6{font-family:Oswald,Helvetica,Arial,Sans-Serif}@media only screen and (min-width:1200px){.portal-page .slot.col-lg-0{display:none}}@media only screen and (min-width:992px) and (max-width:1199px){.portal-page .slot.col-md-0{display:none}}@media only screen and (min-width:768px) and (max-width:991px){.portal-page .slot.col-sm-0{display:none}}@media only screen and (max-width:767px){.portal-page .slot.col-xs-0{display:none}}.margin-bottom-10{margin-bottom:10px}.margin-bottom-20{margin-bottom:20px}
--- a/src/pyams_default_theme/resources/less/pyams-default.less Mon Oct 29 16:48:50 2018 +0100
+++ b/src/pyams_default_theme/resources/less/pyams-default.less Mon Oct 29 16:49:17 2018 +0100
@@ -1,4 +1,6 @@
+
body {
+ font-family: "Advent Pro", Helvetica, Arial, sans-serif;
margin: 0 auto;
.header-simple {
@@ -21,8 +23,16 @@
}
}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+ font-family: Oswald, Helvetica, Arial, Sans-Serif;
+}
+
.portal-page {
-
.slot {
@media only screen and (min-width: 1200px) {
&.col-lg-0 {