updated about page

jatwell93 · Jun 5, 2017 · 82781f9 · 82781f9
1 parent 3710792
commit 82781f9
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 3 deletions.
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
@@ -512,4 +512,23 @@ p.workout-summary {
     height: $size;
     width: $size;
   }
-}
+}
+//About us page 
+.img-center {
+	margin: 0 auto;
+}
+.about-icons {
+    display: inline-block;
+    width: 235px;
+    height: 235px;
+    cursor: pointer;
+    background-color: #00cc00;
+    border-radius: 2px;
+    font-size: 20px;
+    color: #ffffff;
+    text-align: center;
+    line-height: 235px;
+    margin-right: 3px;
+    margin-bottom: 5px;
+}
+
diff --git a/app/views/pages/about.html.erb b/app/views/pages/about.html.erb
@@ -1,2 +1,47 @@
-<h1>About Us</h1>
-<%= render "layouts/carousel" %>
+  <!-- Page Content -->
+    <div class="container">
+
+        <!-- Introduction Row -->
+        <div class="row">
+            <div class="col-lg-12">
+                <h1 class="page-header">About Us
+                    <small>It's Nice to Meet You!</small>
+                </h1>
+                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sint, explicabo dolores ipsam aliquam inventore corrupti eveniet quisquam quod totam laudantium repudiandae obcaecati ea consectetur debitis velit facere nisi expedita vel?</p>
+            </div>
+        </div>
+
+        <!-- Team Members Row -->
+        <div class="row">
+            <div class="col-lg-12">
+                <h2 class="page-header">Our Team</h2>
+            </div>
+            <div class="col-lg-4 col-sm-6 text-center">
+                <img class="img-circle img-responsive img-center" src="http://placehold.it/200x200" alt="">
+                <h3>John Smith
+                    <small>Job Title</small>
+                </h3>
+                <p>What does this team member to? Keep it short! This is also a great spot for social links!</p>
+            </div>
+            <div class="col-lg-4 col-sm-6 text-center">
+                <img class="img-circle img-responsive img-center" src="http://placehold.it/200x200" alt="">
+                <h3>John Smith
+                    <small>Job Title</small>
+                </h3>
+                <p>What does this team member to? Keep it short! This is also a great spot for social links!</p>
+            </div>
+            <div class="col-lg-4 col-sm-6 text-center">
+                <img class="img-circle img-responsive img-center" src="http://placehold.it/200x200" alt="">
+                <h3>John Smith
+                    <small>Job Title</small>
+                </h3>
+                <p>What does this team member to? Keep it short! This is also a great spot for social links!</p>
+            </div>
+            <div class="about-icons">
+                <a href="https://www.facebook.com/AandKLAB/"><i class="fa fa-facebook"></i></a> 
+                <a href="https://twitter.com/AandK_Labs/"><i class="fa fa-twitter"></i></a> 
+                <a href="https://www.pinterest.com/ak_labs/"><i class="fa fa-pinterest"></i></a>
+                <a href="https://plus.google.com/u/0/111049496295760161741"><i class="fa fa-google-plus"></i></a>
+                <a href="#"><i class="fa fa-instagram"></i></a>
+            </div> 
+        </div>