From 223b23ec4ad59374a8b9350d5776857699ad7215 Mon Sep 17 00:00:00 2001 From: Paul Adam Davis Date: Sun, 26 Jan 2014 17:04:13 +0000 Subject: [PATCH] Move styling from some elements from IDs to classes Closes #1605 * Move styling for `#signup`, `#forgotten`, `#reset`, `#login`, `#usermenu` and `#notifications` to classes No IDs have been added or removed, so any events shouldn't be affected and it passes all tests. --- ghost/admin/assets/sass/layouts/auth.scss | 6 +++--- ghost/admin/assets/sass/layouts/editor.scss | 4 ++-- ghost/admin/assets/sass/modules/global.scss | 6 +++--- ghost/admin/tpl/forgotten.hbs | 2 +- ghost/admin/tpl/login.hbs | 2 +- ghost/admin/tpl/reset.hbs | 2 +- ghost/admin/tpl/signup.hbs | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ghost/admin/assets/sass/layouts/auth.scss b/ghost/admin/assets/sass/layouts/auth.scss index 44c9ea300e..05d43b8000 100644 --- a/ghost/admin/assets/sass/layouts/auth.scss +++ b/ghost/admin/assets/sass/layouts/auth.scss @@ -55,7 +55,7 @@ 1. Login ============================================================================= */ -#login { +.login-form { @include box-sizing(border-box); max-width: 530px; color: lighten($midgrey, 15%); @@ -182,7 +182,7 @@ 2. Signup and Reset ============================================================================= */ -#signup, #reset { +.signup-form, .reset-form { @include box-sizing(border-box); max-width: 280px; color: lighten($midgrey, 15%); @@ -270,7 +270,7 @@ 3. Forgotten ============================================================================= */ -#forgotten { +.forgotten-form { @include box-sizing(border-box); max-width: 280px; color: lighten($midgrey, 15%); diff --git a/ghost/admin/assets/sass/layouts/editor.scss b/ghost/admin/assets/sass/layouts/editor.scss index a22cad9fe8..9b1984acc0 100644 --- a/ghost/admin/assets/sass/layouts/editor.scss +++ b/ghost/admin/assets/sass/layouts/editor.scss @@ -18,7 +18,7 @@ .editor { - #notifications { + .notifications { @include breakpoint($biggerthan-mobile) { bottom: 40px; } @@ -376,7 +376,7 @@ body.zen { background: lighten($lightbrown, 3%); - #usermenu {display: none;} + .usermenu {display: none;} #global-header, #publish-bar { opacity: 0; height: 0; diff --git a/ghost/admin/assets/sass/modules/global.scss b/ghost/admin/assets/sass/modules/global.scss index ac5a8f4f84..fa058f3788 100644 --- a/ghost/admin/assets/sass/modules/global.scss +++ b/ghost/admin/assets/sass/modules/global.scss @@ -540,7 +540,7 @@ nav { }//.navbar // The user menu in the top right corner of the screen -#usermenu { +.usermenu.subnav { position:absolute; top:0; right:0; @@ -636,7 +636,7 @@ nav { } - #usermenu { + .usermenu { position:fixed; top:0; right:auto; @@ -928,7 +928,7 @@ nav { Notifications ========================================================================== */ -#notifications { +.notifications { @include breakpoint($biggerthan-mobile) { position: absolute; bottom: 0; diff --git a/ghost/admin/tpl/forgotten.hbs b/ghost/admin/tpl/forgotten.hbs index 27f226c6bc..64f1508199 100644 --- a/ghost/admin/tpl/forgotten.hbs +++ b/ghost/admin/tpl/forgotten.hbs @@ -1,4 +1,4 @@ -
+ diff --git a/ghost/admin/tpl/login.hbs b/ghost/admin/tpl/login.hbs index 18b97e9fe5..a94df44728 100644 --- a/ghost/admin/tpl/login.hbs +++ b/ghost/admin/tpl/login.hbs @@ -1,4 +1,4 @@ - + diff --git a/ghost/admin/tpl/reset.hbs b/ghost/admin/tpl/reset.hbs index 1204617c24..242426b4c6 100644 --- a/ghost/admin/tpl/reset.hbs +++ b/ghost/admin/tpl/reset.hbs @@ -1,4 +1,4 @@ - +
diff --git a/ghost/admin/tpl/signup.hbs b/ghost/admin/tpl/signup.hbs index 67f84a61d4..2543c663bf 100644 --- a/ghost/admin/tpl/signup.hbs +++ b/ghost/admin/tpl/signup.hbs @@ -1,4 +1,4 @@ - +