diff --git a/ground/controllers/IndexController.php b/ground/controllers/IndexController.php index 268a895..fb8b38b 100644 --- a/ground/controllers/IndexController.php +++ b/ground/controllers/IndexController.php @@ -37,6 +37,7 @@ class IndexController extends Controller self::addStyle('/css/MarkerCluster.css'); self::addStyle('/css/MarkerCluster.Default.css'); self::addStyle('/css/fotorama.css'); + self::addStyle('/css/indexMap.css'); if (!App::$user) self::addScript('//ulogin.ru/js/ulogin.js'); diff --git a/ground/controllers/PageController.php b/ground/controllers/PageController.php index 482b60e..71e85e6 100644 --- a/ground/controllers/PageController.php +++ b/ground/controllers/PageController.php @@ -12,6 +12,7 @@ class PageController extends Controller self::addScript('/js/jquery-2.1.0.min.js'); self::addScript('/js/jquery-ui-1.10.4.custom.min.js'); self::addScript('/js/bootstrap.min.js'); + self::addScript('/js/app.js'); self::addStyle('/css/bootstrap.min.css'); self::addStyle('/css/bootstrap-theme.min.css'); diff --git a/ground/views/indexTemplate.php b/ground/views/indexTemplate.php index 09580f8..96b7609 100644 --- a/ground/views/indexTemplate.php +++ b/ground/views/indexTemplate.php @@ -7,32 +7,35 @@ if (App::$user) {
-
- -
-
- -
-
-
-
- - +
-
-
-
-
-
+
+
+ +
+
+
+
+ + + +
+
+
+ +
+ + +
× diff --git a/ground/views/rightNavigation.php b/ground/views/rightNavigation.php index 3102786..dfc13c2 100644 --- a/ground/views/rightNavigation.php +++ b/ground/views/rightNavigation.php @@ -8,17 +8,21 @@ if (App::$user && App::$user->id) { } ?> -
+
-
+
+ +
+ +
+ +
+ +
+ -
-
-
- -
-
+
diff --git a/public/css/indexMap.css b/public/css/indexMap.css new file mode 100644 index 0000000..3d8f4f2 --- /dev/null +++ b/public/css/indexMap.css @@ -0,0 +1,27 @@ +@media screen and (max-width:815px) { + .onlyBigScreen { + display: none; + } + + div.header{ + padding: 5px 7px; + left: 20px; + } + + div.header a img { + margin-bottom: 5px; + } +} + +@media screen and (max-width:500px) { + div.header{ + padding: 2px 5px; + left: 10px; + } + + div.header a img { + width: 70px; + height: 42px; + margin-bottom: 2px; + } +} diff --git a/public/css/style.css b/public/css/style.css index 6b07214..f177bc0 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -142,6 +142,8 @@ img.imageInArticle {border: solid 3px white;} } @media screen and (max-width:815px) { + .onlyBigScreen {display: none;} + body { padding: 0!important; } @@ -154,28 +156,9 @@ img.imageInArticle {border: solid 3px white;} padding: 50px 5px; } - div.header{ - padding: 5px 7px; - left: 20px; - } - div.header a img { width: 115px; height: 69px; - margin-bottom: 5px; + margin-bottom: 10px; } } - -@media screen and (max-width:500px) { - div.header{ - padding: 2px 5px; - left: 10px; - } - - div.header a img { - width: 70px; - height: 42px; - margin-bottom: 2px; - } -} -