diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css index 1e6f003b..9c2f0a6a 100644 --- a/mamweb/static/css/mamweb.css +++ b/mamweb/static/css/mamweb.css @@ -1,6 +1,8 @@ -.header { - font-size: 200%; - background: #ea3; +@import url(http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,400,300,600&subset=latin,latin-ext); + +body { + font-family: 'Open Sans', sans-serif; + font-weight: 300; } .org-logged-in .mam-text-plugin { @@ -39,4 +41,124 @@ table .border-b { height: 6em; } +/* 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; +} + +#header img.logo { + position: absolute; + top: 25px; + left: 25px; + height: 110px; +} +#header h1 { + font-size: 130%; + position: absolute; + top: 125px; + left: 30px; + height: 110px; +} +#header img.header { + margin: -25px 20px 0px 0px; + height: 145px; + float: right; + visibility: hidden; +} + +/* Menu */ +#menu { + background: #00c322; /* @mamgreen */ + border-bottom-left-radius: 8px; + border-bottom-right-radius: 8px; +} +#menu ul { + padding: 0px; + margin: 0px; +} +#menu li { + display: inline-block; + border-radius: 0px; + + padding: 0px; + width: 16.66%; + min-width: 140px; + text-align: center; + + font-size: 150%; + font-weight: 400; + font-variant: small-caps; + border-bottom-left-radius: 8px; + border-bottom-right-radius: 8px; +} +#menu a { + display: block; + padding: 8px 10px; + color: black; +} +#menu a:hover { + background: #ffb000; + border-bottom-left-radius: 8px; + border-bottom-right-radius: 8px; + text-decoration: none; +} + +#submenu { + /*border: 1px solid black;*/ +} +#submenu ul { + padding: 0px 0px; + margin: 20px 0px 20px 0px; + background: #00c322; /* @mamgreen */ + border-radius: 8px; + list-style-position: inside; + width: 100%; +} +#submenu li { + border-radius: 0px; + padding: 6px 15px; + margin-right: 0px; + font-size: 120%; +} +#submenu li:hover { + background: #ffb000; +} +#submenu li:first-child { + border-top-left-radius: 7px; + border-top-right-radius: 7px; + padding-top: 8px; +} +#submenu li:last-child { + border-bottom-left-radius: 7px; + 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/logocb.png b/mamweb/static/images/logocb.png new file mode 100644 index 00000000..a35150a5 Binary files /dev/null and b/mamweb/static/images/logocb.png differ diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html index 5812ccfc..e43a837a 100644 --- a/mamweb/templates/base.html +++ b/mamweb/templates/base.html @@ -30,16 +30,46 @@ {% endif %}
-
- Korespondenční seminář M&M +
+
+
+ Studentský korespondenční seminář a časopis MFF UK +
+
+
+
+
+ +
-
- {% include "menu.html" %} - {% block submenu %} - {% endblock %} +
+ +
+
+
+
+
-
+
{% block content %} {% endblock content %}
diff --git a/mamweb/templates/menu.html b/mamweb/templates/menu.html index 76958171..aa2a570d 100644 --- a/mamweb/templates/menu.html +++ b/mamweb/templates/menu.html @@ -1,15 +1,13 @@ {% load i18n cache mam_menu %} {% aktualni_rocniky as rs %} -

MENU

-