Skip to content

Commit

Permalink
OurLandHK#371 Update new log and title bar color
Browse files Browse the repository at this point in the history
  • Loading branch information
khmak3 committed Oct 15, 2018
1 parent 0dee170 commit 475c35d
Show file tree
Hide file tree
Showing 19 changed files with 22 additions and 17 deletions.
Binary file removed public/images/HoriLogo.jpg
Binary file not shown.
Binary file removed public/images/squareLogo.jpg
Binary file not shown.
Binary file added public/images/我地市正Logo-01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/我地市正Logo-02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/AboutDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const Transition = props => {
const styles = {
appBar: {
position: 'relative',
background: 'linear-gradient(to bottom, #006fbf 50%, #014880 50%)',
},
flex: {
flex: 1,
Expand Down
1 change: 1 addition & 0 deletions src/EventListDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ function Transition(props) {
const styles = {
appBar: {
position: 'relative',
background: 'linear-gradient(to bottom, #006fbf 50%, #014880 50%)',
},
flex: {
flex: 1,
Expand Down
4 changes: 2 additions & 2 deletions src/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const styles = theme => ({
height: 64,
},
dialogTitle: {
background: 'linear-gradient(to bottom, #00aed9 50%, #003e89 50%)',
background: 'linear-gradient(to bottom, #006fbf 50%, #014880 50%)',
},
flex: {

Expand Down Expand Up @@ -56,7 +56,7 @@ class Header extends Component {
let homeUrl = window.location.protocol + "//" + window.location.hostname;
return (<AppBar className={classes.dialogTitle}>
<Toolbar>
<CardMedia className={classes.cover} image={"/images/squareLogo.jpg"} onClick={() => {window.location.href = homeUrl}}/>
<CardMedia className={classes.cover} image={"/images/我地市正Logo-01.png"} onClick={() => {window.location.href = homeUrl}}/>
<SignInButton/>
<TextField id={constant.searchLabel} className={classes.searchInput} variant="outlined" fullWidth margin="normal" value={constant.searchLabel} endAdornment={<InputAdornment position="end"><SearchIcon/></InputAdornment>} onClick={() => this.props.toggleSearchEventDialog(true)}/>
</Toolbar>
Expand Down
2 changes: 1 addition & 1 deletion src/LocationButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const styles = theme => ({
flex: 1,
},
dialogTitle: {
background: 'linear-gradient(to bottom, #00aed9 50%, #003e89 50%)',
background: 'linear-gradient(to bottom, #006fbf 50%, #014880 50%)',
},
showMapBtn: {
width: '100%'
Expand Down
2 changes: 1 addition & 1 deletion src/MessageDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const styles = theme => ({
},
dialogTitle: {
position: 'relative',
background: 'linear-gradient(to bottom, #00aed9 50%, #003e89 50%)',
background: 'linear-gradient(to bottom, #006fbf 50%, #014880 50%)',
},
root: {
paddingRight: 0
Expand Down
3 changes: 1 addition & 2 deletions src/MessageView.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ const styles = theme => ({
color: theme.palette.primary.light,
},
titleBar: {
background:
'linear-gradient(to top, rgba(0,0,0,0.7) 0%, rgba(0,0,0,0.3) 70%, rgba(0,0,0,0) 100%)',
background: 'linear-gradient(to bottom, #006fbf 50%, #014880 50%)',
},
});

Expand Down
2 changes: 1 addition & 1 deletion src/PostMessageView.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const styles = theme => ({
padding: '0.5rem'
},
dialogTitle: {
background: 'linear-gradient(to bottom, #00aed9 50%, #003e89 50%)',
background: 'linear-gradient(to bottom, #006fbf 50%, #014880 50%)',
},
signButton: {
fontWeight: 'bold',
Expand Down
4 changes: 2 additions & 2 deletions src/SearchEventDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function Transition(props) {
const styles = theme => ({
appBar: {
position: 'relative',
background: 'linear-gradient(to bottom, #00aed9 50%, #003e89 50%)',
background: 'linear-gradient(to bottom, #006fbf 50%, #014880 50%)',
},
flex: {
flex: 1,
Expand Down Expand Up @@ -100,7 +100,7 @@ const styles = theme => ({
flex: 1,
},
dialogTitle: {
background: 'linear-gradient(to bottom, #00aed9 50%, #003e89 50%)',
background: 'linear-gradient(to bottom, #006fbf 50%, #014880 50%)',
}
});

Expand Down
2 changes: 1 addition & 1 deletion src/UploadImageButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const styles = theme => ({
display: 'none',
},
dialogTitle: {
background: 'linear-gradient(to bottom, #00aed9 50%, #003e89 50%)',
background: 'linear-gradient(to bottom, #006fbf 50%, #014880 50%)',
},
previewThumbnail: {
width: '128px',
Expand Down
1 change: 1 addition & 0 deletions src/UserProfileView.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const homeLocationLabel = "屋企位置";
const styles = {
appBar: {
position: 'relative',
background: 'linear-gradient(to bottom, #006fbf 50%, #014880 50%)',
},
flex: {
flex: 1,
Expand Down
1 change: 1 addition & 0 deletions src/address/AddressDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ function Transition(props) {
const styles = {
appBar: {
position: 'relative',
background: 'linear-gradient(to bottom, #006fbf 50%, #014880 50%)',
},
flex: {
flex: 1,
Expand Down
11 changes: 6 additions & 5 deletions src/bookmark/BookmarkBoard.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ function Transition(props) {
}

const styles = {
appBar: {
position: 'relative',
},
flex: {
flex: 1,
},
Expand All @@ -48,7 +45,11 @@ const styles = {
bottom:'0',
right:'0',
fontSize:'0.5rem',
}
},
dialogTitle: {
position: 'relative',
background: 'linear-gradient(to bottom, #006fbf 50%, #014880 50%)',
},
};

function Transition(props) {
Expand Down Expand Up @@ -137,7 +138,7 @@ class BookmarkBoard extends React.Component {
</ListItem>
</div>
<Dialog fullScreen open={this.state.open} onRequestClose={this.handleRequestClose} transition={Transition} unmountOnExit>
<AppBar className={classes.appBar}>
<AppBar className={classes.dialogTitle}>
<Toolbar>
<IconButton color="contrast" onClick={this.handleRequestClose} aria-label="Close">
<CloseIcon />
Expand Down
2 changes: 1 addition & 1 deletion src/bookmark/BookmarkView.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const styles = theme => ({
flex: 1,
},
dialogTitle: {
background: 'linear-gradient(to bottom, #00aed9 50%, #003e89 50%)',
background: 'linear-gradient(to bottom, #006fbf 50%, #014880 50%)',
},
summaryGrid: {
display: 'inline-grid',
Expand Down
2 changes: 1 addition & 1 deletion src/comment/PostCommentView.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const styles = theme => ({
padding: '0.5rem'
},
dialogTitle: {
background: 'linear-gradient(to bottom, #00aed9 50%, #003e89 50%)',
background: 'linear-gradient(to bottom, #006fbf 50%, #014880 50%)',
}
});

Expand Down
1 change: 1 addition & 0 deletions src/mission/MissionView.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const styles = theme => ({
paper: {},
appBar: {
position: 'relative',
background: 'linear-gradient(to bottom, #006fbf 50%, #014880 50%)',
},
flex: {
flex: 1,
Expand Down

0 comments on commit 475c35d

Please # to comment.