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

Перенёс некоторые стили в pageStyle.css

This commit is contained in:
Krivchikov Dmitry 2015-05-20 21:27:00 +03:00
parent c20fba4f4d
commit ba55b957e3
3 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/controllers/PageController.php
View File

@ -59,6 +59,7 @@ class PageController extends Controller
self::addScript('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.js'); self::addScript('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.js');
self::addStyle('/css/style.css?ver=' . App::getConfig('version')); self::addStyle('/css/style.css?ver=' . App::getConfig('version'));
self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version'));
self::addStyle('/css/bootstrap.min.css'); self::addStyle('/css/bootstrap.min.css');
self::addStyle('/css/bootstrap-theme.min.css'); self::addStyle('/css/bootstrap-theme.min.css');
self::addStyle('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css'); self::addStyle('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css');
@ -135,6 +136,7 @@ class PageController extends Controller
self::addScript('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.js'); self::addScript('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.js');
self::addStyle('/css/style.css?ver=' . App::getConfig('version')); self::addStyle('/css/style.css?ver=' . App::getConfig('version'));
self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version'));
self::addStyle('/css/bootstrap.min.css'); self::addStyle('/css/bootstrap.min.css');
self::addStyle('/css/bootstrap-theme.min.css'); self::addStyle('/css/bootstrap-theme.min.css');
self::addStyle('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css'); self::addStyle('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css');

32
public/css/pageStyle.css Normal file
View File

@ -0,0 +1,32 @@
/* -------------------------------------------*/
/* ------------- ADAPTIVE --------------------*/
/* -------------------------------------------*/
/* Target landscape smartphones, portrait tablets, narrow desktops */
@media screen and (max-width:1200px) {
.pagePoinsNearCards {display: inline-block; width: 153px; height: 114px; overflow: hidden;}
.pagePoinsNearCardsImg {width: 153px; height: 114px;}
}
@media screen and (max-width:1000px) {
#pageSmoothBackground {display: none;}
}
@media screen and (max-width:990px) {
.pagePoinsNearCards {display: inline-block; width: 116px; height: 87px; overflow: hidden;}
.pagePoinsNearCardsImg {width: 116px; height: 87px;}
}
@media screen and (max-width:815px) {
.pagePoinsNearCards {display: inline-block; width: 120px; height: 90px; overflow: hidden;}
.pagePoinsNearCardsImg {width: 120px; height: 90px;}
}
@media screen and (max-width:640px) {
div.header {
position: initial;
text-align: center;
}
.pagePoinsNearCards {display: inline-block; width: 201px; height: 150px; overflow: hidden;}
.pagePoinsNearCardsImg {width: 201px; height: 150px;}
}

21
public/css/style.css
View File

@ -96,11 +96,6 @@ div#box {background-image: url('/img/back.png'); background-repeat: no-repeat; b
/* -------------------------------------------*/ /* -------------------------------------------*/
/* Target landscape smartphones, portrait tablets, narrow desktops */ /* Target landscape smartphones, portrait tablets, narrow desktops */
@media screen and (max-width:1200px) {
.pagePoinsNearCards {display: inline-block; width: 153px; height: 114px; overflow: hidden;}
.pagePoinsNearCardsImg {width: 153px; height: 114px;}
}
@media screen and (max-width:1000px) { @media screen and (max-width:1000px) {
.modal-dialog { .modal-dialog {
width: 100%!important; width: 100%!important;
@ -130,12 +125,6 @@ div#box {background-image: url('/img/back.png'); background-repeat: no-repeat; b
padding: 3px!important; padding: 3px!important;
margin: 0!important; margin: 0!important;
} }
#pageSmoothBackground {display: none;}
}
@media screen and (max-width:990px) {
.pagePoinsNearCards {display: inline-block; width: 116px; height: 87px; overflow: hidden;}
.pagePoinsNearCardsImg {width: 116px; height: 87px;}
} }
@media screen and (max-width:815px) { @media screen and (max-width:815px) {
@ -151,15 +140,5 @@ div#box {background-image: url('/img/back.png'); background-repeat: no-repeat; b
width: 115px; width: 115px;
height: 69px; height: 69px;
} }
.pagePoinsNearCards {display: inline-block; width: 120px; height: 90px; overflow: hidden;}
.pagePoinsNearCardsImg {width: 120px; height: 90px;}
} }
@media screen and (max-width:640px) {
div.header {
position: initial;
text-align: center;
}
.pagePoinsNearCards {display: inline-block; width: 201px; height: 150px; overflow: hidden;}
.pagePoinsNearCardsImg {width: 201px; height: 150px;}
}