Merge pull request #5 from IEEEDTU/master

ii
IEEEDTU · Sep 1, 2017 · 2f7f78c · 2f7f78c
2 parents c80c3a4 + 0286bfa
commit 2f7f78c
Show file tree

Hide file tree

Showing 60 changed files with 758 additions and 33 deletions.
diff --git a/ieeedtu-website b/ieeedtu-website
diff --git a/...iler_public/79/92/7992b58b-feca-4144-9c1e-5bb69afa2ffd/fb_img_1501582829654.jpg b/...iler_public/79/92/7992b58b-feca-4144-9c1e-5bb69afa2ffd/fb_img_1501582829654.jpg
diff --git a/...ublic/d2/d7/d2d7f10a-68b1-444b-b4c8-f20c653d530c/screenshot_20170801-160619.png b/...ublic/d2/d7/d2d7f10a-68b1-444b-b4c8-f20c653d530c/screenshot_20170801-160619.png
diff --git a/...8299456_2717900115996914631_n.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...8299456_2717900115996914631_n.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...9-94cb-ecf99ba8dd94/himku_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...9-94cb-ecf99ba8dd94/himku_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...b188-be5421930b2a/chandan_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...b188-be5421930b2a/chandan_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...b188-be5421930b2a/chandan_sir.jpg__1573x1573_q85_crop_subsampling-2_upscale.jpg b/...b188-be5421930b2a/chandan_sir.jpg__1573x1573_q85_crop_subsampling-2_upscale.jpg
diff --git a/...-b020-65bab7b875b8/raunak_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...-b020-65bab7b875b8/raunak_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...9-b3eb-a88eb1ad61c9/feroz_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...9-b3eb-a88eb1ad61c9/feroz_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...8344942_3671984353793419446_n.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...8344942_3671984353793419446_n.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...1656135_4146942938461988514_n.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...1656135_4146942938461988514_n.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...0476828_6625234162965061386_n.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...0476828_6625234162965061386_n.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...9afa2ffd/fb_img_1501582829654.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...9afa2ffd/fb_img_1501582829654.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...5bb69afa2ffd/fb_img_1501582829654.jpg__16x16_q85_crop_subsampling-2_upscale.jpg b/...5bb69afa2ffd/fb_img_1501582829654.jpg__16x16_q85_crop_subsampling-2_upscale.jpg
diff --git a/...b69afa2ffd/fb_img_1501582829654.jpg__180x180_q85_crop_subsampling-2_upscale.jpg b/...b69afa2ffd/fb_img_1501582829654.jpg__180x180_q85_crop_subsampling-2_upscale.jpg
diff --git a/...5bb69afa2ffd/fb_img_1501582829654.jpg__32x32_q85_crop_subsampling-2_upscale.jpg b/...5bb69afa2ffd/fb_img_1501582829654.jpg__32x32_q85_crop_subsampling-2_upscale.jpg
diff --git a/...5bb69afa2ffd/fb_img_1501582829654.jpg__40x40_q85_crop_subsampling-2_upscale.jpg b/...5bb69afa2ffd/fb_img_1501582829654.jpg__40x40_q85_crop_subsampling-2_upscale.jpg
diff --git a/...5bb69afa2ffd/fb_img_1501582829654.jpg__48x48_q85_crop_subsampling-2_upscale.jpg b/...5bb69afa2ffd/fb_img_1501582829654.jpg__48x48_q85_crop_subsampling-2_upscale.jpg
diff --git a/...5bb69afa2ffd/fb_img_1501582829654.jpg__64x64_q85_crop_subsampling-2_upscale.jpg b/...5bb69afa2ffd/fb_img_1501582829654.jpg__64x64_q85_crop_subsampling-2_upscale.jpg
diff --git a/...-a340-f750b652017c/sourav_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...-a340-f750b652017c/sourav_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...fe-5be4087c1a6b/chaitanya_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...fe-5be4087c1a6b/chaitanya_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...279448_829025747613121586_n_1.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...279448_829025747613121586_n_1.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...c2-9021-8dc79fd1f166/rashi_di.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...c2-9021-8dc79fd1f166/rashi_di.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...9241-0d21a9378f8d/nimisha_mam.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...9241-0d21a9378f8d/nimisha_mam.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...a-b0de-2bca66ad9faf/aryan_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...a-b0de-2bca66ad9faf/aryan_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...2667548_6819488442346041705_n.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...2667548_6819488442346041705_n.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...c-b8c4-a78d7ec661fe/yaman_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...c-b8c4-a78d7ec661fe/yaman_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...0c/screenshot_20170801-160619.png__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...0c/screenshot_20170801-160619.png__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...3d530c/screenshot_20170801-160619.png__16x16_q85_crop_subsampling-2_upscale.jpg b/...3d530c/screenshot_20170801-160619.png__16x16_q85_crop_subsampling-2_upscale.jpg
diff --git a/...530c/screenshot_20170801-160619.png__180x180_q85_crop_subsampling-2_upscale.jpg b/...530c/screenshot_20170801-160619.png__180x180_q85_crop_subsampling-2_upscale.jpg
diff --git a/...3d530c/screenshot_20170801-160619.png__32x32_q85_crop_subsampling-2_upscale.jpg b/...3d530c/screenshot_20170801-160619.png__32x32_q85_crop_subsampling-2_upscale.jpg
diff --git a/...3d530c/screenshot_20170801-160619.png__40x40_q85_crop_subsampling-2_upscale.jpg b/...3d530c/screenshot_20170801-160619.png__40x40_q85_crop_subsampling-2_upscale.jpg
diff --git a/...3d530c/screenshot_20170801-160619.png__48x48_q85_crop_subsampling-2_upscale.jpg b/...3d530c/screenshot_20170801-160619.png__48x48_q85_crop_subsampling-2_upscale.jpg
diff --git a/...3d530c/screenshot_20170801-160619.png__64x64_q85_crop_subsampling-2_upscale.jpg b/...3d530c/screenshot_20170801-160619.png__64x64_q85_crop_subsampling-2_upscale.jpg
diff --git a/...8672-96531db67e04/kritika_mam.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...8672-96531db67e04/kritika_mam.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...-a4c5-aa6e827576e8/kartik_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...-a4c5-aa6e827576e8/kartik_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...-9892-34fc067c5c89/sirish_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...-9892-34fc067c5c89/sirish_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/..._233756786969842_1223825893_n.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/..._233756786969842_1223825893_n.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...4602728_1636224039694781045_n.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...4602728_1636224039694781045_n.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/...86d1-6744e374a59e/aikansh_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg b/...86d1-6744e374a59e/aikansh_sir.jpg__1170x1170_q85_crop_subsampling-2_upscale.jpg
diff --git a/mysite/settings.py b/mysite/settings.py
@@ -28,7 +28,7 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['7bcf37c4.ngrok.io', '127.0.0.1']
 
 
 # Application definition

diff --git a/mysite/static/css/bootstrap.min.css b/mysite/static/css/bootstrap.min.css
diff --git a/mysite/static/css/font-awesome.min.css b/mysite/static/css/font-awesome.min.css
diff --git a/mysite/static/css/style.css b/mysite/static/css/style.css
@@ -8,28 +8,55 @@ h1, h2, h3, h4, h5, h6 {
     color:black;
 }
 .navbar-default .navbar-brand {
-    color: #2095F3;
+    color: white;
+    font-weight: bold;
+}
+
+.navbar-default .navbar-brand:hover {
+    color: #2196F3;
 }
+
 .navbar-default .navbar-nav>li>a {
      color: white;
 }
+
+.navbar-default .navbar-nav>li>a:hover {
+    color: #2196F3;
+}
+
 .navbar {
     margin-bottom: 0px;
     background-color: black;
     box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12);
     -webkit-box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12);
 }
 
-.navbar .nav .active {
-    border-bottom: 5px solid rgba(25,118,210,0.8);
-    color:#2196f3;
+.navbar .nav .active a {
+    border-bottom: 5px solid #2196F3;
+    background-color: black;
+    color: #2196F3;
+    font-weight: bold;
 }
 
-.navbar .nav .active a {
-    /* background-color: white; */
-    color: black;
+.navbar .nav .active a:hover {
+    border-bottom: 5px solid #2196F3;
+    background-color: black;
+    color: #2196F3;
+    font-weight: bold;
+}
+
+.navbar-header .navbar-toggle {
+    border-color: #1976D2;
+    color: white;
+    background-color: #1976D2;
 }
 
+.navbar-header .navbar-toggle .icon-bar{
+    background-color: white;
+}
+
+
+
 .panel-default > .panel-heading {
     background-color: white;
 }
@@ -58,20 +85,44 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 footer {
-    background-color: #EEEEEE;
-    color: #141313;
+    background-color: #263238;
+    color: white;
+}
+
+footer a, footer h5 {
+    color: white;
+}
+
+footer a:hover {
+    text-decoration: none;
+}
+
+footer .round-icon {
+    display: inline-block;
 }
 
-footer a {
-    color: #1976D2;
+footer .round-icon .fa {
+    background-color: white;
+    border-radius: 100%;
+    box-shadow: 0px 0px 4px 2px rgba(0 , 0, 0, 0.5);
+    display: table-cell;
+    font-size: x-large;
+    height: 36px;
+    text-align: center;
+    vertical-align: middle;
+    width: 36px;
 }
 
-footer a .fa {
-    font-size: xx-large;
+.fa {
+
+    text-align: center;
+    vertical-align: middle;
+
 }
 
+
 .dark-footer {
-    background-color: black;
+    background-color: #1976D2;
     color: white;
     padding: 8px;
 }
@@ -89,3 +140,19 @@ header h1 {
 .con {
     padding-top: 20px;
 }
+
+.vcenter {
+    display: table;
+}
+
+.vcenter div {
+    display: table-cell;
+    vertical-align: middle;
+    float: none;
+}
+
+.count
+{
+  color:blue;
+
+}
diff --git a/mysite/static/favicon/android-chrome-192x192.png b/mysite/static/favicon/android-chrome-192x192.png
diff --git a/mysite/static/favicon/android-chrome-512x512.png b/mysite/static/favicon/android-chrome-512x512.png
diff --git a/mysite/static/favicon/apple-touch-icon.png b/mysite/static/favicon/apple-touch-icon.png
diff --git a/mysite/static/favicon/browserconfig.xml b/mysite/static/favicon/browserconfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="favicon/mstile-150x150.png"/>
+            <TileColor>#2d89ef</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/mysite/static/favicon/favicon-16x16.png b/mysite/static/favicon/favicon-16x16.png
diff --git a/mysite/static/favicon/favicon-32x32.png b/mysite/static/favicon/favicon-32x32.png
diff --git a/mysite/static/favicon/favicon.ico b/mysite/static/favicon/favicon.ico
diff --git a/mysite/static/favicon/manifest.json b/mysite/static/favicon/manifest.json
@@ -0,0 +1,18 @@
+{
+    "name": "IEEE DTU",
+    "icons": [
+        {
+            "src": "favicon/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "favicon/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#000000",
+    "background_color": "#000000",
+    "display": "standalone"
+}
diff --git a/mysite/static/favicon/mstile-150x150.png b/mysite/static/favicon/mstile-150x150.png
diff --git a/mysite/static/favicon/safari-pinned-tab.svg b/mysite/static/favicon/safari-pinned-tab.svg
diff --git a/mysite/static/js/app.js b/mysite/static/js/app.js
@@ -6,4 +6,20 @@ $(document).ready(function() {
     $(".hover-reveal").mouseleave(function () {
         $(this).find(".panel-body").slideToggle(200);
     });
+});
+
+$(function() {
+	$('.row .panel').matchHeight();
+});
+
+$('.count').each(function () {
+    $(this).prop('Counter',0).animate({
+        Counter: $(this).text()
+    }, {
+        duration: 10000,
+        easing: 'swing',
+        step: function (now) {
+            $(this).text(Math.ceil(now));
+        }
+    });
 });
diff --git a/mysite/static/js/bootstrap.min.js b/mysite/static/js/bootstrap.min.js