From 55222b4a6cea1947b31d74f75e80fbc42706638c Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Wed, 18 Nov 2015 22:49:31 +0300
Subject: [PATCH] =?UTF-8?q?FIX=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=B8=20=D0=BD=D0=B5=D0=B4=D0=BE=D1=87=D1=91=D1=82=D1=8B=20?=
 =?UTF-8?q?=D0=B2=20=D0=B2=D1=91=D1=80=D1=81=D1=82=D0=BA=D0=B5=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=B1=D0=BB=D0=BE=D0=BA?=
 =?UTF-8?q?=D0=B0=20control?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ground/views/indexTemplate.php   | 2 +-
 ground/views/rightNavigation.php | 2 +-
 public/css/pageStyle.css         | 3 +++
 public/css/style.css             | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ground/views/indexTemplate.php b/ground/views/indexTemplate.php
index 716a52b..3629db3 100644
--- a/ground/views/indexTemplate.php
+++ b/ground/views/indexTemplate.php
@@ -7,7 +7,7 @@ if (App::$user) {
 <div id="map"></div>
 <div id="control">
 	<div class="glyphicon _t glyphicon-info-sign boxButtonInfo" title="Информация" onclick="openBox('Info')"></div>
-	<div class="glyphicon _b glyphicon-font boxButtonInfo" title="Лента статей" onclick="location.href='/feed/'"></div>
+	<div class="glyphicon _b glyphicon-font boxButtonArticles" title="Лента статей" onclick="location.href='/feed/'"></div>
 
 	<div class="glyphicon glyphicon-plus big _t" title="Приблизить" onclick="myMap.zoomIn()"></div>
 	<div class="glyphicon glyphicon-minus big _b" title="Отдалить" onclick="myMap.zoomOut()"></div>
diff --git a/ground/views/rightNavigation.php b/ground/views/rightNavigation.php
index 6737200..3102786 100644
--- a/ground/views/rightNavigation.php
+++ b/ground/views/rightNavigation.php
@@ -8,7 +8,7 @@ if (App::$user && App::$user->id) {
 }
 
 ?>
-<div id="control" style="z-index: 1000; position: fixed;">
+<div id="control">
 	<div class="glyphicon _t glyphicon-info-sign boxButtonInfo" title="Информация" onclick="openBox('Info')"></div>
 	<div class="glyphicon _b glyphicon-font" title="Лента статей" onclick="location.href='/feed/'"></div>
 
diff --git a/public/css/pageStyle.css b/public/css/pageStyle.css
index f15708f..72d100a 100644
--- a/public/css/pageStyle.css
+++ b/public/css/pageStyle.css
@@ -9,6 +9,8 @@ div.pointsWall .point span.header {font-size: 22px; color: white; font-weight: b
 .test-ulm-row .test-ulm {text-align: center;width: 16.5%;float: right;display: inline-block;}
 .test-ulm-row .test-ulm nobr {font-size: 1.2em;}
 
+div#control {position: fixed; z-index: 1000;}
+
 /* -------------------------------------------*/
 /* ------------- ADAPTIVE --------------------*/
 /* -------------------------------------------*/
@@ -17,6 +19,7 @@ div.pointsWall .point span.header {font-size: 22px; color: white; font-weight: b
 @media screen and (max-width:1200px) {
     .pagePoinsNearCards {display: inline-block; width: 153px; height: 114px; overflow: hidden;}
     .pagePoinsNearCardsImg {width: 153px; height: 114px;}
+    div#control {position: absolute;}
 }
 
 @media screen and (max-width:1000px) {
diff --git a/public/css/style.css b/public/css/style.css
index 2fdf31a..e71f351 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -81,7 +81,7 @@ div#control div._t2 {background-color: rgba(200, 200, 200, 0.65); border-radius:
 div#control div#notify {position: absolute; background-color: red;color: white;border-radius: 50%; width: 20px;height: 20px;margin: 0;padding: 0;padding-top: 2px;text-align: center;font-weight: bolder;font-size: 15px;vertical-align: middle;font-family: sans-serif;top: 18px;left: -7px;}
 
 /*BOX*/
-body.openBox div#box {display: block; z-index: 100;}
+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 #boxClose {position: absolute; right: 7px; top: 7px; color: #999; font-size: 18px; font-weight: bolder; cursor: pointer;}
 div#box div {display: none;}