diff --git a/src/components/accounts/AccountSwitcher.jsx b/src/components/accounts/AccountSwitcher.jsx index 0ce99fb..30cde92 100644 --- a/src/components/accounts/AccountSwitcher.jsx +++ b/src/components/accounts/AccountSwitcher.jsx @@ -59,26 +59,32 @@ export default class AccountSwitcher extends Component { styles[`${skin}AccountSwitcher`], )}> {highlightActiveAccount ? ( -
-
-
-
+
+
+
+
{accounts.active.username}
-
+
{accounts.active.email}
- - - - - - +
+
+ + + +
+
+ + + +
+
) : null} {available.map((account) => ( -
+
diff --git a/src/components/accounts/accountSwitcher.scss b/src/components/accounts/accountSwitcher.scss index ccc8ee6..455ea61 100644 --- a/src/components/accounts/accountSwitcher.scss +++ b/src/components/accounts/accountSwitcher.scss @@ -1,9 +1,17 @@ @import '~components/ui/colors.scss'; +@import '~components/ui/fonts.scss'; + +$borderColor: #EEE; .accountSwitcher { background: #fff; color: #444; text-align: left; + width: 205px; + + $border: 1px solid $borderColor; + border-left: $border; + border-right: $border; } .lightAccountSwitcher { @@ -14,6 +22,64 @@ background: $black; } +.item { + padding: 15px; + border-bottom: 1px solid $borderColor; +} + +.accountIcon { + composes: minecraft-character from 'components/ui/icons.scss'; + + font-size: 40px; + color: $green; + float: left; +} + +.activeAccountInfo { + margin-left: 29px; +} + +.activeAccountUsername { + font-size: 20px; + line-height: normal; // button style override + color: $green; +} + +.activeAccountEmail { + font-size: 10px; + color: #999; + + line-height: normal; // button style override + font-family: $font-family-base; // button style override +} + +.links { + margin-top: 6px; +} + +.link { + line-height: normal; // button style override + font-size: 12px; // button style override + margin-bottom: 3px; + + &:last-of-type { + margin-bottom: 0; + } + + a { + color: #666; + font-size: 12px; + border-bottom: 1px dotted #666; + text-decoration: none; + transition: .25s; + + &:hover { + border-bottom-color: #777; + color: #777; + } + } +} + .logoutIcon { composes: exit from 'components/ui/icons.scss'; diff --git a/src/components/userbar/loggedInPanel.scss b/src/components/userbar/loggedInPanel.scss index 37f9d77..69fb816 100644 --- a/src/components/userbar/loggedInPanel.scss +++ b/src/components/userbar/loggedInPanel.scss @@ -1,9 +1,15 @@ +@import '~components/ui/colors.scss'; + .loggedInPanel { } .activeAccount { position: relative; + $border: 1px solid rgba(#fff, .15); + border-left: $border; + border-right: $border; + &:hover { .accountSwitcherContainer { display: block; @@ -21,10 +27,11 @@ } .expandIcon { - composes: arrow from 'components/ui/icons.scss'; + composes: caret from 'components/ui/icons.scss'; - margin-left: 5px; - font-size: 12px; + margin-left: 4px; + font-size: 6px; + color: #CCC; } .userName { diff --git a/src/icons/webfont/minecraft-character.svg b/src/icons/webfont/minecraft-character.svg new file mode 100644 index 0000000..2e0711a --- /dev/null +++ b/src/icons/webfont/minecraft-character.svg @@ -0,0 +1,5 @@ + + + + +