diff --git a/public/css/feed.css b/public/css/feed.css index 00a7e94..9b0e22d 100644 --- a/public/css/feed.css +++ b/public/css/feed.css @@ -5,5 +5,3 @@ div.container div.middleHeader {text-align: center; padding-top: 10px;} div.container div.middleHeader img{height: 100px;} div.container div.elements div.element {margin: 3px; padding: 3px; display: inline-block;} div.container div.elements div.element img{width: 200px; float: left; margin: 0 10px 5px 0;} - -div.darkFooter {background-color: #333; color: #fff; margin-bottom: 0px; padding-bottom: 30px; padding-top: 10px;} diff --git a/public/css/style.css b/public/css/style.css index 8badf6b..8a265e4 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -85,8 +85,8 @@ 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;} @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:hover {opacity: 1} +/*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-nav>li>a {color: #ddd;} nav.navbar.navbar-inverse a.bigGreen {background-image: -webkit-linear-gradient(top,#3cfc3c 0, #398739 100%);background-image: linear-gradient(to bottom,#3cfc3c 0, #398739 100%);background-repeat: repeat-x;margin: 0 3px;padding: 15px 15px;border-radius: 5px;display: inline-block;color: white;font-weight: bold;text-decoration: none;} nav.navbar.navbar-inverse a.bigGreen:hover {background-image: -webkit-linear-gradient(top,#3cfc3c 0, #398739 50%);background-image: linear-gradient(to bottom,#3cfc3c 0, #398739 80%);text-decoration: none;} @@ -129,6 +129,8 @@ div#box a:hover {text-decoration: underline;} #photobank img {margin: 2px; border: solid 1px white;} img.imageInArticle {border: solid 3px white;max-width: 100%;} +div.darkFooter {background-color: #333; color: #fff; margin-bottom: 0px; padding-bottom: 30px; padding-top: 10px;} + /* -------------------------------------------*/ /* ------------- ADAPTIVE --------------------*/ /* -------------------------------------------*/ diff --git a/views/article.php b/views/article.php index a998060..7a9d255 100644 --- a/views/article.php +++ b/views/article.php @@ -1,5 +1,5 @@
-
+

title ?>

@@ -39,4 +39,6 @@
$randomPoint), true)?> +
+
diff --git a/views/feed/index.php b/views/feed/index.php index 36e9a6d..3169d9a 100644 --- a/views/feed/index.php +++ b/views/feed/index.php @@ -75,27 +75,5 @@

-
-
-

Благодарности

- Огромные благодарности: жене, родителям, - - OSM, - MapIcons, - MapBox - и - LeafletJS. - -
-
-

Контакты

- EMail: info@wikipoints.ru
- VK: WikiPoints
- Instagram: WikiPoints
-
-
-

Прочее

- 2014- © wikipoints.ru - при любом использовании материалов ссылка на источник обязательна. -
-
+ diff --git a/views/page/darkFooter.php b/views/page/darkFooter.php new file mode 100644 index 0000000..b3c3caa --- /dev/null +++ b/views/page/darkFooter.php @@ -0,0 +1,17 @@ +
+
+

Социальные сети

+ Присоединяйтеся к нам - это интересно!
+ ВКонтакте и + Instagram
+
+
+

Контакты

+ Телефон: +7 (904) 610-6141
+ EMail: info@wikipoints.ru
+
+
+

Прочее

+ 2014- © wikipoints.ru - при любом использовании материалов ссылка на источник обязательна. +
+
diff --git a/views/point.php b/views/point.php index 2c238d0..7edd13a 100644 --- a/views/point.php +++ b/views/point.php @@ -14,7 +14,7 @@ if ($pointsAirport && $usersAirport && $pointsAirport->id != $usersAirport->id){ } ?>
-
+
status != Point::statusPublished): ?> @@ -286,6 +286,8 @@ if ($pointsAirport && $usersAirport && $pointsAirport->id != $usersAirport->id){ $randomPoint), true) ?> +
+