Skip to content

Commit

Permalink
Merge branch '0.3.0' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
slaweet committed Mar 7, 2018
2 parents d2558a4 + d2fc101 commit 805653b
Show file tree
Hide file tree
Showing 14 changed files with 31 additions and 24 deletions.
6 changes: 5 additions & 1 deletion src/components/app/variables.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,17 @@ or "warn/action" ineastd of "red/green"
--font-size-h5: 1.32em;
--font-size-h6: 1em;
--font-size-small: 0.875em;
--font-size-medium: 1.125em;
--heading-font: 'gilroy', 'Open Sans', sans-serif;
--content-font: 'Open Sans', sans-serif;
--font-weight-normal: 400;
--font-weight-semi-bold: 500;
--font-weight-bold: 600;
--font-weight-very-bold: 700;
--subtitle-font-size: 16px;
--main-menu-font-size: 18px;
--paragraph-font-size-l: 15px;
--paragraph-font-size-s: 14px;
--input-font-size: 16px;

/* Font xl breakpoint */
--font-size-h2-xl: 32px;
Expand Down
2 changes: 1 addition & 1 deletion src/components/box/box.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

& :global .subTitle {
margin-top: 20px;
font-size: 1em;
font-size: var(--subtitle-font-size);
color: var(--color-grayscale-dark);
height: 22px;
}
Expand Down
3 changes: 1 addition & 2 deletions src/components/confirmVotes/confirmVotes.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@
text-align: center;

& h2 {
font-size: 32px;
font-size: var(--font-size-h2-xl);
margin: 0;
}

& p {
font-size: 18px;
line-height: 36px;
margin: 32px 0;
}
Expand Down
8 changes: 6 additions & 2 deletions src/components/dashboard/currencyGraph.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
@import '../app/variables';

:root {
--stepSwitch-font-size: 15px;
}

.wrapper {
height: 100%;
min-height: 200px;
Expand Down Expand Up @@ -28,7 +32,7 @@
.stepSwitch {
padding: 10px 16px;
cursor: pointer;
font-size: 15px;
font-size: var(--stepSwitch-font-size);
font-weight: 500;
color: var(--color-grayscale-medium);

Expand Down Expand Up @@ -61,7 +65,7 @@
min-height: 300px;

& h2 {
font-size: 28px;
font-size: var(--font-size-h2-l);
margin: 45px var(--box-padding-left-M) 20px;
}
}
Expand Down
1 change: 0 additions & 1 deletion src/components/dialog/dialog.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
& p {
color: rgba(0, 0, 0, 0.87);
line-height: 1.4em;
font-size: 1em;
}

& header {
Expand Down
1 change: 0 additions & 1 deletion src/components/emptyState/emptyState.css
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
}

& p {
font-size: 16px;
line-height: 26px;
color: var(--color-grayscale-dark);
}
Expand Down
11 changes: 7 additions & 4 deletions src/components/mainMenu/mainMenu.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
--more-menu-color: var(--color-grayscale-medium);
--offcanvas-menu-border-color: var(--color-grayscale-light);
--more-menu-border-color: var(--color-grayscale-medium);
--read-more-font-size: 17px;
--read-more-icon-font-size: 65px;
--close-icon-font-size: 35px;
}

.sideBarWrapper {
Expand Down Expand Up @@ -90,7 +93,7 @@
}

.close {
font-size: 35px;
font-size: var(--close-icon-font-size);
display: flex;
width: auto;
cursor: pointer;
Expand Down Expand Up @@ -118,7 +121,7 @@

.label {
padding: 4.5vh 10px; /* stylelint-disable-line */
font-size: 1.125em;
font-size: var(--main-menu-font-size);
color: var(--color-black);
font-weight: bold;
font-family: var(--heading-font);
Expand Down Expand Up @@ -203,14 +206,14 @@
}

.readMoreText {
font-size: 17px;
font-size: var(--read-more-font-size);
font-weight: bold;
text-transform: capitalize;
font-family: 'gilroy', 'Open Sans', sans-serif;
}

.readMoreIcon {
font-size: 65px;
font-size: var(--read-more-icon-font-size);
width: 100%;
}

Expand Down
6 changes: 4 additions & 2 deletions src/components/menuBar/menuBar.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

:root {
--menu-bar-padding: 20px;
--menu-bar-font-size-m: 24px;
--menu-bar-font-size-s: 18px;
}

.menuBar {
Expand Down Expand Up @@ -34,7 +36,7 @@
left: 0;
box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.12), 0 -2px 24px 0 rgba(0, 0, 0, 0.24);
font-weight: bold;
font-size: 24px;
font-size: var(--menu-bar-font-size-m);
font-family: var(--heading-font);
background-color: var(--color-white);
z-index: 1;
Expand All @@ -58,7 +60,7 @@
@media (--small-viewport) {
.menuBar {
height: var(--s-menu-bar-height);
font-size: 18px;
font-size: var(--menu-bar-font-size-s);
}

.setting {
Expand Down
1 change: 0 additions & 1 deletion src/components/resultBox/resultBox.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
}

& p {
font-size: 1.125em;
color: var(--paragraph-color);
line-height: var(--paragraph-line-height);
}
Expand Down
1 change: 0 additions & 1 deletion src/components/sendReadable/sendReadable.css
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ input:read-only {
}

& p {
font-size: 1.125em;
color: var(--color-grayscale-dark);
line-height: 36px;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/sendWritable/sendWritable.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
--tab-inactive-color: var(--color-grayscale-dark);
--grid-padding-left: 30px;
--header-line-height: 36px;
--header-subtitle-font-size: var(--font-size-medium);
--header-subtitle-font-size: var(--subtitle-font-size);
--font-weight-bold: 500;
--fee-color: var(--color-grayscale-dark);
}
Expand Down
1 change: 0 additions & 1 deletion src/components/setting/setting.css
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
}

& p {
font-size: 16px;
margin-bottom: 48px;
}
}
Expand Down
1 change: 0 additions & 1 deletion src/components/toolbox/inputs/input.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
--input-focus-color: var(--color-primary-standard);
--input-color: var(--color-grayscale-dark);
--label-font-size: var(--font-size-small);
--input-font-size: 1.06066em;
--placeholder-color: var(--color-grayscale-light);
}

Expand Down
11 changes: 6 additions & 5 deletions src/components/votesPreview/votesPreview.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
:root {
--danger-color: var(--color-error);
--link-color: #0077bd;
--main-header-font-size-XL: 32px;
--main-header-font-size-L: 28px;
--main-header-font-size-XS: 24px;
--main-header-font-size-XL: var(--font-size-h2-xl);
--main-header-font-size-L: var(--font-size-h2-l);
--main-header-font-size-XS: var(--font-size-h2-s);
--header-font-size: 28px;
--link-font-size: 15px;
--progress-bar-text-font-size: 13px;
Expand All @@ -17,11 +17,12 @@
--error-font-size-XL: 16px;
--error-font-size-L: 14px;
--button-height: 55px;
--error-font-size: var(--subtitle-font-size);
}

.errorMessage {
color: var(--color-error);
height: 20px;
height: var(--error-font-size);
font-weight: var(--font-weight-semi-bold);
padding-top: 10px;
}
Expand Down Expand Up @@ -152,7 +153,7 @@
background-color: var(--color-error);
color: var(--color-white);
z-index: 4;
font-size: 16px;
font-size: var(--error-font-size);
padding: 15px 24px !important;
box-sizing: border-box;
line-height: var(--message-line-height);
Expand Down

0 comments on commit 805653b

Please sign in to comment.