Skip to content

Natasha #7

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

Open
natasharojany wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Natasha #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2a5c82
changed total display font size to small
natasharojany Mar 4, 2019
da28b7c
Button Colors & Added Buttons
natasharojany Mar 7, 2019
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
82 changes: 22 additions & 60 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.

10 changes: 5 additions & 5 deletions src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ button {

.App-logo {
animation: App-logo-spin infinite 20s linear;
height: 40vmin;
height: 50vmin;
Copy link
Copy Markdown

@lancedavenport lancedavenport Mar 7, 2019

Choose a reason for hiding this comment

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

What part does this affect?

pointer-events: none;
}

Expand Down Expand Up @@ -48,19 +48,19 @@ button {
font-size: small;
padding: 5px;
width: 100%;
background-color: pink;
background-color: purple;
}

#total-display {
font-size: large;
font-size: small;
}

#adders button {
background-color: yellowgreen;
background-color: violet;
}

#controllers button {
background-color: orange;
background-color: pink;
Copy link
Copy Markdown

@lancedavenport lancedavenport Mar 7, 2019

Choose a reason for hiding this comment

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

This color is cool.

}

@keyframes App-logo-spin {
Expand Down
3 changes: 2 additions & 1 deletion src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

import React, { Component } from 'react';
import './App.css';

Expand Down Expand Up @@ -74,7 +75,7 @@ class App extends Component {
return (
<div className="App container">
<div id="adders" className="row">
{[4, 6, 8, 10, 100, 12, 20].map((faces, key) => {
{[4, 6, 8, 10, 15,20,30,40,50,60,80,100].map((faces, key) => {
Copy link
Copy Markdown

@lancedavenport lancedavenport Mar 7, 2019

Choose a reason for hiding this comment

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

Woah! You really added a lot of die. Props to you.

return (
<button className="col" key={key} onClick={() => {this.addDie(faces);}}>
+d{faces}
Expand Down