From: bruno@cubedesigners.com Date: Tue, 11 Feb 2014 16:51:40 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=de97a2b4ab9367ac24a272b36c1b5a531324610d;p=cubedesigners-v7.git --- diff --git a/framework/application/layouts/scripts/layout.phtml b/framework/application/layouts/scripts/layout.phtml index 1a088db..de3c281 100644 --- a/framework/application/layouts/scripts/layout.phtml +++ b/framework/application/layouts/scripts/layout.phtml @@ -1,6 +1,8 @@ array('families' => array('roboto_condensedlight'), 'urls' => array('/css/fonts/robotocondensed-light.css?nocache=1'))); +//$fonts = array('custom' => array('families' => array('roboto_condensedlight'), 'urls' => array('/css/fonts/robotocondensed-light.css?nocache=1'))); +$fonts = array('google' => array('families' => array('Roboto+Condensed:400,300,700:latin'))); + $this->headScript()->addWebFont($fonts); if ($this->acl()->isAllowed('edition')) { diff --git a/less/agence.less b/less/agence.less index d5adfa5..6fc78ed 100644 --- a/less/agence.less +++ b/less/agence.less @@ -31,7 +31,7 @@ } .agency-pictos .bloc-holder h2 { - font-weight: normal; + font-weight: 300; font-size:32px; } diff --git a/less/common.less b/less/common.less index 5cff343..f607d2b 100644 --- a/less/common.less +++ b/less/common.less @@ -1,12 +1,19 @@ + +@roboto: 'Roboto Condensed', sans-serif; + +* { + font-weight: 300; +} + body { - font-family: 'roboto_condensedlight'; + font-family: @roboto; font-size:16px; - font-weight: normal; + font-weight:300; color:#1b1b1b; } h1, h2 { - font-weight: normal; + font-weight: 300; } a { @@ -47,12 +54,12 @@ a:active { .title h1 { text-align: left; - font-weight: normal; + font-weight: 300; font-size: 56px; } .title h2 { text-align: left; - font-weight: normal; + font-weight: 300; font-size: 22px; } \ No newline at end of file diff --git a/less/contact.less b/less/contact.less index 16eb3a0..e8b66a5 100644 --- a/less/contact.less +++ b/less/contact.less @@ -8,7 +8,7 @@ #contact-title h1 { text-align: left; - font-weight: normal; + font-weight: 300; font-size: 56px; } @@ -17,7 +17,7 @@ background-image: url('../images/picto_footer_mail.svg'); background-repeat: no-repeat; background-position:0px 10px; - font-weight: normal; + font-weight: 300; padding-left:60px; padding-bottom: 50px; } diff --git a/less/home.less b/less/home.less index 8f5749f..32f7fe7 100644 --- a/less/home.less +++ b/less/home.less @@ -4,11 +4,13 @@ } .home-title h1 { + font-weight: 300; text-align: center; font-size: 56px; } .home-title h2 { + font-weight: 300; text-align: center; font-size: 32px; }