diff --git a/mamweb/static/css/bootstrap.css b/mamweb/static/css/bootstrap.css index 3c503e69..bd20fe85 100644 --- a/mamweb/static/css/bootstrap.css +++ b/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; } diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css index 9c2f0a6a..c1ee8bad 100644 --- a/mamweb/static/css/mamweb.css +++ b/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; -} - -.header-lg { - 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; + font-size: 250%; + background: url("../images/header-bg.png") no-repeat left top; + height: 353px; + top: -1px; } - #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>a { + color: #003c00; + text-decoration: none; } -#submenu li:hover { - background: #ffb000; +#submenu li>a:hover { + 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; -} +}*/ diff --git a/mamweb/static/images/header-bg.png b/mamweb/static/images/header-bg.png new file mode 100644 index 00000000..eeb35d6b Binary files /dev/null and b/mamweb/static/images/header-bg.png differ diff --git a/mamweb/static/images/logo.png b/mamweb/static/images/logo.png new file mode 100644 index 00000000..1af2dd66 Binary files /dev/null and b/mamweb/static/images/logo.png differ diff --git a/mamweb/static/images/menu-bg-horizontal.png b/mamweb/static/images/menu-bg-horizontal.png new file mode 100644 index 00000000..f746bef3 Binary files /dev/null and b/mamweb/static/images/menu-bg-horizontal.png differ diff --git a/mamweb/static/images/menu-bg-vertical.png b/mamweb/static/images/menu-bg-vertical.png new file mode 100644 index 00000000..767752cc Binary files /dev/null and b/mamweb/static/images/menu-bg-vertical.png differ diff --git a/mamweb/static/images/submenu-bg-horizontal.png b/mamweb/static/images/submenu-bg-horizontal.png new file mode 100644 index 00000000..1d7001aa Binary files /dev/null and b/mamweb/static/images/submenu-bg-horizontal.png differ diff --git a/mamweb/static/images/submenu-bg-vertical.png b/mamweb/static/images/submenu-bg-vertical.png new file mode 100644 index 00000000..11537ee1 Binary files /dev/null and b/mamweb/static/images/submenu-bg-vertical.png differ diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html index 722437a1..a3b3da64 100644 --- a/mamweb/templates/base.html +++ b/mamweb/templates/base.html @@ -35,28 +35,11 @@
-
- Studentský korespondenční seminář a časopis MFF UK -
-
-
-
-
- -
+ +
@@ -66,17 +49,19 @@
-
- -
-
- {% block content %} - {% endblock content %} -
-
+
+ +
+ +
+
+ {% block content %} + {% endblock content %} +
+