Merge pull request #8 from Akshen/testing

Major Update

6 files changed, 91 insertions, 51 deletions

diff --git a/workshop_app/static/workshop_app/css/faq.css b/workshop_app/static/workshop_app/css/faq.css
index 98b4f5c..ac010b9 100644
--- a/workshop_app/static/workshop_app/css/faq.css
+++ b/workshop_app/static/workshop_app/css/faq.css
@@ -2,4 +2,7 @@
 	list-style-type: square;
 	font-family: 'Antic Slab';
 	font-size: 22px;
+	border-bottom: 1.5px solid #BDBDBD;
 }
+
+
diff --git a/workshop_app/static/workshop_app/css/index.css b/workshop_app/static/workshop_app/css/index.css
index 1087d24..9590473 100644
--- a/workshop_app/static/workshop_app/css/index.css
+++ b/workshop_app/static/workshop_app/css/index.css
@@ -3,92 +3,79 @@ body {
   background-color: grey;
 }
 
+.container {
+  background-color: #C8C5B6;
+  width: 90%;
+}
+
 .fossee-label {
-  padding-top: 20%;
-  margin-left: 9%;
   color: #6D5847;
+  text-align: center;
   font-size: 400%;
-}
-
-.logo {
-    float: left;
-    margin-top: 9%;
-    margin-left: 15%;
+  margin-top: 12%;
 }
 
 .label-bar {
   color: #6D5847;
-  float: right;
   margin-top: 9%;
   font-size: 120%;
-  margin-right: 3%;
+  background-color: white;
+  text-align:right;
+
 }
 
+.label-bar a {
+  color: #6D5847;
+}
 
 .login {
-    margin-left: auto;
-    margin-right: 1%;
-    width: 40%;
-    height: 90%;
-    background: white;
+
+}
+
+#first-right {
+  background-color: white;
+  width:90%;
+  margin: auto;
+  padding: 5%;
+  text-align: center;
 }
 
 #rectbox {
-    border-radius: 9%;
+    border-radius: 15px 15px 15px 15px;
     background: #6D5847;
-    padding: 3%; 
-    margin-left: 10%;
+    margin-left: 15%;
     margin-top: 3%;
     width: 75%;
-    height: 60%;    
-}
+    height: 60%;
+    padding-top: 8%;
+    padding-bottom: 8%; 
 
+}
 
 
 /* Icons with their respective Images */
 .icons {
     background: white;
     margin-top: 3%;
+    padding-top: 2%;
+    font-size: 15pt;
+    color: #6D5847;
 }
 
-figure.item {
-    /* To correctly align image, regardless of content height: */
-    vertical-align: top;
-    display: inline-block;
-    /* To horizontally center images and caption */
-    text-align: center;
-    /* The width of the container also implies margin around the images. */
+.icons a {
+  color: #6D5847;
 }
 
-
-
-
-
-/* Contact Us, Related Links and Organization Logo css*/
-
-
-.org-logo {
-	margin-top: 1%;
-
-  float: left;
-  color: #5A3700;
-  
+label {
+  color:white !important;
 }
 
-.related-links {
-  font-size: 120%;
-	color: #5A3700;
-  text-align: center;
-  margin-top: 1%;
-}
 
-.contact-us {
-	font-size: 140%;
-  color: #5A3700;
-  margin-top: 1%;
+/* Contact Us, Related Links and Organization Logo css*/
 
-  float: right;
 
+#bottom a{
+  color: #6D5847;
 }
 
 /* Footer */
diff --git a/workshop_app/static/workshop_app/css/testimonials.css b/workshop_app/static/workshop_app/css/testimonials.css
new file mode 100644
index 0000000..cba4902
--- /dev/null
+++ b/workshop_app/static/workshop_app/css/testimonials.css
@@ -0,0 +1,50 @@
+/***
+User Profile Sidebar by @keenthemes
+A component of Metronic Theme - #1 Selling Bootstrap 3 Admin Theme in Themeforest: http://j.mp/metronictheme
+Licensed under MIT
+***/
+
+/* Content */
+.content {
+    padding-top: 30px;
+}
+
+/* Testimonials */
+.testimonials blockquote {
+    background: #f8f8f8 none repeat scroll 0 0;
+    border-bottom:1px dotted black;
+    color: #666;
+    display: block;
+    font-size: 15px;
+    line-height: 20px;
+    padding: 15px;
+    position: relative;
+}
+
+
+.testimonials .carousel-info img {
+    border: 1px solid #f5f5f5;
+    border-radius: 150px !important;
+    padding: 3px;
+    width: 75px;
+}
+.testimonials .carousel-info {
+    overflow: hidden;
+}
+.testimonials .carousel-info img {
+    margin-right: 15px;
+}
+.testimonials .carousel-info span {
+    display: block;
+}
+.testimonials span.testimonials-name {
+    color: #e6400c;
+    font-size: 21px;
+    font-weight: 300;
+    margin: 23px 0 7px;
+}
+.testimonials span.testimonials-post {
+    color: #656565;
+    font-size: 15px;
+    border-bottom: 1px solid grey;
+}
\ No newline at end of file
diff --git a/workshop_app/static/workshop_app/img/img1.png b/workshop_app/static/workshop_app/img/img1.png
deleted file mode 100644
index 07dc07f..0000000
--- a/workshop_app/static/workshop_app/img/img1.png
+++ /dev/null
diff --git a/workshop_app/static/workshop_app/img/img2.jpg b/workshop_app/static/workshop_app/img/img2.jpg
deleted file mode 100644
index fd18675..0000000
--- a/workshop_app/static/workshop_app/img/img2.jpg
+++ /dev/null
diff --git a/workshop_app/static/workshop_app/img/structure.png b/workshop_app/static/workshop_app/img/structure.png
new file mode 100644
index 0000000..9c18785
--- /dev/null
+++ b/workshop_app/static/workshop_app/img/structure.png