Merge branch 'scroll'

This commit is contained in:
Oliver Rümpelein 2014-10-24 15:53:42 +02:00
commit ab24c83164
2 changed files with 31 additions and 4 deletions

View file

@ -1,8 +1,18 @@
body>div { /* We want a scrollbar to show - always
evil hack, but overflow-y: scroll sometimes doesn't work*/
html, body {
height: 100%;
margin: 0 0 1px 0;
padding: 0;
}
#display {
postion:relative; postion:relative;
background: rgba(163,128,95,0.9); background: rgba(163,128,95,0.9);
border-radius: 20px; border-radius: 20px;
padding: 5px 10px 5px 10px; padding: 5px 10px 5px 10px;
display:none;
} }
h1 { h1 {
@ -35,7 +45,17 @@ h1 {
} }
/* Don't show anything but warning, if too small */ /* Don't show anything but warning, if too small */
@media all and (min-width: 800px) { /* handheld doesn't work, don't know why…*/
@media handheld {
#display {
display:none;
}
#small {
display:inline;
}
}
@media screen and (min-width:815px) {
#small { #small {
display:none; display:none;
} }
@ -46,9 +66,16 @@ h1 {
background-size: 100% auto; background-size: 100% auto;
padding: 10px 0; padding: 10px 0;
} }
#display {
display:block;
}
} }
@media all and (max-width: 799px) {
@media screen and (max-width:814px) {
#display { #display {
display:none; display:none;
} }
#small {
display:inline;
}
} }

View file

@ -20,7 +20,7 @@
</div> </div>
<div id="small"> <div id="small">
Die Anzeige dieser Seite benötigt eine Breite von mindestens 800 px! Die Anzeige dieser Seite benötigt eine Breite von mindestens 815 px und ist auf mobilen Geräten nicht lauffähig!
</div> </div>
<!-- Include 3rd-Party Libraries --> <!-- Include 3rd-Party Libraries -->
<script type="text/javascript" src="lib/crafty.js"></script> <script type="text/javascript" src="lib/crafty.js"></script>