(no commit message)

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index 3323c57d7d2b4b2894e7d9c1c9daa8128ddc503f..8ae54dbfa9cddd0268fd99acbe0ecd8a7c7fddc8 100644 (file)
--- 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 5175c871480120f1599e9c53fa1e7b88b9528217..5ba51d08ff1cd720f3ab52ca450404fb99936174 100644 (file)
--- 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.='</div>';\r
 }\r
 \r
+echo '<div class="body">';\r
 echo $this->render('common/header.phtml');\r
 echo $c;\r
 echo $this->render('common/footer.phtml');\r
+echo '</div>';\r

diff --git a/less/common.less b/less/common.less
index c90959aa5f69c4162c9942ab2a8de21709e034e7..87ddae46e6bf337d53a01cad312530e58ed94963 100644 (file)
--- a/less/common.less
+++ b/less/common.less
@@ -20,6 +20,11 @@ q{quotes: none;}
 q:before,\r
 q:after{content:"";}\r
 \r
+.body{\r
+       max-width: 100%;\r
+       overflow-x: hidden;\r
+}\r
+\r
 .visual{\r
        width:982px;\r
        margin:0 auto;\r
@@ -313,7 +318,7 @@ q:after{content:"";}
        padding: 0 0 0 37px;\r
        line-height:26px;\r
        width: 228px;\r
-       \r
+\r
 }\r
 \r
 #footer .timing{\r