m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-22 17:33:23 +01:00
Code

Fixes lint errors and adds stylelint-config-standard to package.json

Browse Source
This commit is contained in:
Dan 2017-08-29 13:09:47 -02:30 committed by Chi Kei Chan
parent e7b3ef0708
commit 5452a26b36
8 changed files with 58 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gulpfile.js
View File

@ -196,7 +196,8 @@ gulp.task('lint-scss', function() {
.pipe(gulpStylelint({ .pipe(gulpStylelint({
reporters: [ reporters: [
{formatter: 'string', console: true} {formatter: 'string', console: true}
] ],
fix: true,
})); }));
}); });

1
package.json
View File

@ -194,6 +194,7 @@
"react-test-renderer": "^15.5.4", "react-test-renderer": "^15.5.4",
"react-testutils-additions": "^15.2.0", "react-testutils-additions": "^15.2.0",
"sinon": "^2.3.8", "sinon": "^2.3.8",
"stylelint-config-standard": "^17.0.0",
"tape": "^4.5.1", "tape": "^4.5.1",
"testem": "^1.10.3", "testem": "^1.10.3",
"uglifyify": "^4.0.2", "uglifyify": "^4.0.2",

5
ui/app/css/itcss/components/account-dropdown.scss
View File

@ -1,13 +1,10 @@
.account-dropdown-name {
}
.account-dropdown-balance { .account-dropdown-balance {
color: $dusty-gray; color: $dusty-gray;
} }
.account-dropdown-edit-button { .account-dropdown-edit-button {
color: $dusty-gray; color: $dusty-gray;
&:hover { &:hover {
color: $white; color: $white;
} }

5
ui/app/css/itcss/components/buttons.scss
View File

@ -27,10 +27,11 @@ button.btn-clear {
// box-shadow: 0px 3px 6px rgba(254, 35, 17, 0.36); // box-shadow: 0px 3px 6px rgba(254, 35, 17, 0.36);
// } // }
button[disabled], input[type="submit"][disabled] { button[disabled],
input[type="submit"][disabled] {
cursor: not-allowed; cursor: not-allowed;
background: rgba(197, 197, 197, 1); background: rgba(197, 197, 197, 1);
box-shadow: 0px 3px 6px rgba(197, 197, 197, 0.36); box-shadow: 0 3px 6px rgba(197, 197, 197, .36);
} }
// button.spaced { // button.spaced {

2
ui/app/css/itcss/components/hero-balance.scss
View File

@ -105,7 +105,7 @@
font-size: .6em; font-size: .6em;
border-color: $curious-blue; border-color: $curious-blue;
color: $curious-blue; color: $curious-blue;
padding: 0px; padding: 0;
} }
} }
} }

1
ui/app/css/itcss/components/index.scss
View File

@ -14,7 +14,6 @@
@import './send.scss'; @import './send.scss';
// Balances // Balances
@import './hero-balance.scss'; @import './hero-balance.scss';

61
ui/app/css/itcss/components/modal.scss
View File

@ -152,7 +152,7 @@
width: 33%; width: 33%;
height: 45px; height: 45px;
margin: 15px; margin: 15px;
font-weight: bold; font-weight: 700;
margin-top: 25px; margin-top: 25px;
} }
@ -172,7 +172,7 @@
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
position: relative; position: relative;
padding: 5px 0px; padding: 5px 0;
border-radius: 4px; border-radius: 4px;
} }
@ -188,7 +188,7 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
border: 1px solid $alto; border: 1px solid $alto;
padding: 5px 10px 5px 10px; padding: 5px 10px;
} }
.account-details-modal-wrapper .btn-clear { .account-details-modal-wrapper .btn-clear {
@ -196,7 +196,6 @@
font-size: 1em; font-size: 1em;
border-color: $curious-blue; border-color: $curious-blue;
color: $curious-blue; color: $curious-blue;
padding: 0px;
border-radius: 2px; border-radius: 2px;
flex-basis: 100%; flex-basis: 100%;
width: 75%; width: 75%;
@ -208,7 +207,7 @@
.account-details-modal-divider { .account-details-modal-divider {
width: 100%; width: 100%;
height: 1px; height: 1px;
margin: 10px 0px; margin: 10px 0;
background-color: $alto; background-color: $alto;
} }
@ -216,13 +215,13 @@
margin-top: -55.5%; margin-top: -55.5%;
} }
.account-details-modal-close:after { .account-details-modal-close::after {
content: '\00D7'; content: '\00D7';
font-size: 1.5em; font-size: 1.5em;
color: grey; color: $alto;
position: absolute; position: absolute;
top: 5px; top: 5px;
right: 10px; right: 10px;
} }
// New Account Modal // New Account Modal
@ -246,14 +245,14 @@
color: $nile-blue; color: $nile-blue;
} }
.modal-close-x:after { .modal-close-x::after {
content: '\00D7'; content: '\00D7';
font-size: 2em; font-size: 2em;
color: $dusty-gray; color: $dusty-gray;
position: absolute; position: absolute;
top: 25px; top: 25px;
right: 17.5px; right: 17.5px;
font-family: sans-serif; font-family: sans-serif;
} }
.new-account-modal-content { .new-account-modal-content {
@ -283,26 +282,30 @@
border: 1px solid $alto; border: 1px solid $alto;
width: 70%; width: 70%;
font-size: 1em; font-size: 1em;
font-color: $alto; color: $alto;
} }
// For reference on below placeholder selectors: https://stackoverflow.com/questions/2610497/change-an-html5-inputs-placeholder-color-with-css // For reference on below placeholder selectors: https://stackoverflow.com/questions/2610497/change-an-html5-inputs-placeholder-color-with-css
.new-account-input::-webkit-input-placeholder { .new-account-input::-webkit-input-placeholder {
color: $dusty-gray; color: $dusty-gray;
} }
.new-account-input:-moz-placeholder { .new-account-input:-moz-placeholder {
color: $dusty-gray; color: $dusty-gray;
opacity: 1; opacity: 1;
} }
.new-account-input::-moz-placeholder { .new-account-input::-moz-placeholder {
color: $dusty-gray; color: $dusty-gray;
opacity: 1; opacity: 1;
} }
.new-account-input:-ms-input-placeholder { .new-account-input:-ms-input-placeholder {
color: $dusty-gray; color: $dusty-gray;
} }
.new-account-input::-ms-input-placeholder { .new-account-input::-ms-input-placeholder {
color: $dusty-gray; color: $dusty-gray;
} }
.new-account-modal-content.button { .new-account-modal-content.button {
@ -311,7 +314,7 @@
.new-account-modal-wrapper .btn-clear { .new-account-modal-wrapper .btn-clear {
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: 700;
background: $white; background: $white;
border: 1px solid; border: 1px solid;
border-radius: 2px; border-radius: 2px;

35
ui/app/css/itcss/components/send.scss
View File

@ -11,7 +11,6 @@
@media screen and (max-width: $break-small) { @media screen and (max-width: $break-small) {
top: 33px; top: 33px;
} }
} }
.send-screen-card { .send-screen-card {
@ -22,7 +21,7 @@
margin-left: 3.5%; margin-left: 3.5%;
margin-right: 3.5%; margin-right: 3.5%;
background: $white; background: $white;
box-shadow: 0 2px 4px 0 rgba(0,0,0,0.08); box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .08);
} }
/* Send Screen */ /* Send Screen */
@ -41,7 +40,7 @@
width: 45px; width: 45px;
height: 45px; height: 45px;
border: 1px solid $alto; border: 1px solid $alto;
box-shadow: 0 2px 4px 0 rgba(0,0,0,0.08); box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .08);
} }
.send-screen-input-wrapper { .send-screen-input-wrapper {
@ -58,7 +57,7 @@
height: 41px; height: 41px;
border-radius: 3px; border-radius: 3px;
background-color: #f3f3f3; background-color: #f3f3f3;
border-width: 0px; border-width: 0;
border-style: none; border-style: none;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -109,39 +108,37 @@
bottom: 50px; bottom: 50px;
width: 237px; width: 237px;
height: 307px; height: 307px;
background-color: white; background-color: $white;
opacity: 1; opacity: 1;
box-shadow: grey 0px 0px 5px; box-shadow: $alto 0 0 5px;
z-index: 1050; z-index: 1050;
padding: 13px 19px; padding: 13px 19px;
font-size: 16px; font-size: 16px;
border-radius: 4px; border-radius: 4px;
font-family: 'Lato'; font-family: 'Lato';
font-weigth: 500; font-weight: 500;
} }
.gas-tooltip-arrow { .gas-tooltip-arrow {
height: 25px; height: 25px;
width: 25px; width: 25px;
z-index: 1200; z-index: 1200;
background: white; background: $white;
position: absolute; position: absolute;
-webkit-transform: rotate(45deg);
transform: rotate(45deg); transform: rotate(45deg);
left: 107px; left: 107px;
top: 294px; top: 294px;
-webkit-box-shadow: 0 0 5px grey;
box-shadow: 2px 2px 2px $alto; box-shadow: 2px 2px 2px $alto;
} }
.customize-gas-tooltip-container input[type=number]::-webkit-inner-spin-button { .customize-gas-tooltip-container input[type="number"]::-webkit-inner-spin-button {
-webkit-appearance: none; -webkit-appearance: none;
display:none; display: none;
} }
.customize-gas-tooltip-container input[type=number]:hover::-webkit-inner-spin-button { .customize-gas-tooltip-container input[type="number"]:hover::-webkit-inner-spin-button {
-webkit-appearance: none; -webkit-appearance: none;
display:none; display: none;
} }
.customize-gas-tooltip { .customize-gas-tooltip {
@ -194,15 +191,15 @@
.gas-tooltip-input-arrows { .gas-tooltip-input-arrows {
position: absolute; position: absolute;
top: 0px; top: 0;
left: 178px; left: 178px;
width: 17px; width: 17px;
height: 28px; height: 28px;
border: 1px solid #dadada; border: 1px solid #dadada;
border-left: 0px; border-left: 0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
color: #9b9b9b; color: #9b9b9b;
font-size: 0.8em; font-size: .8em;
padding: 1px 4px; padding: 1px 4px;
} }