sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-14 16:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(backgrounds): fix name visibility, perf++ :not(.hasBackground) => .notBackground

Browse source
This commit is contained in:
Tyler Renelle 2014-06-12 12:48:40 -06:00
parent 99fb9b0959
commit 8cab2951e5
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
public/css/avatar.styl
View file

@ -28,7 +28,7 @@ future re: pets and whatnot, this is just temporary.
position: relative
cursor: pointer
// users can have image backgrounds
.herobox:not(.hasBackground)
.herobox.noBackgroundImage
background: $color-herobox
transition: border 0.25s ease-out, background 0.25s ease-out//, padding 0.13s ease-out
outline: 1px solid rgba(0,0,0,0.1)
@ -63,7 +63,7 @@ future re: pets and whatnot, this is just temporary.
border 1px solid black
// if not user's avatar, remove lines for party unity
.herobox:not(.isUser):not(.hasBackground)
.herobox.noBackgroundImage:not(.isUser)
outline: 0
background-color: darken($color-herobox, 8%)
@ -77,10 +77,11 @@ future re: pets and whatnot, this is just temporary.
// expose hero info on hover, taking
// into account the extra pet space
.herobox:hover:not(.hasBackground), .herobox:focus:not(.hasBackground)
background: lighten($color-herobox, 30%)
&:after
opacity: 1
.herobox:hover, .herobox:focus
&:after
opacity: 1
.herobox.noBackgroundImage:hover, .herobox.noBackgroundImage:focus
background: lighten($color-herobox, 30%)
// positioning the sprites, etc
.herobox
@ -92,5 +93,5 @@ future re: pets and whatnot, this is just temporary.
.character-sprites span, .pet
position: absolute
.herobox.isLeader:not(.hasBackground)
.herobox.isLeader.noBackgroundImage
background: lighten($color-herobox, 10%)

2
views/shared/header/avatar.jade
View file

@ -73,7 +73,7 @@ mixin avatar(opts)
mixin herobox(opts)
- if (!opts) {opts = {minimal:false,main:false}}
figure.herobox(ng-click='spell ? castEnd(profile, "user", $event) : clickMember(profile._id)', data-name='{{profile.profile.name}}', class='background_{{profile.preferences.background}} #{opts.main ? "isUser" : ""} #{opts.minimal ? "minimal" : ""}', ng-class='{hasPet: (#{!opts.minimal} && profile.items.currentPet), hasMount: (#{!opts.minimal} && profile.items.currentMount), hasBackground: profile.preferences.background, "cast-target": applyingAction, isLeader: party.leader==profile._id}')
figure.herobox(ng-click='spell ? castEnd(profile, "user", $event) : clickMember(profile._id)', data-name='{{profile.profile.name}}', class='background_{{profile.preferences.background}} #{opts.main ? "isUser" : ""} #{opts.minimal ? "minimal" : ""}', ng-class='{hasPet: (#{!opts.minimal} && profile.items.currentPet), hasMount: (#{!opts.minimal} && profile.items.currentMount), notBackground: !profile.preferences.background, "cast-target": applyingAction, isLeader: party.leader==profile._id}')
+avatar(opts)
.avatar-level.label.label-default(ng-class='userLevelStyle(profile)')
span.glyphicon.glyphicon-circle-arrow-up(ng-show='profile.stats.buffs.str || profile.stats.buffs.per || profile.stats.buffs.con || profile.stats.buffs.int || profile.stats.buffs.stealth', tooltip=env.t('buffed'))