Merge pull request #1 from Sashi20/master

Added content for the website

21 files changed, 12 insertions, 9 deletions

diff --git a/static/website/bootstrap-css/assets/css/main.css b/static/website/bootstrap-css/assets/css/main.css
index 7c45bca..735cf8b 100644
--- a/static/website/bootstrap-css/assets/css/main.css
+++ b/static/website/bootstrap-css/assets/css/main.css
@@ -143,7 +143,7 @@ ul li {
   color: #313131;
   letter-spacing: 1px;
   margin: 0 0 20px;
-  text-transform: uppercase;
+  text-transform: none;
   text-align: center;
 }
 
@@ -250,7 +250,7 @@ ul li {
     color: #313131;
     letter-spacing: 1px;
     margin: 0 0 60px;
-    text-transform: uppercase;
+    text-transform: none;
     text-align: left;
   }
 }
@@ -419,7 +419,7 @@ ul li {
 .speaker {
   text-align: center;
   color: #313131;
-  text-transform: uppercase;
+  text-transform: none;
   margin: 25px 0;
 }
 .speaker .spkrmodal{
@@ -491,18 +491,21 @@ ul li {
 }
 .organiser .organiser-box {
   display: block;
-  opacity: 0.3;
-  height: 150px;
-  width: 150px;
+  opacity: 1;
+  height: 70px;
+  width: 200px;
   margin: 25px auto;
   -webkit-transition: 0.5s all linear;
           transition: 0.5s all linear;
 }
-.organiser .organiser-box:hover {
+/*.organiser .organiser-box:hover {
   opacity: 1;
-}
+}*/
 .organiser .organiser-box-1 {
-  background: url(../images/partner/fossee.png) no-repeat center center/contain;
+  background: url(../images/logo_4.png) no-repeat center center/contain;
+}
+.organiser .organiser-box-2 {
+  background: url(../images/logo_1.png) no-repeat center center/contain;
 }
 /*
 .sponsor .sponsor-box-2 {
diff --git a/static/website/bootstrap-css/assets/images/DWSIM_logo.png b/static/website/bootstrap-css/assets/images/DWSIM_logo.png
new file mode 100644
index 0000000..9dc26e2
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/DWSIM_logo.png
diff --git a/static/website/bootstrap-css/assets/images/backgrounds/top_1.png b/static/website/bootstrap-css/assets/images/backgrounds/top_1.png
new file mode 100644
index 0000000..338181b
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/backgrounds/top_1.png
diff --git a/static/website/bootstrap-css/assets/images/backgrounds/top_2.png b/static/website/bootstrap-css/assets/images/backgrounds/top_2.png
new file mode 100644
index 0000000..fab6a7d
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/backgrounds/top_2.png
diff --git a/static/website/bootstrap-css/assets/images/backgrounds/top_3.png b/static/website/bootstrap-css/assets/images/backgrounds/top_3.png
new file mode 100644
index 0000000..af4a737
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/backgrounds/top_3.png
diff --git a/static/website/bootstrap-css/assets/images/backgrounds/top_4.png b/static/website/bootstrap-css/assets/images/backgrounds/top_4.png
new file mode 100644
index 0000000..d01e35b
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/backgrounds/top_4.png
diff --git a/static/website/bootstrap-css/assets/images/backgrounds/top_5.png b/static/website/bootstrap-css/assets/images/backgrounds/top_5.png
new file mode 100644
index 0000000..bfebfd2
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/backgrounds/top_5.png
diff --git a/static/website/bootstrap-css/assets/images/img_1.png b/static/website/bootstrap-css/assets/images/img_1.png
new file mode 100644
index 0000000..4ead4cb
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/img_1.png
diff --git a/static/website/bootstrap-css/assets/images/img_2.png b/static/website/bootstrap-css/assets/images/img_2.png
new file mode 100644
index 0000000..1b25e07
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/img_2.png
diff --git a/static/website/bootstrap-css/assets/images/logo_1.png b/static/website/bootstrap-css/assets/images/logo_1.png
new file mode 100644
index 0000000..0941014
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/logo_1.png
diff --git a/static/website/bootstrap-css/assets/images/logo_2.png b/static/website/bootstrap-css/assets/images/logo_2.png
new file mode 100644
index 0000000..524b390
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/logo_2.png
diff --git a/static/website/bootstrap-css/assets/images/logo_3.png b/static/website/bootstrap-css/assets/images/logo_3.png
new file mode 100644
index 0000000..742f5cf
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/logo_3.png
diff --git a/static/website/bootstrap-css/assets/images/logo_4.png b/static/website/bootstrap-css/assets/images/logo_4.png
new file mode 100644
index 0000000..f3c760a
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/logo_4.png
diff --git a/static/website/bootstrap-css/assets/images/logo_5.png b/static/website/bootstrap-css/assets/images/logo_5.png
new file mode 100644
index 0000000..659f581
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/logo_5.png
diff --git a/static/website/bootstrap-css/assets/images/logo_6.png b/static/website/bootstrap-css/assets/images/logo_6.png
new file mode 100644
index 0000000..b7d6f26
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/logo_6.png
diff --git a/static/website/bootstrap-css/assets/images/mhrd.png b/static/website/bootstrap-css/assets/images/mhrd.png
new file mode 100644
index 0000000..c377a6d
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/mhrd.png
diff --git a/static/website/bootstrap-css/assets/images/om_logo.png b/static/website/bootstrap-css/assets/images/om_logo.png
new file mode 100644
index 0000000..742f5cf
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/om_logo.png
diff --git a/static/website/bootstrap-css/assets/images/ph_1.png b/static/website/bootstrap-css/assets/images/ph_1.png
new file mode 100644
index 0000000..c5d86bd
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/ph_1.png
diff --git a/static/website/bootstrap-css/assets/images/ph_2.png b/static/website/bootstrap-css/assets/images/ph_2.png
new file mode 100644
index 0000000..45faabd
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/ph_2.png
diff --git a/static/website/bootstrap-css/assets/images/ph_3.png b/static/website/bootstrap-css/assets/images/ph_3.png
new file mode 100644
index 0000000..0dd43f4
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/ph_3.png
diff --git a/static/website/bootstrap-css/assets/images/ph_4.png b/static/website/bootstrap-css/assets/images/ph_4.png
new file mode 100644
index 0000000..10ccbfc
--- /dev/null
+++ b/static/website/bootstrap-css/assets/images/ph_4.png