diff --git a/client/app/components/footer/footer.tsx b/client/app/components/footer/footer.tsx index 3a1bcbc..e91ee00 100644 --- a/client/app/components/footer/footer.tsx +++ b/client/app/components/footer/footer.tsx @@ -1,6 +1,5 @@ import React from 'react'; - -import bottom_blizzlogo from '../../assets/bottom-blizzlogo.gif'; +// import bottom_blizzlogo from '../../assets/bottom-blizzlogo.gif'; import './footer.scss'; @@ -13,7 +12,8 @@ export class Footer extends React.Component { render() { return (
- + {/* don't show the blizzard logo for now */} + {/* */}
); } diff --git a/client/app/components/forum-nav/forum-nav.tsx b/client/app/components/forum-nav/forum-nav.tsx index 72768d5..9c049a9 100644 --- a/client/app/components/forum-nav/forum-nav.tsx +++ b/client/app/components/forum-nav/forum-nav.tsx @@ -79,8 +79,8 @@ export class ForumNav extends React.Component { const imageSrc = selectedCategory ? this.getImageSrc() : undefined; return ( -
- +
+
{get(selectedCategory, 'title')} diff --git a/client/app/components/header/header.scss b/client/app/components/header/header.scss index 41a11ac..7736a5d 100644 --- a/client/app/components/header/header.scss +++ b/client/app/components/header/header.scss @@ -8,7 +8,7 @@ $topbg_height: 100px; text-align: center; z-index: 1; - @include breakpoint(smallOrLess) { + @include breakpoint(mediumOrLess) { img { height: 80px; } @@ -83,21 +83,26 @@ $topbg_height: 100px; background-image: url('../../assets/linksbar-bg.gif'); background-repeat: repeat-x; display: flex; - justify-content: space-between; + justify-content: center; align-items: center; + position: relative; } .linksbar-image { height: 53px; width: 106px; + position: absolute; + top: 0; &__left { background-image: url('../../assets/linksbar-left.gif'); background-repeat: no-repeat; + left: 0; } &__right { background-image: url('../../assets/linksbar-right.gif'); background-repeat: no-repeat; + right: 0; } } diff --git a/client/app/components/header/header.tsx b/client/app/components/header/header.tsx index 27c04ae..fe2dc42 100644 --- a/client/app/components/header/header.tsx +++ b/client/app/components/header/header.tsx @@ -39,7 +39,7 @@ export class Header extends React.Component {
- News | Game Info | Forums | Links/Files | Support + Home | Realms | Contact
diff --git a/client/app/components/login-button/login-button.scss b/client/app/components/login-button/login-button.scss index 6a75f89..74cf75a 100644 --- a/client/app/components/login-button/login-button.scss +++ b/client/app/components/login-button/login-button.scss @@ -1,3 +1,9 @@ +.login-button { + position: absolute; + top: 0; + right: 0; +} + .portrait-container { display: flex; flex-direction: column; diff --git a/client/app/components/login-button/login-button.tsx b/client/app/components/login-button/login-button.tsx index ce6cc82..f27dc66 100644 --- a/client/app/components/login-button/login-button.tsx +++ b/client/app/components/login-button/login-button.tsx @@ -7,7 +7,6 @@ import { Oauth } from '../../util'; import './login-button.scss'; interface Props { - className?: string; userStore?: UserStore; onNavigate: (des: string) => any; } @@ -25,15 +24,18 @@ export class LoginButton extends React.Component { renderPortrait() { const avatarSrc = CharacterService.getAvatar(this.props.userStore!.user!.character_avatar!); return ( -
-
this.props.onNavigate('/user-account')} style={{ cursor: 'pointer' }}> - {avatarSrc && } -
-
- {!avatarSrc &&

this.props.onNavigate('/user-account')}>Account

} -
{this.props.userStore!.user!.battletag}
-
{this.props.userStore!.user!.character_name}
+
+
+
this.props.onNavigate('/user-account')} style={{ cursor: 'pointer' }}> + {avatarSrc && } +
+
+ {!avatarSrc &&

this.props.onNavigate('/user-account')}>Account

} +
{this.props.userStore!.user!.battletag}
+
{this.props.userStore!.user!.character_name}
+
+
); } @@ -42,14 +44,14 @@ export class LoginButton extends React.Component { return (
- +
); } render() { return ( -
+
{this.props.userStore!.user ? this.renderPortrait() : this.renderLoginButton()}
); diff --git a/client/app/pages/forum/forum.scss b/client/app/pages/forum/forum.scss index a0f69dd..a8dc410 100644 --- a/client/app/pages/forum/forum.scss +++ b/client/app/pages/forum/forum.scss @@ -1,7 +1,10 @@ +@import '../../scss/mixins'; + $grey1: #252525; $grey2: #161616; .forum-header { + position: relative; height: 137px; display: flex; align-items: center; @@ -40,6 +43,14 @@ $grey2: #161616; b { color: #E2D9B0; } + + @include breakpoint(mediumOrLess) { + font-size: 10px; + + a { + font-size: 10px; + } + } } .forum-table__header { @@ -74,6 +85,7 @@ $grey2: #161616; border: 1px solid; border-color: #000000 #000000 #161616 #161616; position: relative; + word-break: break-word; } &--center { diff --git a/client/app/pages/forum/forum.tsx b/client/app/pages/forum/forum.tsx index c571a65..8f2e319 100644 --- a/client/app/pages/forum/forum.tsx +++ b/client/app/pages/forum/forum.tsx @@ -159,9 +159,7 @@ export class Forum extends React.Component { return (
-
- this.props.history.push(dest)}/> -
+ this.props.history.push(dest)}/>
); } @@ -170,18 +168,18 @@ export class Forum extends React.Component { return (
this.onSearch(e)}> - + this.onNewTopic()}/> - -
+ +
this.setState({ searchText: event.target.value })}/>
+ className="clickable hide-tiny" style={{ outline: 'none' }}/>
@@ -210,16 +208,16 @@ export class Forum extends React.Component { } - + {user.character_name || user.battletag} - + {reply_count} - + {view_count} - +
by {last_reply.character_name || last_reply.battletag}
@@ -272,13 +270,14 @@ export class Forum extends React.Component { return show ? : null; } - renderHeaderCell(columnHeader: ColumnHeader, center: boolean) { + renderHeaderCell(columnHeader: ColumnHeader, center: boolean, hideTiny?: boolean) { const { categoryId, page, threadsPerPage, sortBy, sortOrder } = this.routeParams(); const newSortOrder = sortOrder === 'asc' ? 'desc' : 'asc'; const centerClass = center ? 'forum-cell--center' : ''; + const hideClass = hideTiny ? 'hide-tiny' : ''; return ( - + this.navigateHere(categoryId, page, threadsPerPage, columnHeader, newSortOrder)}> {columnHeader} {this.renderSortingArrow(sortBy === columnHeader, sortOrder)} @@ -303,8 +302,8 @@ export class Forum extends React.Component { {this.renderHeaderCell(ColumnHeader.subject, false)} {this.renderHeaderCell(ColumnHeader.author, true)} {this.renderHeaderCell(ColumnHeader.replies, true)} - {this.renderHeaderCell(ColumnHeader.views, true)} - {this.renderHeaderCell(ColumnHeader.lastPost, true)} + {this.renderHeaderCell(ColumnHeader.views, true, true)} + {this.renderHeaderCell(ColumnHeader.lastPost, true, true)} {/* body */} diff --git a/client/app/pages/realms/realms.tsx b/client/app/pages/realms/realms.tsx index f04481f..23a0f6e 100644 --- a/client/app/pages/realms/realms.tsx +++ b/client/app/pages/realms/realms.tsx @@ -69,8 +69,8 @@ export class Realms extends React.Component {
-
Welcome to the World of Warcraft Realm Forums!
-
Use these forums to discuss topics related to World of Warcraft with player on your own Realm.
+
Welcome to the Realm Forums!
+
Use these forums to discuss topics related to World of Warcraft with players on your own Realm.
diff --git a/client/app/pages/thread/thread.tsx b/client/app/pages/thread/thread.tsx index b4c3733..f6d6ff7 100644 --- a/client/app/pages/thread/thread.tsx +++ b/client/app/pages/thread/thread.tsx @@ -251,7 +251,7 @@ export class Thread extends React.Component {
- + {thread.sticky && } Topic: | {this.getTimeFormat(thread!.inserted_at)}
diff --git a/client/app/scss/style.scss b/client/app/scss/style.scss index b83122b..3a94548 100644 --- a/client/app/scss/style.scss +++ b/client/app/scss/style.scss @@ -1,4 +1,5 @@ @import '~nprogress/nprogress.css'; +@import './mixins'; $fontPrimary: #cccccc; $linkColor: #FFB019; @@ -179,3 +180,17 @@ div { .page-link { margin: 0 5px; } + +.hide-tiny { + @include breakpoint(mediumOrLess) { + display: none; + } +} + +.show-tiny { + display: none; + + @include breakpoint(mediumOrLess) { + display: block; + } +}