From 1ade33e8516f9e3544b33e6c13db8528b4e9d386 Mon Sep 17 00:00:00 2001 From: Akshen Date: Mon, 28 May 2018 14:43:17 +0530 Subject: Change UI in Navbar - Adds dropdown for instructor | Statistics - Adds dropdown for coordinator | Workshops - fixed navbar throughtout the website --- workshop_app/static/workshop_app/css/index.css | 64 ++++++++++--------- .../static/workshop_app/css/slick-theme.css | 6 +- .../static/workshop_app/css/sticky-footer.css | 2 +- workshop_app/templates/workshop_app/booking.html | 36 ++++++----- .../templates/workshop_app/create_workshop.html | 22 ++++--- .../templates/workshop_app/edit_profile.html | 51 ++++++++++------ .../templates/workshop_app/how_to_participate.html | 65 +++++++++++++++----- workshop_app/templates/workshop_app/index.html | 26 ++++---- workshop_app/templates/workshop_app/login.html | 9 ++- workshop_app/templates/workshop_app/logout.html | 9 ++- workshop_app/templates/workshop_app/manage.html | 34 +++++++---- .../templates/workshop_app/my_workshops.html | 71 +++++++++++++--------- .../templates/workshop_app/profile_updated.html | 52 ++++++++++------ .../templates/workshop_app/propose_workshop.html | 24 +++++--- .../workshop_app/registration/register.html | 13 ++-- .../templates/workshop_app/self_workshop.html | 13 +++- workshop_app/templates/workshop_app/view_faq.html | 37 ++++++----- .../templates/workshop_app/view_profile.html | 56 +++++++++++------ .../workshop_app/view_workshoptype_details.html | 57 +++++++++-------- .../workshop_app/view_workshoptype_list.html | 48 ++++++++------- 20 files changed, 436 insertions(+), 259 deletions(-) (limited to 'workshop_app') diff --git a/workshop_app/static/workshop_app/css/index.css b/workshop_app/static/workshop_app/css/index.css index abace10..903bbb9 100644 --- a/workshop_app/static/workshop_app/css/index.css +++ b/workshop_app/static/workshop_app/css/index.css @@ -1,16 +1,16 @@ /* Responsive layout - when the screen is less than 800px wide, make the two columns stack on top of each other instead of next to each other */ @media screen and (max-width: 800px) { - .leftcolumn, .rightcolumn { + .leftcolumn, .rightcolumn { width: 100%; padding: 0; }, - + } ul.topnav { list-style-type: none; - margin: 10px; + margin: 2px; padding: 0; overflow: hidden; @@ -20,31 +20,30 @@ ul.topnav li {float: right;} ul.topnav li a { display: block; - color: black; + color: white; font-family: "Helvatica", arial, sans-serif; text-align: center; - padding: 14px 16px; + padding: 10px 16px; text-decoration: none; } ul.topnav li a:hover:not(.active) { - background-color: #3bb1d1; - color:white; - padding: 14px 16px; + background-color: white; + color: black; + padding: 10px 16px; } ul.topnav li.right {float: right;} @media screen and (max-width: 600px){ - ul.topnav li.right, + ul.topnav li.right, ul.topnav li {float: none;} } /**/ -.container { - width: 100%; - box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); - align-content: center; +.coverbox { + width: 90%; + margin: auto; } .row { @@ -60,17 +59,23 @@ ul.topnav li.right {float: right;} } +#r1 { + background: linear-gradient(135deg , #2c5aa0,#2c5aa0 30%, #3bb1d1 ); + height: 60px; + margin: 1px; + font-family: Sans-serif, "Arial"; +} #r1_c1 { - font-size: 27px; - background: url("../img/hd_bg.png") no-repeat left top; - padding-bottom: 35px; + font-size: 18px; + padding-top: 14px; text-align: middle; - padding-top: 25px; - font-family: aaragh; + color:white; } + + .rslides { position: relative; list-style: none; @@ -101,6 +106,10 @@ ul.topnav li.right {float: right;} width: 100%; } +#r2 { + padding-top: 10px; +} + #r2_c1 { margin: auto; width: 100%; @@ -116,11 +125,10 @@ ul.topnav li.right {float: right;} color: white; background: linear-gradient(135deg , #2c5aa0,#2c5aa0 30%, #3bb1d1 ); padding-bottom: 25px; - margin-top: 15px; + margin-top: 15px; } - #r5 { width: 100%; } @@ -128,14 +136,14 @@ ul.topnav li.right {float: right;} #r5_c1 { text-align: center; font-size: 2vw; - font-family: aaragh; + font-family: aaragh; margin-top: 10px; } #r5_c2 { - font-family: aaragh; - + font-family: aaragh; + } #r5_c3 { @@ -147,12 +155,13 @@ ul.topnav li.right {float: right;} margin-top: 15px; width: 100%; background: linear-gradient(135deg , #2c5aa0,#2c5aa0 30%, #3bb1d1 ); - + align-items: center; + } #r6_c2 { text-align: center; - font-family: aaragh; + font-family: aaragh; color: white; } @@ -162,7 +171,6 @@ ul.topnav li.right {float: right;} overflow: hidden; padding: 0; margin: 0; - width: 10px; } .tslides li { @@ -217,9 +225,8 @@ ul.topnav li.right {float: right;} #r8_c2 { font-size: 16px; - text-align: center; - + } #social { @@ -229,7 +236,6 @@ ul.topnav li.right {float: right;} #r8_c4 { text-align: center; font-size: 12px; - width: 100%; } diff --git a/workshop_app/static/workshop_app/css/slick-theme.css b/workshop_app/static/workshop_app/css/slick-theme.css index 46c87bf..f084346 100644 --- a/workshop_app/static/workshop_app/css/slick-theme.css +++ b/workshop_app/static/workshop_app/css/slick-theme.css @@ -26,7 +26,7 @@ top: 50%; display: block; - + border-radius:3; width: 30px; height: 35px; padding: 0; @@ -67,9 +67,9 @@ font-family: 'slick'; font-size: 40px; line-height: 1; - + border-radius:3; opacity: 3; - color: ; + color:black; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; diff --git a/workshop_app/static/workshop_app/css/sticky-footer.css b/workshop_app/static/workshop_app/css/sticky-footer.css index c0a38e8..f04b48f 100644 --- a/workshop_app/static/workshop_app/css/sticky-footer.css +++ b/workshop_app/static/workshop_app/css/sticky-footer.css @@ -48,4 +48,4 @@ left: 0; background-color: #efefef; text-align: center; -} \ No newline at end of file +} diff --git a/workshop_app/templates/workshop_app/booking.html b/workshop_app/templates/workshop_app/booking.html index 1937734..bb372a4 100644 --- a/workshop_app/templates/workshop_app/booking.html +++ b/workshop_app/templates/workshop_app/booking.html @@ -1,7 +1,7 @@ {% extends 'workshop_app/base.html' %} {% block title %} - Booking + Book a Workshop {% endblock %} @@ -11,12 +11,12 @@ - + + {% endblock %} @@ -15,17 +16,24 @@