Browse Source

Tabletová verze!

remotes/origin/noc
Honza "Stínovlas" Musílek 9 years ago
parent
commit
1b8dbcb512
  1. 68
      mamweb/static/css/mamweb.css
  2. BIN
      mamweb/static/images/footer-bg-bottom.png
  3. BIN
      mamweb/static/images/footer-bg-top.png
  4. BIN
      mamweb/static/images/footer-bg.png
  5. BIN
      mamweb/static/images/logo-mff.png
  6. 2
      mamweb/templates/base.html

68
mamweb/static/css/mamweb.css

@ -63,11 +63,11 @@ h2 {
top: -1px; top: -1px;
} }
#header.cojemam { background: url("../images/header-bg-uvod.png") no-repeat center top; } #header.cojemam { background-image: url("../images/header-bg-uvod.png"); }
#header.soustredeni { background: url("../images/header-bg-soustredeni.png") no-repeat center top; } #header.soustredeni { background-image: url("../images/header-bg-soustredeni.png"); }
#header.zadani { background: url("../images/header-bg-zadani.png") no-repeat center top; } #header.zadani { background-image: url("../images/header-bg-zadani.png"); }
#header.clanky { background: url("../images/header-bg-clanek.png") no-repeat center top; } #header.clanky { background-image: url("../images/header-bg-clanek.png"); }
#header.archiv { background: url("../images/header-bg-archiv.png") no-repeat center top; } #header.archiv { background-image: url("../images/header-bg-archiv.png"); }
#header img.logo { #header img.logo {
position: absolute; position: absolute;
@ -196,9 +196,15 @@ div.zadani_azad_termin {
**********/ **********/
#footer { #footer {
background: url("../images/footer-bg.png") no-repeat -100px 0px; background: url("../images/footer-bg-top.png") no-repeat top center;
padding: 20px 30px; background-color: #ffd546;
height: 210px; padding: 20px 30px 0px 30px;
min-height: 210px;
}
#footer-extra {
background: url("../images/footer-bg-bottom.png") no-repeat bottom center;
height: 39px;
} }
#footer p.license { #footer p.license {
@ -208,16 +214,58 @@ div.zadani_azad_termin {
#footer p.organize { #footer p.organize {
text-align: center; text-align: center;
margin-top: 40px; margin-top: 60px;
margin-left: 90px; margin-left: 90px;
} }
#footer img.logo-left { #footer img.logo-left {
padding: 30px 0px; padding: 50px 0px 0px 0px;
float: left; float: left;
} }
#footer img.logo-right { #footer img.logo-right {
padding: 40px 0px 00px 10px;
float: right;
}
@media (max-width: 991px) {
#header {
height: 196px;
background-size: 100% 100%;
}
#header img.logo {
top: 15px;
left: 25px;
height: 170px;
}
#menu li {
min-width: 120px;
font-size: 130%;
}
#submenu ul {
font-size: 115%;
}
#submenu li {
padding-top: 5px;
}
#footer {
padding: 20px 40px 0px 40px;
min-height: 260px;
}
#footer p.organize {
text-align: center;
margin-top: 170px;
margin-left: 0px;
}
#footer img.logo-left {
padding: 50px 20px 0px 0px;
float: right; float: right;
} }
#footer img.logo-right {
padding: 40px 0px 0px 20px;
float: left;
}
}

BIN
mamweb/static/images/footer-bg-bottom.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

BIN
mamweb/static/images/footer-bg-top.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

BIN
mamweb/static/images/footer-bg.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

BIN
mamweb/static/images/logo-mff.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 15 KiB

2
mamweb/templates/base.html

@ -91,7 +91,7 @@
<a href="http://jcmf.cz/"><img class="logo-left" src="{% static 'images/logo-jcmf.png' %}" /></a> <a href="http://jcmf.cz/"><img class="logo-left" src="{% static 'images/logo-jcmf.png' %}" /></a>
<a href="http://mff.cuni.cz"><img class="logo-right" src="{% static 'images/logo-mff.png' %}" /></a> <a href="http://mff.cuni.cz"><img class="logo-right" src="{% static 'images/logo-mff.png' %}" /></a>
<p class="organize"><a href="/kontakt">Korespondenční seminář M&amp;M</a> organizují převážně studenti MFF UK. Organizaci semináře a vydávání časopisu podporuje <a href="http://jcmf.cz">Jednota českých matematiků a fyziků</a>.</p> <p class="organize"><a href="/kontakt">Korespondenční seminář M&amp;M</a> organizují převážně studenti MFF UK. Organizaci semináře a vydávání časopisu podporuje <a href="http://jcmf.cz">Jednota českých matematiků a fyziků</a>.</p>
</div> </div><div id="footer-extra"></div>
</div> </div>
</div> </div>
</div> </div>

Loading…
Cancel
Save