From: vincent@cubedesigners.com Date: Fri, 4 Oct 2013 11:41:26 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=b23a19fc3b8299d3a26e24a2a99538a764565000;p=ccgm.git --- diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php index 3323c57..8ae54db 100644 --- a/framework/application/Bootstrap.php +++ b/framework/application/Bootstrap.php @@ -9,9 +9,10 @@ class Bootstrap extends CubeIT_Bootstrap { $this->bootstrap('scripts'); } - protected function _initScripts() { + protected function _initScripts() { parent::_initScripts(); $view = $this->getView(); + $view->headMeta()->setViewport(1024); $view->headScript()->addWebFont(array('google' => array('families' => array('Ubuntu:500italic,300,300italic,500,400italic')))); } diff --git a/framework/application/views/scripts/common/content.phtml b/framework/application/views/scripts/common/content.phtml index 5175c87..5ba51d0 100644 --- a/framework/application/views/scripts/common/content.phtml +++ b/framework/application/views/scripts/common/content.phtml @@ -30,6 +30,8 @@ if (isset($this->currentPage) && $this->currentPage->getTemplate() == 'home') { $c.=''; } +echo '
'; echo $this->render('common/header.phtml'); echo $c; echo $this->render('common/footer.phtml'); +echo '
'; diff --git a/less/common.less b/less/common.less index c90959a..87ddae4 100644 --- a/less/common.less +++ b/less/common.less @@ -20,6 +20,11 @@ q{quotes: none;} q:before, q:after{content:"";} +.body{ + max-width: 100%; + overflow-x: hidden; +} + .visual{ width:982px; margin:0 auto; @@ -313,7 +318,7 @@ q:after{content:"";} padding: 0 0 0 37px; line-height:26px; width: 228px; - + } #footer .timing{