Merge branch 'master' of https://github.com/MathieuNls/tw

Toolwatchapp · Mar 23, 2016 · baf8541 · baf8541
2 parents b5f148b + e0222b3
commit baf8541
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 30 deletions.
diff --git a/application/views/footer.php b/application/views/footer.php
@@ -17,7 +17,7 @@
                     <div class="col-md-2">
                         <div class="logo"></div>
                     </div>
-                    <div class="links col-md-offset-1 col-sm-1">
+                    <div class="links col-sm-1">
                         <a href="<?php echo base_url(); ?>#demo-screen">Features</a>
                     </div>
                     <div class="links col-sm-1">
@@ -30,17 +30,17 @@
                             echo '<div class="links col-sm-1">
                                 <a href="/logout">Logout</a>
                             </div>
-                            <div class="links col-sm-1">
-                                <a href="/measures/">Measures</a>
+                            <div class="links col-sm-2">
+                                <a href="/measures/">My Measures</a>
                             </div>';
                         }
                         else
                         {
                             echo '<div class="links col-sm-1">
                                 <a href="#" title="Login" data-toggle="modal" data-target="#pageModal" data-modal-update="true" data-href="/login/">Login</a>
                             </div>
-                            <div class="links col-sm-1">
-                                <a href="#" title="Login" data-toggle="modal" data-target="#pageModal" data-modal-update="true" data-href="/login/">Measures</a>
+                            <div class="links col-sm-2">
+                                <a href="#" title="Login" data-toggle="modal" data-target="#pageModal" data-modal-update="true" data-href="/login/">My Measures</a>
                             </div>';
                         }
                     ?>

diff --git a/application/views/header.php b/application/views/header.php
@@ -151,11 +151,11 @@
 <?php
 if ($userIsLoggedIn) {
 	echo '<div style="margin-top: 10px" class="col-md-1  text-center"><a href="/logout/" title="Logout">Logout</a></div>';
-	echo '<div class="col-md-1 "><a class="btn btn-lg btn-white" href="/measures/" title="Measures">Measures</a></div>';
+	echo '<div class="col-md-1 "><a class="btn btn-lg btn-white" href="/measures/" title="Measures">My Measures</a></div>';
 } else {
 
 	echo '<div style="margin-top: 10px" class="col-md-1  text-center"><a href="#" title="Login" data-toggle="modal" data-target="#pageModal" data-modal-update="true" data-href="/login/">Login</a></div>';
-	echo '<div class="col-md-1 "><a class="btn btn-lg btn-white" title="Measures" data-toggle="modal" data-cta="MEASURES" data-target="#pageModal" data-modal-update="true" data-href="/login/">Measures</a></div>';
+	echo '<div class="col-md-1 "><a class="btn btn-lg btn-white" title="Measures" data-toggle="modal" data-cta="MEASURES" data-target="#pageModal" data-modal-update="true" data-href="/login/">My Measures</a></div>';
 }
 ?>
                     </div>

diff --git a/application/views/modal/login.php b/application/views/modal/login.php
@@ -2,14 +2,17 @@
   Login in allows you to access and track all your measures in one place.
 </div>
 <div class="form-group">
-   <center><button onclick="fb_login();" class="btn btn-primary btn-lg btn-spinner btn-full">Log in with Facebook<i class="fa fa-spinner fa-pulse"></i></button></center>
+   <center><button onclick="fb_login();" class="btn btn-primary btn-lg btn-spinner btn-full">
+     <span style="font-size: 30px;
+    margin-right: 10px;" class="fa fa-facebook-square"></span>
+     <span style="margin-top:-10px;">Log in with Facebook</span><i class="fa fa-spinner fa-pulse"></i></button></center>
    <span id="fb_error" class="signup-error login-error"></span>
 </div>
 
 <form method="post" name="login">
 
     <div class="form-group">
-       <strong class="line-thru">or</strong>
+       <strong class="line-thru"></strong>
     </div>
 	<div class="form-group">
         <span id="email_error" class="signup-error login-error"></span>

diff --git a/assets/css/main.css b/assets/css/main.css
@@ -182,28 +182,8 @@ textarea:focus, textarea:hover, textarea:active
   text-align: center;
   width: 100%;
   z-index: 1;
-}
-
-.line-thru:before {
-  width: 40px;
-  height: 10px;
-  background-color: #fff;
-  content: '';
-  margin: -5px 0 0 -20px;
-  left: 50%;
-  position: absolute;
-  top: 50%;
-  z-index: -1;
-}
-
-.line-thru:after {
+  height: 1px;
   border-bottom: 1px solid #dfe0e6;
-  content: '';
-  display: block;
-  position: absolute;
-  top: 49%;
-  width: 100%;
-  z-index: -2;
 }
 
 .line