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.

Sign up for GitHub

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

Jump to bottom

Improve[UI]: Responsive footer, overlapping of footer and div in contribute page and buttons spacing on collection page for better UI #597

Closed
wants to merge 15 commits into from
Closed

Improve[UI]: Responsive footer, overlapping of footer and div in contribute page and buttons spacing on collection page for better UI #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2004625
fix (display): responsive footer
trishnakalita660 Apr 5, 2021
418562e
fix (display): added left margin to buttons on collection page and fi…
trishnakalita660 Apr 5, 2021
d64bd4f
fix (display): added left margin to buttons on collection page and fi…
trishnakalita660 Apr 6, 2021
513b085
fix (display): fixed the overlapping of footer and div
trishnakalita660 Apr 6, 2021
694f3bd
Fix code style issues with ESLint
lint-action Apr 6, 2021
86d547d
Implementing changes
trishnakalita660 Apr 19, 2021
d84a5c7
Added files to .gitignore
trishnakalita660 Apr 19, 2021
cba3e93
Implemented changes
trishnakalita660 Apr 19, 2021
55262f5
Fix code style issues with ESLint
lint-action Apr 19, 2021
3445f85
Added files to git ignore
trishnakalita660 Apr 19, 2021
88af454
Merge branch 'trishna' of https://github.com/trishnakalita660/bookbra…
trishnakalita660 Apr 19, 2021
4cbe075
Changes implementation
trishnakalita660 Apr 19, 2021
bb1acc2
Fix code style issues with ESLint
lint-action Apr 19, 2021
05ba8ff
Changes Implementation
trishnakalita660 Apr 20, 2021
0b3dddb
Merge branch 'trishna' of https://github.com/trishnakalita660/bookbra…
trishnakalita660 Apr 20, 2021
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
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
/static/**/*.svg

### Node ###


# Logs
logs
*.log
Expand Down Expand Up @@ -86,4 +88,4 @@ typings/
.vscode

# Git revision file used in the website
.git-revision
.git-revision
35 changes: 24 additions & 11 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions src/client/components/footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function Footer(props) {
<footer className="footer">
<Grid fluid>
<Row>
<Col xs={4}>
<Col xs={4} >
<small>{'Tested with '}
<a
href="https://www.browserstack.com/"
Expand All @@ -42,8 +42,9 @@ function Footer(props) {
>
<img
alt="BrowserStack Logo"
height="25"
height="22"
src="/images/BrowserStack.png"
width="95"
MonkeyDo marked this conversation as resolved.
Show resolved Hide resolved
/>
</a>
</small>
Expand Down
13 changes: 8 additions & 5 deletions src/client/components/pages/collection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,13 +264,14 @@ class CollectionPage extends React.Component {
</Row>
<EntityTable{...propsForTable}/>
{messageComponent}
<div className="margin-top-1 text-left">

<div className="margin-top-1 margin-bottom-1 text-left">
{
this.props.isCollaborator || this.props.isOwner ?
<Button
bsSize="small"
bsStyle="success"
className="margin-bottom-d5"
className="margin-right-d5"
title={`Add ${this.props.collection.entityType}`}
onClick={this.handleShowAddEntityModal}
>
Expand All @@ -283,8 +284,9 @@ class CollectionPage extends React.Component {
<Button
bsSize="small"
bsStyle="danger"
className="margin-bottom-d5"
className="margin-right-d5"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
className="margin-right-d5"
className="margin-bottom-d5 margin-right-d5"

disabled={!this.state.selectedEntities.length}
style={{marginRight: '0.5rem'}}
MonkeyDo marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The style can be removed, since we're using the class margin-right-d5 instead.

title={`Remove selected ${_.kebabCase(this.props.collection.entityType)}s`}
onClick={this.handleRemoveEntities}
>
Expand All @@ -298,8 +300,9 @@ class CollectionPage extends React.Component {
<Button
bsSize="small"
bsStyle="warning"
className="margin-bottom-d5"
className="margin-right-d5"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
className="margin-right-d5"
className="margin-bottom-d5 margin-right-d5"

href={`/collection/${this.props.collection.id}/edit`}
style={{marginRight: '0.5rem'}}
MonkeyDo marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The style can be removed, since we're using the class margin-right-d5 instead.

title="Edit Collection"
>
<FontAwesomeIcon icon={faPencilAlt}/>&nbsp;Edit collection
Expand All @@ -310,7 +313,7 @@ class CollectionPage extends React.Component {
<Button
bsSize="small"
bsStyle="danger"
className="margin-bottom-d5"
className="margin-bottom-1 margin-right-d5"
title="Delete Collection"
onClick={this.handleShowDeleteModal}
>
Expand Down
3 changes: 2 additions & 1 deletion src/client/components/pages/contribute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ function ContributePage() {
'en/latest/style/introduction/';

return (
<div>

<div className="margin-bottom-1">
<PageHeader>Contributing to BookBrainz</PageHeader>
<p className="lead">
There are many ways that you can contribute to the
Expand Down