summaryrefslogtreecommitdiff
path: root/workshop_app
diff options
context:
space:
mode:
authorMahesh Gudi2017-08-08 16:30:35 +0530
committerGitHub2017-08-08 16:30:35 +0530
commitf4c8daa3fd37f36f98466a75b37b30cf79389726 (patch)
tree21abc7dcb7469062ac6edbe907c648339ed98e75 /workshop_app
parentaa6455b7b0296346976d252d4c551373a611b3d1 (diff)
parenta9c70c4f2f7f05b4dfb8a08b049d09fe2678d186 (diff)
downloadworkshop_booking-f4c8daa3fd37f36f98466a75b37b30cf79389726.tar.gz
workshop_booking-f4c8daa3fd37f36f98466a75b37b30cf79389726.tar.bz2
workshop_booking-f4c8daa3fd37f36f98466a75b37b30cf79389726.zip
Merge pull request #17 from Akshen/testing
Adds Social Media Links
Diffstat (limited to 'workshop_app')
-rw-r--r--workshop_app/static/workshop_app/css/faq.css4
-rw-r--r--workshop_app/static/workshop_app/css/index.css34
-rw-r--r--workshop_app/static/workshop_app/img/sides_img_1.pngbin0 -> 351481 bytes
-rw-r--r--workshop_app/static/workshop_app/img/sides_img_2.pngbin0 -> 326025 bytes
-rw-r--r--workshop_app/templates/workshop_app/index.html12
-rw-r--r--workshop_app/templates/workshop_app/testimonals.html8
6 files changed, 52 insertions, 6 deletions
diff --git a/workshop_app/static/workshop_app/css/faq.css b/workshop_app/static/workshop_app/css/faq.css
index ac010b9..d391d3a 100644
--- a/workshop_app/static/workshop_app/css/faq.css
+++ b/workshop_app/static/workshop_app/css/faq.css
@@ -3,6 +3,4 @@
font-family: 'Antic Slab';
font-size: 22px;
border-bottom: 1.5px solid #BDBDBD;
-}
-
-
+} \ No newline at end of file
diff --git a/workshop_app/static/workshop_app/css/index.css b/workshop_app/static/workshop_app/css/index.css
index 9590473..a086726 100644
--- a/workshop_app/static/workshop_app/css/index.css
+++ b/workshop_app/static/workshop_app/css/index.css
@@ -78,6 +78,40 @@ label {
color: #6D5847;
}
+/* Style all font awesome icons */
+.fa {
+ padding: 6px;
+ font-size: 30px;
+ width: 30px;
+ text-align: center;
+ text-decoration: none;
+}
+
+/* Add a hover effect if you want */
+.fa:hover {
+ opacity: 0.7;
+}
+
+/* Facebook */
+.fa-facebook {
+ background: #3B5998;
+ color: white;
+}
+/* Google */
+.fa-google {
+ background: #dd4b39;
+ color: white;
+}
+/* Youtube */
+.fa-youtube {
+ background: #bb0000;
+ color: white;
+}
+
+#social a{
+ color: white;
+}
+
/* Footer */
.footer {
position: relative;
diff --git a/workshop_app/static/workshop_app/img/sides_img_1.png b/workshop_app/static/workshop_app/img/sides_img_1.png
new file mode 100644
index 0000000..3a66e95
--- /dev/null
+++ b/workshop_app/static/workshop_app/img/sides_img_1.png
Binary files differ
diff --git a/workshop_app/static/workshop_app/img/sides_img_2.png b/workshop_app/static/workshop_app/img/sides_img_2.png
new file mode 100644
index 0000000..71ce494
--- /dev/null
+++ b/workshop_app/static/workshop_app/img/sides_img_2.png
Binary files differ
diff --git a/workshop_app/templates/workshop_app/index.html b/workshop_app/templates/workshop_app/index.html
index 718f9ba..ec2f4eb 100644
--- a/workshop_app/templates/workshop_app/index.html
+++ b/workshop_app/templates/workshop_app/index.html
@@ -17,6 +17,10 @@
<!-- Custom CSS -->
<link rel="stylesheet" href="{{ URL_ROOT }}/static/workshop_app/css/index.css" type="text/css" />
+ <!-- Add icon library -->
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+
+
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
@@ -119,8 +123,12 @@
<div class="col-md-4">
<h3>Contact Us</h3>
FOSSEE, IIT-Bombay<br>
- Mumbai, India <br> <br>
-
+ Mumbai, India <br>
+ <div id="social">
+ <a href="https://www.facebook.com/FOSSEENMEICT/" target="_blank" class="fa fa-facebook"></a> &nbsp;
+ <a href="https://plus.google.com/u/0/104012350840765676803" target="_blank" class="fa fa-google"></a> &nbsp;
+ <a href="https://www.youtube.com/channel/UCMtt6exSCmZI7JU73S6Wz_A" target="_blank" class="fa fa-youtube"></a> <br>
+ </div>
Phone: (+91) 22 2576 4133<br>
Email: workshops[at]fossee[dot]in
</div>
diff --git a/workshop_app/templates/workshop_app/testimonals.html b/workshop_app/templates/workshop_app/testimonals.html
index e4b7d24..1086775 100644
--- a/workshop_app/templates/workshop_app/testimonals.html
+++ b/workshop_app/templates/workshop_app/testimonals.html
@@ -26,7 +26,10 @@
<div class="container content">
<div class="row">
- <div class="col-md-6 col-md-offset-3">
+ <div class="col-md-1">
+ <img src="{{ URL_ROOT}}/static/workshop_app/img/sides_img_2.png">
+ </div>
+ <div class="col-md-6 col-md-offset-2">
<div class="testimonials">
{% for m in messages %}
<div class="active item">
@@ -41,6 +44,9 @@
{% endfor %}
</div>
</div>
+ <div class="col-md-1">
+ <img src="{{ URL_ROOT}}/static/workshop_app/img/sides_img_1.png">
+ </div>
</div>
</div>