Skip to content

updates on the software and color changes #12

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

updates on the software and color changes #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
"node-sass-chokidar": "0.0.3",
"npm-run-all": "^4.0.2",
"prop-types": "^15.6.0",
"react": "^15.5.4",
"react-dom": "^15.5.4",
"react-redux": "^5.0.5",
"redux": "^3.7.1",
"redux-thunk": "^2.2.0"
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react-redux": "^7.1.0",
"redux": "^4.0.4",
"redux-thunk": "^2.3.0"
},
"homepage": "http://cyan33.github.io/tetris-redux",
"devDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions src/components/styles/InfoPanel.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
.info-container .next-tetro {
position: relative;
min-height: 220px;
background-color: #a2e2ef; }
background-color: #aef1ff; }
@media screen and (max-width: 451px) {
.info-container .next-tetro {
display: none; } }
Expand All @@ -39,7 +39,7 @@
height: 100%; }
.info-container .score {
min-height: 165px;
background-color: #5fd1d7; }
background-color: #60f7ff; }
@media screen and (max-width: 451px) {
.info-container .score {
display: none; } }
Expand All @@ -65,11 +65,11 @@
border: none;
outline: none;
border-radius: 20px;
background-color: #ef9d9d; }
background-color: #ffb9b9; }
.info-container .control-buttons .start-game .gameStatus-btn:nth-of-type(1) {
margin-right: 15px; }
.info-container .control-buttons .start-game .gameStatus-btn:active {
background-color: #ef7c7c; }
background-color: #ff7a7a; }
.info-container .directions-control {
display: flex;
flex-direction: row;
Expand All @@ -85,7 +85,7 @@
cursor: pointer;
font-size: 25px;
color: #216fa7;
background-color: #cdf3bf;
background-color: #c2ffac;
border-radius: 0; }
.info-container .directions-control .d-btn button:not(:nth-of-type(4)) {
border-right: 1px solid #44b4cf; }
Expand Down
4 changes: 2 additions & 2 deletions src/components/styles/Well.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.well-container {
position: relative;
flex-basis: 295px;
background-color: #e4faff; }
background-color: #aaefff9f; }
@media screen and (max-width: 451px) {
.well-container {
flex-basis: 100%; } }
Expand Down Expand Up @@ -34,6 +34,6 @@
padding: 15px;
line-height: 2;
overflow: hidden;
background: rgba(228, 250, 255, 0.5); }
background: rgba(123, 231, 255, 0.5); }
.well-container .overlay a {
text-decoration: none; }
24 changes: 12 additions & 12 deletions src/components/styles/colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
$transparent-blue: #e4faff;
$transparent-blue-transparent: rgba(228, 250, 255, 0.5);
$light-blue: #a2e2ef;
$mid-blue: #5fd1d7;
$transparent-blue: #aaefff9f;
$transparent-blue-transparent: rgba(123, 231, 255, 0.5);
$light-blue: #aef1ff;
$mid-blue: #60f7ff;
$deep-blue1: #5485cd;
$deep-blue2: #44b4cf;
$deep-blue3: #216fa7;
$deepest-blue: #0d2e6d;
$light-green: #cdf3bf;
$light-green: #c2ffac;
$mid-green: #b3f59b;
$mint: #24c4a0;
$pink: #ef9d9d;
$deep-pink: #ef7c7c;
$pink: #ffb9b9;
$deep-pink: #ff7a7a;

$tetro-blue: #67b0d4;
$tetro-purple: #7a4084;
$tetro-yellow: #f6d42b;
$tetro-pink: #fcbab8;
$tetro-orange: #f9b26c;
$tetro-blue: #35bcff;
$tetro-purple: #5a1366;
$tetro-yellow: #dab709;
$tetro-pink: #ffcbca;
$tetro-orange: #f8a552;
Loading