Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Title for vote page #746

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions components/vote/app-style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
}
}

&__title {
font-size: 30pt;
font-weight: 800;
margin-bottom: 10px;
margin-left: 5px;
}

&__influence {
flex: 0 0 75%;
}
Expand All @@ -39,7 +46,7 @@
border-left: 2px solid getColor(elephant);
}
}

&__influence-section {
flex: 0 0 50%;
}
Expand Down Expand Up @@ -97,7 +104,7 @@
height: 25px;
vertical-align: middle;
margin-right: 10px;
}
}
}

&__self-info {
Expand All @@ -109,7 +116,7 @@
}

&__update-button {

}

h1 {
Expand Down
29 changes: 16 additions & 13 deletions components/vote/app.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -177,22 +177,25 @@ export default class VoteApp extends React.Component {
listInfo && console.log(listInfo);
return (
<div className="vote-app">
<div className="vote-app__influence">
<div className="vote-app__top">
<div className="vote-app__influence">
<div className="vote-app__influence-description">
<Influence className="vote-app__influence-section" type="normal"/>
<Influence className="vote-app__influence-section" type="golden"/>
<div className="vote-app__title">
Vote
</div>
<div className="vote-app__influence">
<div className="vote-app__top">
<div className="vote-app__influence">
<div className="vote-app__influence-description">
<Influence className="vote-app__influence-section" type="normal"/>
<Influence className="vote-app__influence-section" type="golden"/>
</div>
<div className="vote-app__influence-disclaimer">
DISCLAIMER: Since this feature is its Alpha stages, the formula for calculating influence may change.
</div>
</div>
<div className="vote-app__influence-disclaimer">
DISCLAIMER: Since this feature is its Alpha stages, the formula for calculating influence may change.
<div className="vote-app__user-section">
{this.renderSelf(inProgress)}
</div>
</div>
<div className="vote-app__user-section">
{this.renderSelf(inProgress)}
</div>
</div>
</div>
{ listInfo && <div>
<h1>{listInfo.displayName}</h1>
<div>{listInfo.description}</div>
Expand Down Expand Up @@ -270,7 +273,7 @@ export default class VoteApp extends React.Component {
return <div className="vote-app__self-info">Loading user info...</div>;
}
return <div className="vote-app__login-button"><button onClick={() => {
api.startLogin(window.location + "");
api.startLogin(window.location + "");
}}>Login with Github <img src={GithubMark}/> </button></div>;
} else {
return <div className="vote-app__self-info">
Expand Down