All4DK
/
wikipoints
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Правый блок переделан в тёмные цвета.

This commit is contained in:
Krivchikov Dmitry 2016-05-18 12:02:39 +03:00
parent ae35ecc95b
commit 6020322df5
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
public/css/style.css
View File

@ -61,7 +61,7 @@ div.leaflet-popup-content button:hover span.label {display: inline;}
.form-group.has-error .error {display: inline-block;} .form-group.has-error .error {display: inline-block;}
#wayPoints {margin-bottom: 10px;} #wayPoints {margin-bottom: 10px;}
#wayPoints .wayPoint {cursor: pointer; border: solid 1px #999; padding: 2px 5px; margin-bottom: 3px; background-color: #fff;} #wayPoints .wayPoint {cursor: pointer; border: solid 1px #999; padding: 2px 5px; margin-bottom: 3px; background-color: #fff; color: #333;}
#wayPoints .wayPoint span.del {font-weight: bold; color: red;} #wayPoints .wayPoint span.del {font-weight: bold; color: red;}
#routes {margin-bottom: 10px; height: 200px;} #routes {margin-bottom: 10px; height: 200px;}
@ -71,10 +71,10 @@ div.leaflet-popup-content button:hover span.label {display: inline;}
/*Controls for BOX*/ /*Controls for BOX*/
div#control {width: 50px; position: absolute; top: 0; right: 0;bottom: 50px; color: white; font-size: 20px; padding-top: 60px;} 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;} body.openBox div#control {right: 250px;}
div#control div {background-color: rgba(10, 10, 10, 0.8); border-radius: 8px 0 0 8px; width: auto; padding: 10px; margin-left: 10px; margin-bottom: 8px; cursor: pointer;} div#control div {background-color: #333; border-radius: 8px 0 0 8px; width: auto; padding: 10px; margin-left: 10px; margin-bottom: 8px; cursor: pointer;}
div#control div:before {cursor: pointer;} div#control div:before {cursor: pointer;}
div#control div:hover {background-color: #000;} div#control div:hover {background-color: #000;}
div#control div.inProgress {animation: blink 3s 0s infinite; background-color: rgba(10, 10, 10, 0.8);} div#control div.inProgress {animation: blink 3s 0s infinite; background-color: #333;}
div#control div.active {background-color: rgb(255, 162, 0)!important;} div#control div.active {background-color: rgb(255, 162, 0)!important;}
div#control div.important {background-color: rgba(0, 145, 90, 0.8);} div#control div.important {background-color: rgba(0, 145, 90, 0.8);}
div#control div.big {font-size: 22px; padding: 14px; margin-left: 0;} div#control div.big {font-size: 22px; padding: 14px; margin-left: 0;}
@ -84,7 +84,7 @@ div#control div._b {border-radius: 0 0 0 8px;}
div#control div.space {height: 10px; background-color: transparent; padding: 0;} div#control div.space {height: 10px; background-color: transparent; padding: 0;}
div#control div._t2 {background-color: rgba(200, 200, 200, 0.65); border-radius: 8px 0 0 0;border-bottom: solid 1px #ddd; margin-bottom: 0;} div#control div._t2 {background-color: rgba(200, 200, 200, 0.65); border-radius: 8px 0 0 0;border-bottom: solid 1px #ddd; margin-bottom: 0;}
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;} 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;}
@keyframes blink {0 { background-color: rgba(10, 10, 10, 0.8); } 70% { background-color: rgb(0, 162, 255); } 100% { background-color: rgba(10, 10, 10, 0.8);}} @keyframes blink {0 { background-color: #333; } 70% { background-color: #00a2ff; } 100% { background-color: #333;}}
nav.navbar.navbar-inverse.navbar-fixed-top {opacity: 0.9} nav.navbar.navbar-inverse.navbar-fixed-top {opacity: 0.9}
nav.navbar.navbar-inverse.navbar-fixed-top:hover {opacity: 1} nav.navbar.navbar-inverse.navbar-fixed-top:hover {opacity: 1}
@ -97,15 +97,19 @@ div.top5authors {width: 16.66666667%; float: left; display: inline-block; overfl
/*BOX*/ /*BOX*/
body.openBox div#box {display: block; z-index: 100; overflow-y: scroll;overflow-x: hidden;} 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: 60px 7px 0 7px;} div#box {width: 250px; display: none; position: absolute; top: 0; right: 0;bottom: 0px; border-left: 1px solid #666; padding: 0px 7px 0 7px;}
div#box #boxClose {position: absolute; right: 7px; top: 60px; color: #999; font-size: 18px; font-weight: bolder; cursor: pointer;} div#box #boxClose {position: absolute; right: 10px; top: 5px; color: #999; font-size: 18px; font-weight: bolder; cursor: pointer;}
div#box div {display: none;} div#box div {display: none;}
div#box div div{display: block;} div#box div div{display: block;}
div#box h3 {margin-top: 10px;} div#box h3 {margin-top: 10px;}
div#box {background-image: url('/img/back.png'); background-repeat: no-repeat; background-position: 100% 100%; background-color: #FFFFFF;} div#box {background-color: #333; color: #FFF; margin-top: 51px;}
div#box a {color: #FFF;}
div#box a:hover {text-decoration: underline;}
.layers {cursor: pointer;} .layers {cursor: pointer;}
.layers.selected {font-weight: bold;} .layers.selected {font-weight: bold;}
#boxLayers .dot{display: none; cursor: default;}
#boxLayers .dot.selected{display: inline;}
/*Leaflet FIX*/ /*Leaflet FIX*/
.leaflet-popup-content-wrapper .leaflet-popup-scrolled {border-bottom: none;border-top: none;} .leaflet-popup-content-wrapper .leaflet-popup-scrolled {border-bottom: none;border-top: none;}
@ -183,7 +187,7 @@ img.imageInArticle {border: solid 3px white;max-width: 100%;}
@media screen and (max-width:400px) { @media screen and (max-width:400px) {
a.randomPointAImg {margin: 0 0 10px 0; display: block;width: 100%;text-align: center;} a.randomPointAImg {margin: 0 0 10px 0; display: block;width: 100%;text-align: center;}
div.infoCard div.photoContainer {float: none; margin: 0 auto 10px auto;} div.infoCard div.photoContainer {float: none; margin: 0 auto 10px auto;}
div#box #boxClose {top: 40px; font-size: 45px;} div#box #boxClose {top: 0px; font-size: 45px;}
div.container.feed div.row.elements div.element {width: 100%;} div.container.feed div.row.elements div.element {width: 100%;}
div.container.feed div.row.elements div.element a.imgContainer {margin: 0 0 10px 0; display: block; width: 100%;text-align: center;} div.container.feed div.row.elements div.element a.imgContainer {margin: 0 0 10px 0; display: block; width: 100%;text-align: center;}

16
views/indexTemplate.php
View File

@ -28,12 +28,12 @@ if (App::$user) {
<span id="boxClose" onclick="closeBox();">&times;</span> <span id="boxClose" onclick="closeBox();">&times;</span>
<div id="boxLayers"> <div id="boxLayers">
<h3>Карты</h3> <h3>Карты</h3>
<div onclick="setLayer('quest')" class="layers questLayer">map Quest</div> <span class="dot layers questLayer">⚫ </span><a onclick="setLayer('quest');return false;" class="layers questLayer">map Quest</a><br/>
<div onclick="setLayer('osm')" class="layers osmLayer">Open Street Map</div> <span class="dot layers osmLayer">⚫ </span><a onclick="setLayer('osm');return false;" class="layers osmLayer">Open Street Map</a><br/>
<div onclick="setLayer('topo')" class="layers topoLayer">Генштаб от маршруты.ру</div> <span class="dot layers topoLayer">⚫ </span><a onclick="setLayer('topo');return false;" class="layers topoLayer">Генштаб от маршруты.ру</a><br/>
<div onclick="setLayer('google')" class="layers googleLayer">Google maps</div> <span class="dot layers googleLayer">⚫ </span><a onclick="setLayer('google');return false;" class="layers googleLayer">Google maps</a><br/>
<div onclick="setLayer('yandex')" class="layers yandexLayer">Яндекс.Карты</div> <span class="dot layers yandexLayer">⚫ </span><a onclick="setLayer('yandex');return false;" class="layers yandexLayer">Яндекс.Карты</a><br/>
<div onclick="setLayer('yandexMap')" class="layers yandexMapLayer">Яндекс.Карты (схема)</div> <span class="dot layers yandexMapLayer">⚫ </span><a onclick="setLayer('yandexMap');return false;" class="layers yandexMapLayer">Яндекс.Карты (схема)</a><br/>
</div> </div>
<div id="boxFilter" style="height: 100%; overflow-y: auto;"> <div id="boxFilter" style="height: 100%; overflow-y: auto;">
<h3>Фильтры и поиск</h3> <h3>Фильтры и поиск</h3>
@ -64,7 +64,7 @@ if (App::$user) {
</div> </div>
<div id="routeDistance"></div> <div id="routeDistance"></div>
<button class="btn btn-info" onclick="buildRoute(true)"><span class="glyphicon glyphicon-send"></span> Проложить</button> <button class="btn btn-info" onclick="buildRoute(true)"><span class="glyphicon glyphicon-send"></span> Проложить</button>
<a class="btn btn-default" href="" id="printRoute" target="_blank" title="Печать"><span class="glyphicon glyphicon-print"></span></a> <button class="btn btn-default" id="printRoute" target="_blank" title="Печать"><span class="glyphicon glyphicon-print"></span></button>
<?php if ($user): ?> <?php if ($user): ?>
<button class="btn btn-default" onclick="saveRoute()"><span class="glyphicon glyphicon-cloud-upload" title="Сохранить"></span></button> <button class="btn btn-default" onclick="saveRoute()"><span class="glyphicon glyphicon-cloud-upload" title="Сохранить"></span></button>
<?php endif; ?> <?php endif; ?>
@ -82,7 +82,7 @@ if (App::$user) {
<a href="/user/favorites/"><span class="glyphicon glyphicon-star" aria-hidden="true"></span> На отдельной странице</a> <a href="/user/favorites/"><span class="glyphicon glyphicon-star" aria-hidden="true"></span> На отдельной странице</a>
<hr/> <hr/>
<?php foreach ($favorites as $favorite) : ?> <?php foreach ($favorites as $favorite) : ?>
<a onclick="showInfo(<?= $favorite->pointId ?>)" class="btn btn-link"><?= $favorite->point->name ?></a><br/> <a onclick="showInfo(<?= $favorite->pointId ?>);return false;" href="#"><?= $favorite->point->name ?></a><br/>
<?php endforeach; ?> <?php endforeach; ?>
<?php else: ?> <?php else: ?>
Ваши закладки пока пусты. Ваши закладки пока пусты.