summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkshen2018-06-05 15:01:17 +0530
committerGitHub2018-06-05 15:01:17 +0530
commit034d4d26dbf9f1a0407ca4e0fadf2fbcf5ac6624 (patch)
treeb04f856b27234727519ca31ecc6b126104111aa6
parent324f7708e58d0cf703022f396db5b0d53d6ac1ac (diff)
parent12db60f73acfb5f8bc3d33a21f03d6e46997ad94 (diff)
downloadworkshop_booking-034d4d26dbf9f1a0407ca4e0fadf2fbcf5ac6624.tar.gz
workshop_booking-034d4d26dbf9f1a0407ca4e0fadf2fbcf5ac6624.tar.bz2
workshop_booking-034d4d26dbf9f1a0407ca4e0fadf2fbcf5ac6624.zip
Merge pull request #60 from Akshen/develop
Fix Navbar Responsivness in landing page
Diffstat
-rw-r--r--workshop_app/static/workshop_app/css/index.css41
-rw-r--r--workshop_app/static/workshop_app/css/sticky-footer.css1
-rw-r--r--workshop_app/templates/workshop_app/index.html28
-rw-r--r--workshop_app/templates/workshop_app/self_workshop.html2
-rw-r--r--workshop_app/templates/workshop_app/view_faq.html6
5 files changed, 18 insertions, 60 deletions
diff --git a/workshop_app/static/workshop_app/css/index.css b/workshop_app/static/workshop_app/css/index.css
index 903bbb9..423f59c 100644
--- a/workshop_app/static/workshop_app/css/index.css
+++ b/workshop_app/static/workshop_app/css/index.css
@@ -1,44 +1,3 @@
-/* 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 {
- width: 100%;
- padding: 0;
-
- },
-
-}
-
-ul.topnav {
- list-style-type: none;
- margin: 2px;
- padding: 0;
- overflow: hidden;
-
-}
-
-ul.topnav li {float: right;}
-
-ul.topnav li a {
- display: block;
- color: white;
- font-family: "Helvatica", arial, sans-serif;
- text-align: center;
- padding: 10px 16px;
- text-decoration: none;
-}
-
-ul.topnav li a:hover:not(.active) {
- 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 {float: none;}
-}
/**/
.coverbox {
diff --git a/workshop_app/static/workshop_app/css/sticky-footer.css b/workshop_app/static/workshop_app/css/sticky-footer.css
index 3db4f72..09754ae 100644
--- a/workshop_app/static/workshop_app/css/sticky-footer.css
+++ b/workshop_app/static/workshop_app/css/sticky-footer.css
@@ -31,6 +31,7 @@
background-color: #2c5aa0;
}
+
.navbar-custom .navbar-brand:hover{
color: white;
}
diff --git a/workshop_app/templates/workshop_app/index.html b/workshop_app/templates/workshop_app/index.html
index dd7a7b4..ad7bc1a 100644
--- a/workshop_app/templates/workshop_app/index.html
+++ b/workshop_app/templates/workshop_app/index.html
@@ -14,6 +14,7 @@
<!-- Custom CSS -->
<link rel="stylesheet" href="{{ URL_ROOT }}/static/workshop_app/css/index.css" type="text/css" />
+ <link rel="stylesheet" href="{{ URL_ROOT }}/static/workshop_app/css/sticky-footer.css" type="text/css" />
<link rel="stylesheet" href="{{ URL_ROOT }}/static/workshop_app/css/slick.css" type="text/css" />
<link rel="stylesheet" href="{{ URL_ROOT }}/static/workshop_app/css/slick-theme.css" type="text/css" />
@@ -59,20 +60,17 @@ $(document).ready(function(){
</head>
<body >
-<div class="row" id="r1">
- <div class="col-md-6" id="r1_c1">
- FOSSEE Python Workshops
- </div>
- <div class="col-md-6" >
- <ul class="topnav">
- <li><a href="{{URL_ROOT}}/statistics/public_stats/">Stats</a></li>
- <li ><a href="https://python.fossee.in/about" target="_blank">About Us</a></li>
- <li><a href="{{URL_ROOT}}/how_to_participate">How to Participate</a></li>
- <li><a href="{{URL_ROOT}}/login">Login</a></li>
- <li><a href="{{URL_ROOT}}/register"> Register</a></li>
+ <nav class="navbar navbar-expand-sm navbar-custom">
+ <a class="navbar-brand">FOSSEE Python Workshops</a>
+ <ul class=" nav navbar-nav ml-auto">
+ <li class="nav-link"><a href="{{URL_ROOT}}/register"> Register</a></li>
+ <li class="nav-link"><a href="{{URL_ROOT}}/login">Login</a></li>
+ <li class="nav-link"><a href="{{URL_ROOT}}/how_to_participate">How to Participate</a></li>
+ <li class="nav-link"><a href="https://python.fossee.in/about" target="_blank">About Us</a></li>
+ <li class="nav-link"><a href="{{URL_ROOT}}/statistics/public_stats/">Stats</a></li>
</ul>
- </div>
-</div>
+ </nav>
+
<div class="coverbox">
<div class="row" id="r2">
<div class="col-md-6 rslides" id="r2_c1">
@@ -103,11 +101,11 @@ $(document).ready(function(){
<div class="row slick_carousal" id="r4" style="width:95%;">
<div class="col-4">
<br>
- <a href="{{URL_ROOT}}/view_workshoptype_details/4"><img src="{{ URL_ROOT}}/static/workshop_app/img/Crs_1.png"></a>
+ <a href="{{URL_ROOT}}/view_workshoptype_details/1"><img src="{{ URL_ROOT}}/static/workshop_app/img/Crs_1.png"></a>
</div>
<div class="col-4">
<br>
- <a href="{{URL_ROOT}}/view_workshoptype_details/5"><img src="{{ URL_ROOT}}/static/workshop_app/img/Crs_2.png"></a>
+ <a href="{{URL_ROOT}}/view_workshoptype_details/2"><img src="{{ URL_ROOT}}/static/workshop_app/img/Crs_2.png"></a>
</div>
<div class="col-4">
<br>
diff --git a/workshop_app/templates/workshop_app/self_workshop.html b/workshop_app/templates/workshop_app/self_workshop.html
index b914145..5d8f4e6 100644
--- a/workshop_app/templates/workshop_app/self_workshop.html
+++ b/workshop_app/templates/workshop_app/self_workshop.html
@@ -56,7 +56,7 @@
<h2>Course Instructions:</h2>
<ul>
<li class='ans'>
- Register on <a href="http://yaksh.fossee.in" target="_blank">Yaksh</a> and enroll for the course <strong>Basic Programming using Python('month') by Arun KP</strong>
+ Register on <a href="http://yaksh.fossee.in" target="_blank">Yaksh</a> and enroll for the course <strong>Basic Programming using Python('duration') by FOSSEE IIT Bombay </strong>
</li>
<li class='ans'>
diff --git a/workshop_app/templates/workshop_app/view_faq.html b/workshop_app/templates/workshop_app/view_faq.html
index 1eb801e..1822dc3 100644
--- a/workshop_app/templates/workshop_app/view_faq.html
+++ b/workshop_app/templates/workshop_app/view_faq.html
@@ -85,12 +85,12 @@
<ul class='num'>
<h4> How will the workshop be conducted?</h4>
<li class='ans'>
- It will be a hands-on workshop with remote assistance by a FOSSEE instructor at IIT Bombay.
+ It will be a hands-on workshop with remote assistance by a FOSSEE instructor from IIT Bombay.
</li>
</ul>
<ul class='num'>
- <h4> Could we have the instructor at our institute for the workshop?</h4>
+ <h4> Can we have the instructor at our institute for the workshop?</h4>
<li class='ans'>
Unfortunately, we will not be able to send our instructor(s) to your institute.
</li>
@@ -120,7 +120,7 @@
<ul class='num'>
<h4> What are the equipments required for conducting this workshop?</h4>
<li class='ans'>
- A room with projector, speaker, microphone, laptops/desktops for every participant, high-speed internet and one laptop with a webcam.
+ A room with projector, speaker, microphone, laptops/desktops for every participant, high-speed internet and one laptop/desktop with a webcam.
</li>
</ul>
generated by cgit (git 2.34.1) at 2024-12-20 14:48:08 +0000