diff --git a/cao_blogr/static/carousel/S01.JPG b/cao_blogr/static/carousel/S01.JPG new file mode 100644 index 0000000..8dae922 Binary files /dev/null and b/cao_blogr/static/carousel/S01.JPG differ diff --git a/cao_blogr/static/carousel/S02.jpg b/cao_blogr/static/carousel/S02.jpg new file mode 100644 index 0000000..2fbedaf Binary files /dev/null and b/cao_blogr/static/carousel/S02.jpg differ diff --git a/cao_blogr/static/carousel/S03.jpg b/cao_blogr/static/carousel/S03.jpg new file mode 100644 index 0000000..d42e849 Binary files /dev/null and b/cao_blogr/static/carousel/S03.jpg differ diff --git a/cao_blogr/static/carousel/S06.jpg b/cao_blogr/static/carousel/S06.jpg new file mode 100644 index 0000000..32cad58 Binary files /dev/null and b/cao_blogr/static/carousel/S06.jpg differ diff --git a/cao_blogr/static/carousel/S09.JPG b/cao_blogr/static/carousel/S09.JPG new file mode 100644 index 0000000..6484198 Binary files /dev/null and b/cao_blogr/static/carousel/S09.JPG differ diff --git a/cao_blogr/static/carousel/S12.jpg b/cao_blogr/static/carousel/S12.jpg new file mode 100644 index 0000000..bb57df8 Binary files /dev/null and b/cao_blogr/static/carousel/S12.jpg differ diff --git a/cao_blogr/static/carousel/S15.JPG b/cao_blogr/static/carousel/S15.JPG new file mode 100644 index 0000000..f3c4e1d Binary files /dev/null and b/cao_blogr/static/carousel/S15.JPG differ diff --git a/cao_blogr/static/carousel/S18.jpg b/cao_blogr/static/carousel/S18.jpg new file mode 100644 index 0000000..c94194f Binary files /dev/null and b/cao_blogr/static/carousel/S18.jpg differ diff --git a/cao_blogr/static/carousel/S21.JPG b/cao_blogr/static/carousel/S21.JPG new file mode 100644 index 0000000..48b92d6 Binary files /dev/null and b/cao_blogr/static/carousel/S21.JPG differ diff --git a/cao_blogr/static/carousel/S25.jpg b/cao_blogr/static/carousel/S25.jpg new file mode 100644 index 0000000..dae1038 Binary files /dev/null and b/cao_blogr/static/carousel/S25.jpg differ diff --git a/cao_blogr/static/logo-httk.jpg b/cao_blogr/static/logo-httk.jpg new file mode 100644 index 0000000..baa010c Binary files /dev/null and b/cao_blogr/static/logo-httk.jpg differ diff --git a/cao_blogr/static/logo-msp.jpg b/cao_blogr/static/logo-msp.jpg new file mode 100644 index 0000000..a12d3bd Binary files /dev/null and b/cao_blogr/static/logo-msp.jpg differ diff --git a/cao_blogr/static/theme.css b/cao_blogr/static/theme.css index e9a3590..b7b65b2 100644 --- a/cao_blogr/static/theme.css +++ b/cao_blogr/static/theme.css @@ -2,8 +2,8 @@ /* https://www.w3schools.com/bootstrap/bootstrap_theme_band.asp */ body { - font: 400 19px/1.8 Georgia, serif; - color: #777; + font: 400 15px/1.8 Lato, sans-serif; + color: #666; } h3, h4 { margin: 10px 0 30px 0; @@ -12,7 +12,7 @@ h3, h4 { color: #111; } .container { - padding: 80px 120px; + padding: 60px 80px; } .person { border: 10px solid transparent; @@ -24,9 +24,10 @@ h3, h4 { .person:hover { border-color: #f1f1f1; } +.carousel { + margin-top: 5em; +} .carousel-inner img { - -webkit-filter: grayscale(90%); - filter: grayscale(90%); /* make all photos black and white */ width: 100%; /* Set width to 100% */ margin: auto; } @@ -82,21 +83,32 @@ h3, h4 { } .navbar { font-family: Montserrat, sans-serif; - margin-bottom: 0; - background-color: #bc2131; - border: 0; + color: #000000 !important; + background-color: #FBFBFB; + border-bottom: 1px solid black; + border-radius: 0; font-size: 14px !important; letter-spacing: 4px; + min-height: 82px; opacity: 0.9; } +.navbar-brand { + transform: translateX(-50%); + left: 50%; + position: absolute; + height: 50px; + padding: 0px; + font-size: 18px; + line-height: 20px; +} .navbar li a, .navbar .navbar-brand { - color: #ffffff !important; + color: #000000 !important; } .navbar-nav li a:hover { - color: #fff !important; + color: #f4511e !important; } .navbar-nav li.active a { - color: #fff !important; + color: #000 !important; background-color: #29292c !important; } .navbar-default .navbar-toggle { @@ -113,7 +125,7 @@ h3, h4 { background-color: red !important; } footer { - background-color: #bc2131; + background-color: #2d2d30; color: #f5f5f5; padding: 32px; } diff --git a/cao_blogr/templates/home.jinja2 b/cao_blogr/templates/home.jinja2 index c4e5797..7c625ea 100644 --- a/cao_blogr/templates/home.jinja2 +++ b/cao_blogr/templates/home.jinja2 @@ -1,5 +1,68 @@ {% extends "layout.jinja2" %} +{% block carousel %} + +
+{% endblock %} + {% block content %} {% if request.authenticated_userid %} diff --git a/cao_blogr/templates/layout.jinja2 b/cao_blogr/templates/layout.jinja2 index c8fdf7e..a2c26e5 100644 --- a/cao_blogr/templates/layout.jinja2 +++ b/cao_blogr/templates/layout.jinja2 @@ -10,8 +10,7 @@
+