From 65664c9fb5ed3915005cb4ef84d9740a53d31aa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Udvari?= <gabor.udvari@gmail.com>
Date: Mon, 5 Oct 2015 16:47:49 +0200
Subject: [PATCH] Update checkbox style and markup

---
 docs                          |  2 +-
 sources/styles/bootgenie.scss |  9 +++++++++
 templates/_main_login.inc.php | 14 ++++++--------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/docs b/docs
index b04cfd6..12cf469 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit b04cfd6a05850a2324dcd40715042c6cbe9c79ee
+Subproject commit 12cf469e014ad60b0794392cf305bdf11e9df898
diff --git a/sources/styles/bootgenie.scss b/sources/styles/bootgenie.scss
index e78854d..96837b4 100644
--- a/sources/styles/bootgenie.scss
+++ b/sources/styles/bootgenie.scss
@@ -208,6 +208,15 @@ input[type="email"] {
     // repeat this here
     padding-left: 20px;
     text-align: left;
+    font-weight: normal;
+  }
+
+  input[type="checkbox"] {
+    position: absolute;
+    margin-left: -20px;
+    margin-top: 0;
+    margin-bottom: 0;
+    padding-top: 7px;
   }
 }
 
diff --git a/templates/_main_login.inc.php b/templates/_main_login.inc.php
index 71133b7..f3745f0 100644
--- a/templates/_main_login.inc.php
+++ b/templates/_main_login.inc.php
@@ -12,11 +12,11 @@
 
 <div id="regular_login_container">
 
-    <?php if ($loginintro instanceof \thebuggenie\modules\publish\entities\Article): ?>
-        <?php include_component('publish/articledisplay', array('article' => $loginintro, 'show_title' => false, 'show_details' => false, 'show_actions' => false, 'embedded' => true)); ?>
+   <?php if ($loginintro instanceof \thebuggenie\modules\publish\entities\Article): ?>
+      <?php include_component('publish/articledisplay', array('article' => $loginintro, 'show_title' => false, 'show_details' => false, 'show_actions' => false, 'embedded' => true)); ?>
     <?php endif; ?>
 
-    <h2><?php echo __('Log in with your username and password'); ?></h2>
+      <h2><?php echo __('Log in with your username and password'); ?></h2>
     <form accept-charset="<?php echo \thebuggenie\core\framework\Context::getI18n()->getCharset(); ?>" action="<?php echo make_url('login'); ?>" method="post" id="login_form" onsubmit="TBG.Main.Login.login('<?php echo make_url('login'); ?>'); return false;">
         <?php if (!\thebuggenie\core\framework\Context::hasMessage('login_force_redirect') || \thebuggenie\core\framework\Context::getMessage('login_force_redirect') !== true): ?>
             <input type="hidden" id="tbg3_referer" name="tbg3_referer" value="<?php echo $referer; ?>" />
@@ -36,11 +36,9 @@
             </div>
         </div>
         <div class="form-group">
-            <div class="checkbox-wrapper">
-                <div class="checkbox">
-                    <label for="tbg3_rememberme"><input type="checkbox" name="tbg3_rememberme" value="1" id="tbg3_rememberme"><?php echo __('Keep me logged in'); ?></label>
-                </div>
-            </div>
+           <div class="checkbox-wrapper">
+                 <label for="tbg3_rememberme"><input type="checkbox" name="tbg3_rememberme" value="1" id="tbg3_rememberme"><?php echo __('Keep me logged in'); ?></label>
+           </div>
         </div>
         <div class="form-group">
             <div class="button-wrapper">