From 4a8c087a5be0996b45aab74120253fe26d36f647 Mon Sep 17 00:00:00 2001
From: Herbert Kruitbosch <H.T.Kruitbosch@rug.nl>
Date: Wed, 29 Nov 2017 13:34:18 +0100
Subject: [PATCH] maxwidth nav

---
 rugwebsite/__init__.py                        |   2 +-
 .../commands/init-saml2-settings.py           |   2 -
 rugwebsite/static/css/rug-2017.css            | 139 +-----------------
 rugwebsite/static/css/rug-herbert.css         |   2 +
 4 files changed, 11 insertions(+), 134 deletions(-)

diff --git a/rugwebsite/__init__.py b/rugwebsite/__init__.py
index 9b28d11..3e1af08 100644
--- a/rugwebsite/__init__.py
+++ b/rugwebsite/__init__.py
@@ -1 +1 @@
-__version__ = '0.1.24'
\ No newline at end of file
+__version__ = '0.1.26'
\ No newline at end of file
diff --git a/rugwebsite/management/commands/init-saml2-settings.py b/rugwebsite/management/commands/init-saml2-settings.py
index a2d66b7..d1a8df3 100644
--- a/rugwebsite/management/commands/init-saml2-settings.py
+++ b/rugwebsite/management/commands/init-saml2-settings.py
@@ -34,8 +34,6 @@ class Command(BaseCommand):
         parser.add_argument('--expires-after-days', nargs='?', type=int, default=10 * 365, dest='expires')
 
     def handle(self, *args, **options):
-        print('=' * 100)
-        print(options)
         for option in {'country', 'city', 'state', 'organisation', 'organisation_unit', 'common_name', 'support_name',
                        'support_email', 'technical_name', 'technical_email', 'entity_id', 'base_url'}:
             assert option in options and options[option] is not None and len(options[option]) == 1, "Expected one " \
diff --git a/rugwebsite/static/css/rug-2017.css b/rugwebsite/static/css/rug-2017.css
index 1a6a983..49f18b0 100644
--- a/rugwebsite/static/css/rug-2017.css
+++ b/rugwebsite/static/css/rug-2017.css
@@ -213,35 +213,11 @@ summary {
     display: none
 }
 
-blockquote, body, dd, dl, fieldset, figure, h1, h2, h3, h4, h5, h6, hr, html, legend, ol, p, pre, ul {
+body {
     margin: 0;
     padding: 0
 }
 
-hr, li > ol, li > ul, pre {
-    margin-bottom: 0
-}
-
-dl dd, dl dt, h1, h2, h3, h4, h5, h6 {
-    margin-bottom: .25rem
-}
-
-caption, p {
-    margin-bottom: 1.5rem
-}
-
-table {
-    border-collapse: collapse;
-    border-spacing: 0
-}
-
-fieldset {
-    min-width: 0
-}
-
-iframe {
-    padding: 0
-}
 
 blockquote {
     font-family: "Open Sans Italic", sans-serif;
@@ -260,46 +236,6 @@ legend {
     width: 100%
 }
 
-input, select, textarea {
-    font-size: 1rem;
-    font-family: "Open Sans", sans-serif
-}
-
-h1, h2, h3, h4, h5, h6 {
-    color: #000;
-    font-family: "Open Sans Semi-Bold", sans-serif;
-    font-weight: 600;
-    line-height: 1.125em
-}
-
-h1, ol li, ul li {
-    margin-bottom: .5rem
-}
-
-h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
-    color: #000
-}
-
-h1 {
-    font-size: 1.75rem
-}
-
-h2 {
-    font-size: 1.5rem
-}
-
-h3 {
-    font-size: 1.25rem
-}
-
-h4 {
-    font-size: 1.125rem
-}
-
-h5, h6 {
-    font-size: 1rem
-}
-
 embed, img, object {
     font-family: "Open Sans Italic", sans-serif;
     max-width: 100%;
@@ -319,38 +255,6 @@ figcaption {
     text-decoration: none
 }
 
-dl, ol, ul {
-    margin-left: 1.5rem
-}
-
-ul {
-    list-style-type: none
-}
-
-ol[data-style-type=lower-alpha] {
-    list-style-type: lower-alpha
-}
-
-ol[data-style-type=upper-alpha] {
-    list-style-type: upper-alpha
-}
-
-ol[data-style-type=lower-roman] {
-    list-style-type: lower-roman
-}
-
-ol[data-style-type=upper-roman] {
-    list-style-type: upper-roman
-}
-
-li > ol, li > ul {
-    margin-top: .5rem
-}
-
-dl dt {
-    font-weight: 700
-}
-
 html {
     -ms-text-size-adjust: 100%;
     -webkit-text-size-adjust: 100%;
@@ -375,20 +279,6 @@ html {
     }
 }
 
-p {
-    line-height: 1.5rem;
-    max-width: 688px
-}
-
-caption, td, th {
-    padding: .25rem .5rem;
-    text-align: left;
-    vertical-align: top
-}
-
-tr td:first-child {
-    padding-left: 0
-}
 
 mark {
     background-color: #fff6e6;
@@ -937,7 +827,7 @@ input.hasDatepicker {
     color: #ea2422
 }
 
-.h1, .h2, .h3, .h4, .h5, .h6, .ui-dialog .ui-dialog-titlebar .ui-dialog-title {
+.ui-dialog .ui-dialog-titlebar .ui-dialog-title {
     color: #000;
     font-family: "Open Sans Semi-Bold", sans-serif;
     font-weight: 600;
@@ -945,25 +835,12 @@ input.hasDatepicker {
     margin-bottom: .25rem
 }
 
-.h1 {
-    font-size: 1.75rem;
-    margin-bottom: .5rem
-}
-
-.h2 {
-    font-size: 1.5rem
-}
-
-.h3 {
-    font-size: 1.25rem
-}
-
-.h4, .ui-dialog .ui-dialog-titlebar .ui-dialog-title {
-    font-size: 1.125rem
-}
-
-.h5, .h6 {
-    font-size: 1rem
+.h1, .h2, .h3, .h4, .h5, .h6 {
+    color: #000;
+    font-family: "Open Sans Semi-Bold", sans-serif;
+    font-weight: 600;
+    line-height: 1.125em;
+    margin-bottom: .25rem
 }
 
 .rug-iframe__maps--container {
diff --git a/rugwebsite/static/css/rug-herbert.css b/rugwebsite/static/css/rug-herbert.css
index 83dd76e..272d91c 100644
--- a/rugwebsite/static/css/rug-herbert.css
+++ b/rugwebsite/static/css/rug-herbert.css
@@ -108,6 +108,7 @@ body:not(a):not(a):not(a) *, html * {
 
 .rug-nav-item.rug-nav-item.rug-nav-item.rug-nav-item a {
     color: #fff;
+    white-space: nowrap;
 }
 
 .rug-nav-item-active.rug-nav-item-active.rug-nav-item-active.rug-nav-item-active.rug-nav-item-active a,
@@ -130,6 +131,7 @@ body:not(a):not(a):not(a) *, html * {
     font-size: 1.125rem;
     font-weight: 700;
     position: relative;
+    max-width: 300px;
 }
 
 .rug-nav-item-active.rug-nav-item-active.rug-nav-item-active.rug-nav-item-active.rug-nav-item-active,