Browse Source

Fix: bootstrap upravuje .container

pull/44/head
Jonas Havelka 10 months ago
parent
commit
df5ae2c12a
  1. 10
      mamweb/static/css/layout.css
  2. 6
      mamweb/static/css/modules.css
  3. 6
      mamweb/templates/april.html
  4. 6
      mamweb/templates/base.html

10
mamweb/static/css/layout.css

@ -8,7 +8,7 @@
}
/**** KONTEJNER ****/
div.container {
div.kontejner {
width: 970px;
margin: auto;
min-height: 100vh;
@ -17,16 +17,16 @@ div.container {
}
.org-logged-in div.container {
.org-logged-in div.kontejner {
margin-top: var(--login-bar-height);
}
div.content-wrapper {
div.kontent-wrapper {
padding-bottom: var(--footer-height);
}
div.content {
div.kontent {
padding: 15px 30px;
}
@ -169,7 +169,7 @@ a.login-ref-admin {
/* stránka přes celý displej */
@media (max-width: 970px) {
div.container {
div.kontejner {
width: 100%;
}

6
mamweb/static/css/modules.css

@ -279,9 +279,9 @@ div.org_email {
.tabulka_s_uchycenym_radkem_a_sloupcem thead,
.tabulka_s_uchycenym_radkem_a_sloupcem tbody,
.tabulka_s_uchycenym_radkem_a_sloupcem tr,
.container,
.content-wrapper,
.content
.kontejner,
.kontent-wrapper,
.kontent
{
background: inherit;
}

6
mamweb/templates/april.html

@ -36,8 +36,8 @@
return Math.floor(360*Math.random());
}
$('.container').css('margin', 0);
rotace_a_posun($('.container'), randomUhel());
$('.kontejner').css('margin', 0);
rotace_a_posun($('.kontejner'), randomUhel());
</script>
{% endif %}
@ -58,4 +58,4 @@
}
walkText(document.body);
</script>
{% endif %}
{% endif %}

6
mamweb/templates/base.html

@ -55,8 +55,8 @@
</div>
{% endif %}
<div class="container">
<div class="content-wrapper">
<div class="kontejner">
<div class="kontent-wrapper">
<a href='/'>
<div id="title" >M&M &ndash; korespondenční seminář a časopis MFF&nbspUK</div>
@ -100,7 +100,7 @@
{# ========= END MENU ========== #}
<div class='content'>
<div class='kontent'>
{% block content %}
{% endblock content %}

Loading…
Cancel
Save