mam/mamweb
13
1
Fork 0
Code Issues Pull requests 12 Projects Wiki Activity Actions

CSS podle Anet -- 1. verze

Browse source
This commit is contained in:
Jan Musílek 2015-09-11 04:29:18 +02:00
parent 150505a1be
commit 1c9ae330dd
9 changed files with 72 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mamweb/static/css/bootstrap.css vendored
View file

@ -1403,11 +1403,11 @@ pre code {
width: 970px;
}
}
@media (min-width: 1200px) {
/*@media (min-width: 1200px) {
.container {
width: 1170px;
}
}
}*/
.container-fluid {
padding-right: 15px;
padding-left: 15px;
@ -1896,7 +1896,7 @@ pre code {
margin-left: 0;
}
}
@media (min-width: 1200px) {
/*@media (min-width: 1200px) {
.col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 {
float: left;
}
@ -2053,7 +2053,7 @@ pre code {
.col-lg-offset-0 {
margin-left: 0;
}
}
}*/
table {
background-color: transparent;
}
@ -6232,7 +6232,7 @@ button.close {
display: inline-block !important;
}
}
@media (min-width: 1200px) {
/*@media (min-width: 1200px) {
.visible-lg {
display: block !important;
}
@ -6261,7 +6261,7 @@ button.close {
.visible-lg-inline-block {
display: inline-block !important;
}
}
}*/
@media (max-width: 767px) {
.hidden-xs {
display: none !important;
@ -6277,11 +6277,11 @@ button.close {
display: none !important;
}
}
@media (min-width: 1200px) {
/*@media (min-width: 1200px) {
.hidden-lg {
display: none !important;
}
}
}*/
.visible-print {
display: none !important;
}

94
mamweb/static/css/mamweb.css
View file

@ -33,6 +33,18 @@ table .border-b {
border: solid 2px;
}
div.container {
background-color: #fff8eb;
padding: 0px;
}
div.content {
padding: 15px 30px;
}
h2 {
margin-top: 0px;
}
/* Comments */
@ -43,36 +55,17 @@ table .border-b {
/* Headline & Header */
#headline {
padding: 6px 10px;
font-size: 150%;
font-weight: 400;
background: #00c322; /* @mamgreen */
}
#header {
position: relative;
z-index: -1;
}
.header-lg {
font-size: 250%;
background-color: rgba(255,195,0,0.8);
height: 220px;
position: relative;
background: url("../images/header-bg.png") no-repeat left top;
height: 353px;
top: -1px;
}
.header-md {
font-size: 250%;
background-color: rgba(255,195,0,0.8);
height: 220px;
position: relative;
}
#header img.logo {
position: absolute;
top: 25px;
left: 25px;
height: 110px;
top: 20px;
left: 45px;
}
#header h1 {
font-size: 130%;
@ -91,9 +84,10 @@ table .border-b {
/* Menu */
#menu {
background: #00c322; /* @mamgreen */
border-bottom-left-radius: 8px;
border-bottom-right-radius: 8px;
position: relative;
top: -1px;
background: url("../images/menu-bg-vertical.png") no-repeat left top, url("../images/menu-bg-horizontal.png") repeat-x left top;
background-color: #ffb52d;
}
#menu ul {
padding: 0px;
@ -117,36 +111,41 @@ table .border-b {
#menu a {
display: block;
padding: 8px 10px;
color: black;
color: #006400;
}
#menu a:hover {
background: #ffb000;
border-bottom-left-radius: 8px;
border-bottom-right-radius: 8px;
background: url("../images/submenu-bg-vertical.png") no-repeat left top, url("../images/submenu-bg-horizontal.png") repeat-x left top;
background-color: #ffa500;
text-decoration: none;
color: #003c00;
}
#menu a.selected {
color: #003c00;
}
#submenu {
/*border: 1px solid black;*/
position: relative;
top: -1px;
background: url("../images/submenu-bg-vertical.png") no-repeat left top, url("../images/submenu-bg-horizontal.png") repeat-x left top;
background-color: #ffa500;
}
#submenu ul {
padding: 0px 0px;
margin: 20px 0px 20px 0px;
background: #00c322; /* @mamgreen */
border-radius: 8px;
list-style-position: inside;
width: 100%;
padding: 0px 15px;
font-size: 150%;
font-weight: 400;
}
#submenu li {
border-radius: 0px;
padding: 6px 15px;
margin-right: 0px;
font-size: 120%;
padding: 6px 20px;
display: inline-block;
}
#submenu li:hover {
background: #ffb000;
#submenu li>a {
color: #003c00;
text-decoration: none;
}
#submenu li:first-child {
#submenu li>a:hover {
color: #3c003c;
}
/*#submenu li:first-child {
border-top-left-radius: 7px;
border-top-right-radius: 7px;
padding-top: 8px;
@ -156,9 +155,6 @@ table .border-b {
border-bottom-right-radius: 7px;
padding-bottom: 8px;
}
#submenu li>a {
color: #000;
}
#submenu li>a:hover {
text-decoration: none;
}
}*/

BIN
mamweb/static/images/header-bg.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 679 KiB

BIN
mamweb/static/images/logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 50 KiB

BIN
mamweb/static/images/menu-bg-horizontal.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 239 B

BIN
mamweb/static/images/menu-bg-vertical.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 572 B

BIN
mamweb/static/images/submenu-bg-horizontal.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 239 B

BIN
mamweb/static/images/submenu-bg-vertical.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 653 B

27
mamweb/templates/base.html
View file

@ -33,28 +33,11 @@
{% endif %}
<div class="container">
<div class='row'>
<div class='col-md-12'>
<div id="headline">
Studentský korespondenční seminář a časopis MFF UK
</div>
</div>
</div>
<div class='row'>
<div class='col-md-12'>
<div id="header">
<div class='header-lg visible-lg-block'>
<img class="logo" src="{% static 'images/logocb.png' %}" />
<h1>{% block nadpis1a %}Nadpis 1. úrovně{% endblock %}</h1>
<img class="header" src="{% static 'images/liska6.png' %}" />
<!--<a href="/">Korespondenční seminář M&amp;M</a>-->
</div>
<div class='header-md visible-md-block'>
<img class="logo" src="{% static 'images/logocb.png' %}" />
<h1>{% block nadpis1b %}Nadpis 1. úrovně{% endblock %}</h1>
<img class="header" src="{% static 'images/liska6.png' %}" />
<!--<a href="/">Korespondenční seminář M&amp;M</a>-->
</div>
<img class="logo" src="{% static 'images/logo.png' %}" />
<!--<h1>{% block nadpis1b %}Nadpis 1. úrovně{% endblock %}</h1>-->
</div>
</div>
</div>
@ -66,13 +49,15 @@
</div>
</div>
<div class='row'>
<div class='col-md-3'>
<div class='col-md-12'>
<div id='submenu'>
{% block submenu %}
{% endblock %}
</div>
</div>
<div class='col-md-9'>
</div>
<div class='row content'>
<div class='col-md-12'>
{% block content %}
{% endblock content %}
</div>