codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 08:08:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reworked the account modal links and a little bit of the styling.

Browse source
This commit is contained in:
Scott Erickson 2014-11-25 10:39:46 -08:00
parent bb766e9610
commit 2a135eeaf1
2 changed files with 31 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
app/styles/common/site-chrome.sass
View file

@ -56,12 +56,12 @@
left: 0 left: 0
right: 0 right: 0
a & > a
color: rgb(158,135,119) color: rgb(158,135,119)
&:hover &:hover
color: $white color: $white
a, button, select & > a, button, select
font-size: 18px font-size: 18px
text-transform: uppercase text-transform: uppercase
font-family: Open Sans Condensed font-family: Open Sans Condensed
@ -100,57 +100,44 @@
width: 18px width: 18px
.dropdown-menu .dropdown-menu
//left: auto // this busts it, not sure why it's in width: 180px
width: 280px
padding: 0px padding: 0px
border-radius: 0px border-radius: 0px
font-family: Open Sans Condensed
font-variant: small-caps
> .user-dropdown-header .user-dropdown-header
position: relative
background: #E4CF8C background: #E4CF8C
height: 160px height: 160px
padding: 10px padding: 10px
text-align: center text-align: center
color: black color: black
border-bottom: #32281e 1px solid border-bottom: #32281e 1px solid
> a:hover
background-color: transparent
img img
border: #e3be7a 8px solid border: #e3be7a 8px solid
height: 98px // Includes the border height: 98px // Includes the border
&:hover &:hover
box-shadow: 0 0 20px #e3be7a box-shadow: 0 0 20px #e3be7a
> h3
h3
font-variant: small-caps
font-family: Open Sans Condensed
margin-top: 10px margin-top: 10px
text-shadow: 2px 2px 3px white text-shadow: 2px 2px 3px white
color: #31281E color: #31281E
.user-level .user-level
position: absolute position: absolute
top: 73px top: 73px
right: 86px right: 40px
color: gold color: gold
text-shadow: 1px 1px black, -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black text-shadow: 1px 1px black, -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black
.user-dropdown-body li
color: black color: black
padding: 15px font-size: 16px
letter-spacing: 1px
font: 15px 'Helvetica Neue', Helvetica, Arial, sans-serif
+clearfix()
.user-dropdown-footer
padding: 10px
margin-left: 0px
font-size: 14px
+clearfix()
.btn-flat
border: #ddd 1px solid
border-radius: 0px
margin: 0px
#logout-button
font-weight: bold
//- Content //- Content

22
app/templates/base.jade
View file

@ -20,7 +20,7 @@ block header
img.account-settings-image(src=me.getPhotoURL(18), alt="") img.account-settings-image(src=me.getPhotoURL(18), alt="")
else else
i.glyphicon.glyphicon-user i.glyphicon.glyphicon-user
span.spl.spr(data-i18n="nav.account" href="/account") Account span.spl.spr(data-i18n="nav.account" href="/account")
span.caret span.caret
ul.dropdown-menu(role="menu") ul.dropdown-menu(role="menu")
li.user-dropdown-header li.user-dropdown-header
@ -28,18 +28,14 @@ block header
a(href="/user/#{me.getSlugOrID()}") a(href="/user/#{me.getSlugOrID()}")
img.img-circle(src="#{me.getPhotoURL()}" alt="") img.img-circle(src="#{me.getPhotoURL()}" alt="")
h3=me.displayName() h3=me.displayName()
li.user-dropdown-body li
.col-xs-4.text-center a(href="/user/#{me.getSlugOrID()}" data-i18n="nav.profile")
a(href="/user/#{me.getSlugOrID()}" data-i18n="nav.profile") Profile li
.col-xs-4.text-center a(href="/account/settings", data-i18n="play.settings")
a(href="/user/#{me.getSlugOrID()}/stats" data-i18n="nav.stats") Stats li
.col-xs-4.text-center a(href="/account/payments", data-i18n="account.payments")
a.disabled(data-i18n="nav.code") Code li
li.user-dropdown-footer a#logout-button(data-i18n="login.log_out")
.pull-left
a.btn.btn-default.btn-flat(href="/account" data-i18n="nav.account") Account
.pull-right
button#logout-button.btn.btn-default.btn-flat(data-i18n="login.log_out") Log Out
else else
button.btn.btn-sm.btn-primary.header-font.signup-button(data-i18n="login.sign_up") button.btn.btn-sm.btn-primary.header-font.signup-button(data-i18n="login.sign_up")