From 36771767d8df83de4f9cef4c775a787d774ea1f4 Mon Sep 17 00:00:00 2001 From: Krivchikov Dmitry Date: Mon, 28 Mar 2016 23:52:15 +0300 Subject: [PATCH] =?UTF-8?q?ADD=20topNavigation=20=D0=BD=D0=B0=20=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=83=20=D1=81=20=D0=BA?= =?UTF-8?q?=D0=B0=D1=80=D1=82=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/IndexController.php | 2 -- public/css/style.css | 4 +-- views/indexTemplate.php | 35 ------------------- views/layouts/default.php | 8 ++--- views/layouts/page.php | 2 +- ...{rightNavigation.php => topNavigation.php} | 17 +++++---- 6 files changed, 16 insertions(+), 52 deletions(-) rename views/{rightNavigation.php => topNavigation.php} (78%) diff --git a/controllers/IndexController.php b/controllers/IndexController.php index fe2b716..6e09dcb 100644 --- a/controllers/IndexController.php +++ b/controllers/IndexController.php @@ -31,8 +31,6 @@ class IndexController extends Controller // self::addStyle('/css/style.css?ver=' . App::getConfig('version')); self::addStyle('/css/leaflet.css'); - self::addStyle('/css/bootstrap.min.css'); - self::addStyle('/css/bootstrap-theme.min.css'); self::addStyle('/css/leaflet-routing-machine.css'); self::addStyle('/css/MarkerCluster.css'); self::addStyle('/css/MarkerCluster.Default.css'); diff --git a/public/css/style.css b/public/css/style.css index 8e47d42..9f9fd6c 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -68,7 +68,7 @@ div.leaflet-popup-content button:hover span.label {display: inline;} #routes .route span {font-weight: bold; color: red;} /*Controls for BOX*/ -div#control {width: 50px; position: absolute; top: 0; right: 0;bottom: 50px; color: white; font-size: 20px; padding-top: 10px;} +div#control {width: 50px; position: absolute; top: 0; right: 0;bottom: 50px; color: white; font-size: 20px; padding-top: 60px;} body.openBox div#control {right: 250px;} div#control div {background-color: rgba(15, 15, 15, 0.65); border-radius: 8px 0 0 8px; width: auto; padding: 10px; margin-left: 10px; margin-bottom: 8px; cursor: pointer;} div#control div:before {cursor: pointer;} @@ -84,7 +84,7 @@ div#control div#notify {position: absolute; background-color: red;color: white;b /*BOX*/ body.openBox div#box {display: block; z-index: 100; overflow-y: scroll;overflow-x: hidden;} -div#box {width: 250px; display: none; position: absolute; top: 0; right: 0;bottom: 0px; border-left: 2px solid rgba(45, 45, 45, 0.8); padding: 0 7px;} +div#box {width: 250px; display: none; position: absolute; top: 0; right: 0;bottom: 0px; border-left: 2px solid rgba(45, 45, 45, 0.8); padding: 60px 7px 0 7px;} div#box #boxClose {position: absolute; right: 7px; top: 7px; color: #999; font-size: 18px; font-weight: bolder; cursor: pointer;} div#box div {display: none;} div#box div div{display: block;} diff --git a/views/indexTemplate.php b/views/indexTemplate.php index c1d63b5..c01464b 100644 --- a/views/indexTemplate.php +++ b/views/indexTemplate.php @@ -6,18 +6,6 @@ if (App::$user) { ?>
-
-
- -
- -
- -
- -
- -
@@ -34,32 +22,9 @@ if (App::$user) {
- -
× -

Карты

map Quest
diff --git a/views/layouts/default.php b/views/layouts/default.php index b75a45b..6606b69 100644 --- a/views/layouts/default.php +++ b/views/layouts/default.php @@ -13,6 +13,8 @@ + + @@ -44,11 +46,7 @@ -
-

Карта с достопримечательностями

- -
- + diff --git a/views/layouts/page.php b/views/layouts/page.php index e442391..a37036d 100644 --- a/views/layouts/page.php +++ b/views/layouts/page.php @@ -43,7 +43,7 @@ - + diff --git a/views/rightNavigation.php b/views/topNavigation.php similarity index 78% rename from views/rightNavigation.php rename to views/topNavigation.php index 0b94b1b..93ef84b 100644 --- a/views/rightNavigation.php +++ b/views/topNavigation.php @@ -10,29 +10,32 @@ if (App::$user && App::$user->id) {
- +

Карта с достопримечательностями

+