CSS podle Anet -- 1. verze

mamweb/static/css/bootstrap.css

@@ -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;
 }

mamweb/static/css/mamweb.css

@@ -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;
+	font-size: 250%;
-}
+	background: url("../images/header-bg.png") no-repeat left top;
-
+	height: 353px;
-.header-lg {
+	top: -1px;
-  font-size: 250%;
-  background-color: rgba(255,195,0,0.8);
-  height: 220px;
-  position: relative;
-}
-.header-md {
-  font-size: 250%;
-  background-color: rgba(255,195,0,0.8);
-  height: 220px;
-  position: relative;
 }
-
 #header img.logo {
 	position: absolute;
-	top: 25px;
+	top: 20px;
-	left: 25px;
+	left: 45px;
-	height: 110px;
 }
 #header h1 {
 	font-size: 130%;
@@ -91,9 +84,10 @@ table .border-b {
 /* Menu */
 
 #menu {
-	background: #00c322; /* @mamgreen */
+	position: relative;
-	border-bottom-left-radius: 8px;
+	top: -1px;
-	border-bottom-right-radius: 8px;
+	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;
+	background: url("../images/submenu-bg-vertical.png") no-repeat left top, url("../images/submenu-bg-horizontal.png") repeat-x left top;
-	border-bottom-left-radius: 8px;
+	background-color: #ffa500;
-	border-bottom-right-radius: 8px;
 	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;
+	padding: 0px 15px;
-	margin: 20px 0px 20px 0px;
+	font-size: 150%;
-	background: #00c322; /* @mamgreen */
+	font-weight: 400;
-	border-radius: 8px;
-	list-style-position: inside;
-	width: 100%;
 }
 #submenu li {
-	border-radius: 0px;
+	padding: 6px 20px;
-	padding: 6px 15px;
+	display: inline-block;
-	margin-right: 0px;
+}
-	font-size: 120%;
+#submenu li>a {
+	color: #003c00;
+	text-decoration: none;
 }
-#submenu li:hover {
+#submenu li>a:hover {
-	background: #ffb000;
+	color: #3c003c;
 }
-#submenu li:first-child {
+/*#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;
-}
+}*/

mamweb/templates/base.html

@@ -35,28 +35,11 @@
     <div class="container">
 	  <div class='row'>
 		<div class='col-md-12'>
-		  <div id="headline">
+	  	  <div id="header">
-			Studentský korespondenční seminář a časopis MFF UK
+			<img class="logo" src="{% static 'images/logo.png' %}" />
-		  </div>
+            <!--<h1>{% block nadpis1b %}Nadpis 1. úrovně{% endblock %}</h1>-->
-      	</div>
+          </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>
-      </div>
-      </div>
       </div>
       <div class='row'>
 	    <div class='col-md-12' style=''>
@@ -66,17 +49,19 @@
 	    </div>
 	  </div>
 	  <div class='row'>
-	<div class='col-md-3'>
+	    <div class='col-md-12'>
-		<div id='submenu'>
+		  <div id='submenu'>
-		  {% block submenu %}
+		    {% block submenu %}
-		  {% endblock %}
+		    {% endblock %}
-		</div>
+		  </div>
-	</div>
+	    </div>
-	<div class='col-md-9'>
+	  </div>
-	  {% block content %}
+	<div class='row content'>
-	  {% endblock content %}
+	  <div class='col-md-12'>
-	</div>
+	    {% block content %}
-      </div>
+	    {% endblock content %}
+	  </div>
+    </div>
     </div>
     <script src="{% static 'js/bootstrap.js' %}"></script>
     <script src="{% static 'js/jquery.jcarousel-core.js' %}" type="text/javascript"></script>