Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

Merge pull request #4051 from PaulAdamDavis/fix-user-settings

Browse source 
Fix user settings page for Firefox
This commit is contained in:
Matt Enlow 2014-09-18 18:51:22 -06:00
commit e3a5374fa9
2 changed files with 23 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
ghost/admin/assets/sass/layouts/user.scss
View file

@ -56,15 +56,12 @@
} }
.user-image + .form-group { .user-image + .form-group {
margin-top: 155px;
max-width: 500px; max-width: 500px;
@media (min-width: 651px) and (max-width: 1000px) { @media (min-width: 651px) and (max-width: 1000px) {
width: calc(100% - 201px); width: calc(100% - 201px);
} }
@media (min-width: 651px) { @media (min-width: 651px) {
min-width: 285px; min-width: 285px;
margin-top: 0;
top: -110px;
left: 40px; left: 40px;
} }
@media (min-width: 1001px) { @media (min-width: 1001px) {
@ -74,7 +71,6 @@
.user-profile { .user-profile {
position: relative; position: relative;
top: -110px;
z-index: 1; z-index: 1;
@media (min-width: 651px) { @media (min-width: 651px) {
padding-left: 143px; padding-left: 143px;
@ -97,13 +93,14 @@
.user-details-top { .user-details-top {
position: relative;
@media (max-width: 650px) { @media (max-width: 650px) {
margin-bottom: 10px; margin-top: 40px;
label[for='user-name'] { // Reverse the affects of .sr-only margin-bottom: 0;
position: static; }
width: auto; @media (min-width: 651px) {
height: auto; margin-top: -91px;
}
} }
@media (min-width: 651px) { @media (min-width: 651px) {
@ -112,6 +109,9 @@
p { p {
color: #fff; color: #fff;
} }
label[for="user-name"] {
color: transparent;
}
.user-name { .user-name {
border-color: #fff; border-color: #fff;
} }
@ -135,7 +135,18 @@
.user-image { .user-image {
display: block; display: block;
position: relative; position: absolute;
@media (min-width: 651px) {
top: -19px;
left: -98px;
}
@media (max-width: 650px) {
top: -159px;
left: -19px;
}
width: 126px; width: 126px;
height: 126px; height: 126px;
float: left; float: left;
@ -148,16 +159,6 @@
background: #fff; background: #fff;
z-index: 2; z-index: 2;
margin-left: -104px;
@media (max-width: 550px) {
margin-left: 0px;
}
@media (min-width: 551px) and (max-width: 650px) {
margin-left: 20px;
}
.img { .img {
display: block; display: block;
width: 120px; width: 120px;
@ -189,11 +190,4 @@
text-transform: uppercase; text-transform: uppercase;
text-decoration: none; text-decoration: none;
transition: opacity 0.3s ease; transition: opacity 0.3s ease;
}
.user-details-bottom {
padding: 0 40px;
@media (min-width: 651px) {
margin: -104px 0 0 0;
}
} }

2
ghost/admin/templates/settings/users/user.hbs
View file

@ -38,7 +38,7 @@
</figure> </figure>
<div class="form-group"> <div class="form-group">
<label for="user-name" class="sr-only">Full Name</label> <label for="user-name">Full Name</label>
{{input value=user.name id="user-name" class="user-name" placeholder="Full Name" autocorrect="off"}} {{input value=user.name id="user-name" class="user-name" placeholder="Full Name" autocorrect="off"}}
<p>Use your real name so people can recognise you</p> <p>Use your real name so people can recognise you</p>
</div> </div>