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

Consistent Button Styling and Centering of Page / Buttons #13

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
Open

Consistent Button Styling and Centering of Page / Buttons #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
287d716
body is now display flex with content center
mgpeters Jan 30, 2020
92ec339
merged latest dev branch
mgpeters Jan 30, 2020
5291bb8
centered new unit button
mgpeters Jan 30, 2020
b3d45bb
submissions buttons are same style
mgpeters Jan 30, 2020
209bb49
missed the new unit button, all same now
mgpeters Jan 30, 2020
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
2 changes: 1 addition & 1 deletion client/components/NewUnitModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function NewUnitModal (props) {
<input id="unit-description" type="text" name="unit-description" /><br></br>
Sub-Units:<br></br>
<input id="sub-units" type="text" name="sub-units" /><br></br>
<Link to="/main-container"><button onClick={ props.addUnit } value="Add Unit" className="addUnit" type="button">Add Unit</button></Link>
<Link to="/main-container"><button onClick={ props.addUnit } value="Add Unit" className="addUnit submission" type="button">Add Unit</button></Link>
</form>
</div>
)
Expand Down
1 change: 1 addition & 0 deletions client/containers/LoginContainer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ function LoginContainer(props) {
<button
type="submit"
value="login"
className="submission"
// onClick={(e) => {
// e.preventDefault();
// console.log(e.target.value);
Expand Down
6 changes: 3 additions & 3 deletions client/containers/MainContainer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ function MainContainer (props) {
<NavBar
units={ props.units }
updateCurrentUnit= { props.updateCurrentUnit } />
<nav id='navBar'>
<ul id='navbarList'>
<Link to='/main-container/create-unit'>Create New Unit</Link>
<nav id='navBar' className='new-unit-navbar'>
<ul id='navbarList' className='new-unit-button'>
<Link to='/main-container/create-unit'>CREATE NEW UNIT</Link>
</ul>
</nav>
<Switch>
Expand Down
2 changes: 1 addition & 1 deletion client/containers/SignUpContainer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function SignUpContainer(props) {
<input name="password" type="password" />
<input type="submit" value="Create User" />
</form>
<Link to="/">Log In</Link>
<Link className='submission' to='/'>Log In</Link>
</div>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion client/containers/UnitContainer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class UnitContainer extends React.Component {
/>
<Resources
resources={ this.props.currentResources } />
<button onClick={() => this.props.deleteUnit(this.props.currentUnitData.id.toString())} className="deleteUnit" type="button">Delete Unit</button>
<button onClick={() => this.props.deleteUnit(this.props.currentUnitData.id.toString())} className="deleteUnit submission" type="button">Delete Unit</button>
</div>
:
<div></div> }
Expand Down
28 changes: 28 additions & 0 deletions client/style/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
}

body {
display: flex;
justify-content: center;
background-color: #020C25;
color: white;
}
Expand Down Expand Up @@ -80,6 +82,16 @@ a:hover {
background-color: #02A3E9;
}

.new-unit-navbar {
display: flex;
justify-content: center;
}

.new-unit-button {
align-items: center;
text-align: center;
}

.flashCardList {
display: flex;
flex-wrap: wrap;
Expand Down Expand Up @@ -110,6 +122,22 @@ a:hover {
margin-left: 10px;
}

.submission {
background-color: #02A3E9;
color: white;
width: 150px;
height: 60px;
border-radius: 3px;
font-size: 15px;
margin-left: 10px;
}


.submission:hover {
background-color: white;
color: #02A3E9;
}

#add:hover {
background-color: white;
color: #02A3E9;
Expand Down