diff --git a/README.md b/README.md index a5a5d73..5a7ab9b 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@

- React Social Network :rocket: Version NEXT! :rocket: + React Social Network :rocket: Version NEXT! :rocket:

[![Gitter](https://badges.gitter.im/react-social-network/Lobby.svg)](https://gitter.im/react-social-network/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) diff --git a/docs/README.md b/docs/README.md index a5a5d73..5a7ab9b 100644 --- a/docs/README.md +++ b/docs/README.md @@ -6,7 +6,7 @@

- React Social Network :rocket: Version NEXT! :rocket: + React Social Network :rocket: Version NEXT! :rocket:

[![Gitter](https://badges.gitter.im/react-social-network/Lobby.svg)](https://gitter.im/react-social-network/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) diff --git a/public/index.html b/public/index.html index 99917f8..4e53d0c 100644 --- a/public/index.html +++ b/public/index.html @@ -98,7 +98,7 @@ -moz-background-clip: text; background-clip: text; color: transparent; - font-weight: 100; + font-weight: 400; } .load-progress { diff --git a/src/components/comment/CommentComponent.tsx b/src/components/comment/CommentComponent.tsx index 9c747e4..f886063 100644 --- a/src/components/comment/CommentComponent.tsx +++ b/src/components/comment/CommentComponent.tsx @@ -43,7 +43,7 @@ import { ICommentComponentState } from './ICommentComponentState' const styles = (theme: any) => ({ textField: { - fontWeight: 100, + fontWeight: 400, fontSize: '14px' }, header: { @@ -66,7 +66,7 @@ const styles = (theme: any) => ({ }, commentBody: { color: 'black', - fontWeight: 100, + fontWeight: 400, fontSize: '12px', height: '100%', border: 'none', @@ -126,7 +126,7 @@ export class CommentComponent extends Component (
{comment.userDisplayName}{moment.unix(comment.creationDate!).fromNow()}
diff --git a/src/components/commentGroup/CommentGroupComponent.tsx b/src/components/commentGroup/CommentGroupComponent.tsx index dd29f83..8424734 100644 --- a/src/components/commentGroup/CommentGroupComponent.tsx +++ b/src/components/commentGroup/CommentGroupComponent.tsx @@ -38,7 +38,7 @@ import { ServerRequestStatusType } from 'actions/serverRequestStatusType' const styles = (theme: any) => ({ textField: { - fontWeight: 100, + fontWeight: 400, fontSize: '14px' }, header: { @@ -46,7 +46,7 @@ const styles = (theme: any) => ({ }, commentBody: { color: 'black', - fontWeight: 100, + fontWeight: 400, fontSize: '12px', height: '100%', border: 'none', @@ -116,7 +116,7 @@ export class CommentGroupComponent extends Component (
{comment.userDisplayName}{moment.unix(comment.creationDate!).fromNow()}
diff --git a/src/components/emailVerification/EmailVerificationComponent.tsx b/src/components/emailVerification/EmailVerificationComponent.tsx index 5e76126..a3b73b3 100644 --- a/src/components/emailVerification/EmailVerificationComponent.tsx +++ b/src/components/emailVerification/EmailVerificationComponent.tsx @@ -26,7 +26,7 @@ export class EmailVerificationComponent extends Component ({ voteCounter: { color: 'rgb(134, 129, 129)', fontSize: 10, - fontWeight: 100, + fontWeight: 400, padding: 2 }, commentCounter: { color: 'rgb(134, 129, 129)', fontSize: 10, - fontWeight: 100, + fontWeight: 400, padding: 4 }, popperOpen: { @@ -90,7 +90,7 @@ const styles = (theme: any) => ({ textAlign: 'center', marginTop: '10px', color: '#1e882d', - fontWeight: 100 + fontWeight: 400 }, postBody: { wordWrap: 'break-word', diff --git a/src/components/postWrite/PostWriteComponent.tsx b/src/components/postWrite/PostWriteComponent.tsx index afeed08..9abcdd1 100644 --- a/src/components/postWrite/PostWriteComponent.tsx +++ b/src/components/postWrite/PostWriteComponent.tsx @@ -412,7 +412,7 @@ export class PostWriteComponent extends Component{this.props.ownerDisplayName} | {translate!('post.public')} @@ -488,7 +488,7 @@ export class PostWriteComponent extends Component diff --git a/src/components/profileHeader/ProfileHeaderComponent.tsx b/src/components/profileHeader/ProfileHeaderComponent.tsx index 757b568..dcee032 100644 --- a/src/components/profileHeader/ProfileHeaderComponent.tsx +++ b/src/components/profileHeader/ProfileHeaderComponent.tsx @@ -2,6 +2,9 @@ import React, { Component } from 'react' import { connect } from 'react-redux' import PropTypes from 'prop-types' +import config from 'src/config' + +// - Material UI import { grey } from 'material-ui/colors' import IconButton from 'material-ui/IconButton' import MoreVertIcon from 'material-ui-icons/MoreVert' @@ -172,7 +175,7 @@ export class ProfileHeaderComponent extends Component + fileName={this.props.banner || config.settings.defaultProfileCover} /> diff --git a/src/config/environment.dev.ts b/src/config/environment.dev.ts index 2a8ed50..b253835 100644 --- a/src/config/environment.dev.ts +++ b/src/config/environment.dev.ts @@ -11,6 +11,7 @@ export const environment = { }, settings: { appName: 'Green', + defaultProfileCover: 'https://firebasestorage.googleapis.com/v0/b/open-social-33d92.appspot.com/o/images%2F751145a1-9488-46fd-a97e-04018665a6d3.JPG?alt=media&token=1a1d5e21-5101-450e-9054-ea4a20e06c57', defaultLanguage: LanguageType.English }, theme: { diff --git a/src/config/environment.prod.ts b/src/config/environment.prod.ts index 2a8ed50..b253835 100644 --- a/src/config/environment.prod.ts +++ b/src/config/environment.prod.ts @@ -11,6 +11,7 @@ export const environment = { }, settings: { appName: 'Green', + defaultProfileCover: 'https://firebasestorage.googleapis.com/v0/b/open-social-33d92.appspot.com/o/images%2F751145a1-9488-46fd-a97e-04018665a6d3.JPG?alt=media&token=1a1d5e21-5101-450e-9054-ea4a20e06c57', defaultLanguage: LanguageType.English }, theme: { diff --git a/src/styles/app.css b/src/styles/app.css index b1c2d56..88252ec 100644 --- a/src/styles/app.css +++ b/src/styles/app.css @@ -719,7 +719,7 @@ g__input-underline::after { .homeHeader__notify div.title { color: white; font-size: 10px; - font-weight: 100; + font-weight: 400; white-space: nowrap; -webkit-flex-shrink: 1; flex-shrink: 1; @@ -787,7 +787,7 @@ g__input-underline::after { .homeHeader__notify-menu div.container div.content div.item div.info div.description { color: rgba(0, 0, 0, 0.54); font-size: 14px; - font-weight: 200; + font-weight: 400; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } diff --git a/src/styles/components/_homeHeader.scss b/src/styles/components/_homeHeader.scss index e1e35ce..cb6685f 100644 --- a/src/styles/components/_homeHeader.scss +++ b/src/styles/components/_homeHeader.scss @@ -47,7 +47,7 @@ div.title { color: white; font-size: 10px; - font-weight: 100; + font-weight: 400; white-space: nowrap; -webkit-flex-shrink: 1; flex-shrink: 1; @@ -120,7 +120,7 @@ div.description { color: rgba(0, 0, 0, 0.54); font-size: 14px; - font-weight: 200; + font-weight: 400; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;