Merge pull request #572 from siv123456/dev

#552 : small change in how google/facebook login buttons look.

static/css/style.css

@@ -757,4 +757,23 @@ input[type='checkbox']{
     margin: 15px;
     margin-right: 0px;
 }
+/* for login popup*/
+.modal-header {
+    background-color = gray;
+}
+.modal-header h3 {
+    font-size: 16px;
+}
+.btn-social-icon {
+    width: 160px;
+    border-radius: 0px;
+    color: #fff !important;
+}
+.btn-facebook {
+
+    background-color: blue;
+}
 
+.btn-google {
+    background-color: red;
+}

templates/index.html

@@ -412,7 +412,7 @@ <h5> אנו מפתחים תכונות חדשות לאתר. הנך מוזמנ/ת
     <div class="modal hide fade">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h3>{{ gettext('Login') }}</h3>
+            <h3>{{ gettext('היכנס') }}</h3>
         </div>
         <div class="modal-body" style="width: 50%; margin: 0 auto;">
             <div class="control-group" style="width: 100%; margin: 0 auto;">
@@ -430,7 +430,7 @@ <h2> {{ gettext('Hi') + ' ' + current_user.nickname }}</h2>
                         <span class="fa fa-facebook"></span>
                     </a>                    
                     <br/>
-                    <h3>OR</h3>
+                    <!--<h3>OR</h3>-->
                     <br/>
                     <a class="btn btn-social-icon btn-google" href="{{ url_for('oauth_authorize', provider='google') }}">
                         {{ gettext('Login with Google') }}
@@ -439,9 +439,9 @@ <h3>OR</h3>
                 {% endif %}
             </div>
         </div>
-        <div class="modal-footer">
-            <a class="btn close-button">סגור</a>
-        </div>
+        <!--<div class="modal-footer">-->
+            <!--<a class="btn close-button">סגור</a>-->
+        <!--</div>-->
     </div>
 </div>