From: vincent@cubedesigners.com Date: Thu, 3 Oct 2013 13:52:36 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=8c44388cc3a11d171094d6947549ddbb8f2785e2;p=ccgm.git --- diff --git a/524d6eb0-plan_acces_01.jpg b/524d6eb0-plan_acces_01.jpg new file mode 100644 index 0000000..c13eaed Binary files /dev/null and b/524d6eb0-plan_acces_01.jpg differ diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php index 5507496..3323c57 100644 --- a/framework/application/Bootstrap.php +++ b/framework/application/Bootstrap.php @@ -11,7 +11,8 @@ class Bootstrap extends CubeIT_Bootstrap { protected function _initScripts() { parent::_initScripts(); - $this->getView()->headScript()->addWebFont(array('google' => array('families' => array('Ubuntu:500italic,300,300italic,500,400italic')))); + $view = $this->getView(); + $view->headScript()->addWebFont(array('google' => array('families' => array('Ubuntu:500italic,300,300italic,500,400italic')))); } protected function _initRouter($initCms = true, $standard = true) { diff --git a/framework/application/controllers/IndexController.php b/framework/application/controllers/IndexController.php index 8b56c5b..bb6fb38 100644 --- a/framework/application/controllers/IndexController.php +++ b/framework/application/controllers/IndexController.php @@ -4,7 +4,8 @@ class IndexController extends CubeIT_Controller_IndexController { public function pageAction() { $this->view->showbreadcrubms = $this->view->showsidebar = $this->view->showtopimage = true; - return parent::pageAction(); + $this->view->contentWidth = 769; + return parent::pageAction(); } } diff --git a/less/common.less b/less/common.less index a5078ce..c90959a 100644 --- a/less/common.less +++ b/less/common.less @@ -222,7 +222,7 @@ q:after{content:"";} } .twocolumns #content, .twocolumns .contents{ - width:765px; + width:769px; float:right; } @@ -375,3 +375,6 @@ q:after{content:"";} } } + + +