Merge pull request #2513 from gpasztor87/patch-1

Using flexbox on login and reset page.
octobercms · Nov 29, 2016 · c31d3a9 · c31d3a9
2 parents f771887 + fc5af0d
commit c31d3a9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 24 deletions.
diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css
diff --git a/modules/backend/assets/less/layout/outerlayout.less b/modules/backend/assets/less/layout/outerlayout.less
@@ -53,21 +53,14 @@ body.outer {
 
                     .horizontal-form {
                         font-size: 0;
+                        .flex-display();
 
                         input {
                             vertical-align: top;
                             margin-right: 9px;
                             display: inline-block;
                             border: none;
                             .border-radius(2px);
-
-                            &.width-1 {
-                                width: 160px;
-                            }
-
-                            &.width-2 {
-                                width: 323px;
-                            }
                         }
 
                         button {
@@ -78,11 +71,6 @@ body.outer {
                             height: 40px;
                             vertical-align: top;
                             .box-sizing(border-box);
-
-                            &.login-button {
-                                display: inline-block;
-                                width: 98px;
-                            }
                         }
                     }
 
@@ -135,10 +123,14 @@ html.csstransitions {
             width: auto;
             padding: @padding-standard * 2;
 
-            .horizontal-form input {
+            .horizontal-form {
                 display: block;
-                width: 100% !important;
-                margin-bottom: @padding-standard;
+
+                input {
+                    display: block;
+                    width: 100% !important;
+                    margin-bottom: @padding-standard;
+                }
             }
         }
     }

diff --git a/modules/backend/controllers/auth/reset.htm b/modules/backend/controllers/auth/reset.htm
@@ -13,7 +13,7 @@ <h2><?= e(trans('backend::lang.account.enter_new_password')) ?></h2>
                 type="password"
                 name="password"
                 value=""
-                class="form-control password width-2 icon lock"
+                class="form-control password icon lock"
                 placeholder="<?= e(trans('backend::lang.account.password_placeholder')) ?>"
                 autocomplete="off"
                 maxlength="255" />

diff --git a/modules/backend/controllers/auth/restore.htm b/modules/backend/controllers/auth/restore.htm
@@ -10,7 +10,7 @@ <h2><?= e(trans('backend::lang.account.enter_login')) ?></h2>
                 type="text"
                 name="login"
                 value="<?= e(post('login')) ?>"
-                class="form-control width-2 icon user"
+                class="form-control icon user"
                 placeholder="<?= e(trans('backend::lang.account.login_placeholder')) ?>"
                 autocomplete="off"
                 maxlength="255" />

diff --git a/modules/backend/controllers/auth/signin.htm b/modules/backend/controllers/auth/signin.htm
@@ -11,7 +11,7 @@ <h2><?= e(Backend\Models\BrandSetting::get('app_tagline')) ?></h2>
                 type="text"
                 name="login"
                 value="<?= e(post('login')) ?>"
-                class="form-control width-1 icon user"
+                class="form-control icon user"
                 placeholder="<?= e(trans('backend::lang.account.login_placeholder')) ?>"
                 autocomplete="off"
                 maxlength="255" />
@@ -21,7 +21,7 @@ <h2><?= e(Backend\Models\BrandSetting::get('app_tagline')) ?></h2>
                 type="password"
                 name="password"
                 value=""
-                class="form-control width-1 icon lock"
+                class="form-control icon lock"
                 placeholder="<?= e(trans('backend::lang.account.password_placeholder')) ?>"
                 autocomplete="off"
                 maxlength="255" />