Skip to content

Commit

Permalink
Move styling from some elements from IDs to classes
Browse files Browse the repository at this point in the history
Closes TryGhost#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.
PaulAdamDavis authored and oluseyi committed Feb 1, 2014
1 parent 73fb883 commit 8ef297e
Showing 9 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions core/client/assets/sass/layouts/auth.scss
Original file line number Diff line number Diff line change
@@ -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%);
4 changes: 2 additions & 2 deletions core/client/assets/sass/layouts/editor.scss
Original file line number Diff line number Diff line change
@@ -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;
6 changes: 3 additions & 3 deletions core/client/assets/sass/modules/global.scss
Original file line number Diff line number Diff line change
@@ -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;
2 changes: 1 addition & 1 deletion core/client/tpl/forgotten.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<form id="forgotten" method="post" novalidate="novalidate">
<form id="forgotten" class="forgotten-form" method="post" novalidate="novalidate">
<div class="email-wrap">
<input class="email" type="email" placeholder="Email Address" name="email" autocapitalize="off" autocorrect="off">
</div>
2 changes: 1 addition & 1 deletion core/client/tpl/login.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<form id="login" method="post" novalidate="novalidate">
<form id="login" class="login-form" method="post" novalidate="novalidate">
<div class="email-wrap">
<input class="email" type="email" placeholder="Email Address" name="email" autocapitalize="off" autocorrect="off">
</div>
2 changes: 1 addition & 1 deletion core/client/tpl/reset.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<form id="reset" method="post" novalidate="novalidate">
<form id="reset" class="reset-form" method="post" novalidate="novalidate">
<div class="password-wrap">
<input class="password" type="password" placeholder="Password" name="newpassword" />
</div>
2 changes: 1 addition & 1 deletion core/client/tpl/signup.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<form id="signup" method="post" novalidate="novalidate">
<form id="signup" class="signup-form" method="post" novalidate="novalidate">
<div class="name-wrap">
<input class="name" type="text" placeholder="Full Name" name="name" autocorrect="off" />
</div>
2 changes: 1 addition & 1 deletion core/server/views/default.hbs
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@
<main role="main" id="main">
{{updateNotification}}

<aside id="notifications">
<aside id="notifications" class="notifications">
{{> notifications}}
</aside>

2 changes: 1 addition & 1 deletion core/server/views/partials/navbar.hbs
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
<li class="{{navClass}}{{#if selected}} active{{/if}}"><a href="{{adminUrl}}{{path}}">{{name}}</a></li>
{{/each}}

<li id="usermenu" class="subnav">
<li id="usermenu" class="usermenu subnav">
<a href="#" data-toggle="ul" class="dropdown">
<img class="avatar" src="{{#if currentUser.image}}{{currentUser.image}}{{else}}{{asset "shared/img/user-image.png"}}{{/if}}" alt="Avatar" />
<span class="name">{{#if currentUser.name}}{{currentUser.name}}{{else}}{{currentUser.email}}{{/if}}</span>

0 comments on commit 8ef297e

Please sign in to comment.