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

Change typographical elements to use px - Closes #85 #524

Merged
merged 34 commits into from
Mar 9, 2018
Merged

Change typographical elements to use px - Closes #85 #524

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
40f7314
Remove iconButton.css
yasharAyari Mar 6, 2018
c529e52
Use paragraph-font-size in type.css
yasharAyari Mar 6, 2018
977a68b
Replace all 'em' values with 'px' ones in variables.css
yasharAyari Mar 6, 2018
3075f60
Remove h2 font-size in confirmVotes.css
yasharAyari Mar 6, 2018
f88c121
Remove h2 font-size in currencyGraph.css
yasharAyari Mar 6, 2018
f60500b
Remove h2 font-size in dashboard css
yasharAyari Mar 6, 2018
f09d9f4
Remove h2 font-size in delegateList.css
yasharAyari Mar 6, 2018
97ba719
Remove h2 font-size in in passphraseSteps.css
yasharAyari Mar 6, 2018
d09b811
Remove h2 font-size in resulatBox.css
yasharAyari Mar 6, 2018
3cd00ed
Remove h2 font-size in sendTo.css
yasharAyari Mar 6, 2018
95310bc
Remove h2 font-size in sendReadable.css
yasharAyari Mar 6, 2018
479dabd
Remove h2 font-size in sendWritable.css
yasharAyari Mar 6, 2018
afd0b49
Remove h2 font-size in transaction.css
yasharAyari Mar 6, 2018
adce8a6
Remove h2 font-size in transactions.css
yasharAyari Mar 6, 2018
65c44ff
Remove h2 font-size in votesPreview.css
yasharAyari Mar 6, 2018
8ec1593
Replace static amount with subtitle-font-size variable
yasharAyari Mar 6, 2018
1491adb
Replace static font-size with font-size-h6 variable
yasharAyari Mar 6, 2018
05a8e7f
Fix some style bugs in button thems
yasharAyari Mar 6, 2018
edae6d1
Remove unused table component
yasharAyari Mar 7, 2018
897a977
Fix some bug in variables.css
yasharAyari Mar 7, 2018
8d48e68
Replace values in 'em' with 'px' ones
yasharAyari Mar 7, 2018
785ddcf
Add arrow-font-size variable to login.css
yasharAyari Mar 7, 2018
c4015f0
Add to header-font-size confirm.css
yasharAyari Mar 7, 2018
48856d0
Add header-font-size to safekeeping
yasharAyari Mar 7, 2018
490e61a
Replace a value in 'em' with 'px'
yasharAyari Mar 7, 2018
fa10556
Remove 'em' from stylelint unit-whitelist
yasharAyari Mar 7, 2018
8bd3091
Fix a bug in icons.css
yasharAyari Mar 8, 2018
dbc99b3
Fix a bug in login.css
yasharAyari Mar 8, 2018
3fd40e0
Fix a style bug in mutliStep
yasharAyari Mar 8, 2018
bb13095
Prevent stylelint unit-whitelist errors
slaweet Mar 8, 2018
daf717c
Fix font-size of headers in login
yasharAyari Mar 8, 2018
de5c05d
Fix signUp h2 bug in mobile devices
yasharAyari Mar 8, 2018
34dfacc
Fix a style bug in saveAccounts.css
yasharAyari Mar 8, 2018
cea9712
Fix signUpArrow font-size in mobile
yasharAyari Mar 8, 2018
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
6 changes: 5 additions & 1 deletion src/components/app/type.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ a,
b,
i,
strong {
font-size: var(--font-size-h6);
font-size: var(--paragraph-font-size-l);
}

strong {
Expand Down Expand Up @@ -140,4 +140,8 @@ select {
h5 {
font-size: var(--font-size-h5-s);
}

p {
font-size: var(--paragraph-font-size-s);
}
}
13 changes: 7 additions & 6 deletions src/components/app/variables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ or "warn/action" ineastd of "red/green"
/*************************
Font
*************************/
--font-size-h1: 6.854em;
--font-size-h2: 4.236em;
--font-size-h3: 2.618em;
--font-size-h4: 1.618em;
--font-size-h5: 1.32em;
--font-size-h6: 1em;
--font-size-h1: 65px;
--font-size-h2: 32px;
--font-size-h3: 28px;
--font-size-h4: 26;
Copy link
Contributor

Choose a reason for hiding this comment

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

px missing

--font-size-h5: 20px;
--font-size-h6: 16px;
--font-size-small: 0.875em;
--heading-font: 'gilroy', 'Open Sans', sans-serif;
--content-font: 'Open Sans', sans-serif;
Expand All @@ -57,6 +57,7 @@ or "warn/action" ineastd of "red/green"
--paragraph-font-size-l: 15px;
--paragraph-font-size-s: 14px;
--input-font-size: 16px;
--button-font-size: 16px;

/* Font xl breakpoint */
--font-size-h2-xl: 32px;
Expand Down
1 change: 0 additions & 1 deletion src/components/confirmVotes/confirmVotes.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
text-align: center;

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

Expand Down
1 change: 0 additions & 1 deletion src/components/dashboard/currencyGraph.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
min-height: 300px;

& h2 {
font-size: var(--font-size-h2-l);
margin: 45px var(--box-padding-left-M) 20px;
}
}
Expand Down
9 changes: 0 additions & 9 deletions src/components/dashboard/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
@media (--xLarge-viewport) {
.latestActivity {
& h2 {
font-size: var(--font-size-h2-xl);
margin: 45px var(--box-padding-left-L) 20px;
}
}
Expand All @@ -46,7 +45,6 @@
@media (--large-viewport) {
.latestActivity {
& h2 {
font-size: var(--font-size-h2-l);
margin: 45px var(--box-padding-left-L) 20px;
}
}
Expand All @@ -73,19 +71,12 @@
height: auto;

& h2 {
font-size: var(--font-size-h2-l);
margin: 45px var(--box-padding-left-M) 20px;
}
}
}

@media (--small-viewport) {
.latestActivity {
& h2 {
font-size: var(--font-size-h2-s);
}
}

.seeAllLink {
display: block;
margin-top: 16px;
Expand Down
9 changes: 0 additions & 9 deletions src/components/delegateList/delegateList.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@
margin-bottom: 0;
font-weight: 400;
padding-bottom: 60px;
font-size: var(--main-header-font-size-XL);

&.desktopTitle {
display: block;
Expand Down Expand Up @@ -376,10 +375,6 @@
@media (--large-viewport) {
.header {
padding: 20px var(--grid-padding-L);

& h2 {
font-size: var(--main-header-font-size-L);
}
}

.delegatesList {
Expand Down Expand Up @@ -508,10 +503,6 @@
.header {
padding: 20px var(--grid-padding-XS);

& h2 {
font-size: var(--main-header-font-size-XS);
}

& .account {
display: none;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/login/login.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
}

& .subTitle {
font-size: 1em;
font-size: var(--subtitle-font-size);
}

& .shape {
Expand Down
1 change: 0 additions & 1 deletion src/components/passphraseSteps/passphraseSteps.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
& h2 {
font-weight: var(--font-weight-semi-bold);
margin-bottom: 0;
font-size: 2em;
}
}

Expand Down
7 changes: 2 additions & 5 deletions src/components/resultBox/resultBox.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
--paragraph-color: var(--color-grayscale-dark);
--paragraph-line-height: 36px;
--title-font-size: 32px;
--icon-font-size: 48px;
}

.icon {
font-size: 3em;
font-size: var(--icon-font-size);
color: #ff6236;
}

Expand All @@ -31,10 +32,6 @@
line-height: var(--paragraph-line-height);
}

& h2 {
font-size: var(--title-font-size);
}

& .copy {
color: var(--copy-color);
cursor: pointer;
Expand Down
2 changes: 1 addition & 1 deletion src/components/savedAccounts/savedAccounts.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@

.network,
.unlocked {
font-size: 1em;
font-size: var(--font-size-h6);
position: absolute;
top: 0;
padding: 24px;
Expand Down
10 changes: 0 additions & 10 deletions src/components/sendReadable/sendReadable.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,6 @@ input:read-only {
}
}

.temporarySuccessCheck {
/* values are not saved as variable since this will be deleted anyway */
position: absolute;
bottom: -20px;
left: 155px;
font-size: 3em;
color: #ff6236;
}

.headerWrapper {
padding: 20px 0px;

Expand All @@ -82,7 +73,6 @@ input:read-only {

& h2 {
margin-bottom: 0;
font-size: 2em;
}

& h3 {
Expand Down
7 changes: 0 additions & 7 deletions src/components/sendTo/sendTo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
--header-subtitle-font-size-XL: 18px;
--header-subtitle-font-size-L: 16px;
--header-subtitle-font-size-XS: 14px;
--main-header-font-size-XL: 32px;
--main-header-font-size-L: 28px;
--main-header-font-size-XS: 24px;
}

.wrapper {
Expand Down Expand Up @@ -61,8 +58,6 @@
@media (--xLarge-viewport) {
.wrapper {
& h2 {
font-size: var(--main-header-font-size-XL);

& .balanceUnit {
font-size: var(--header-balance-unit-font-size-XL);
}
Expand All @@ -77,8 +72,6 @@
@media (--large-viewport) {
.wrapper {
& h2 {
font-size: var(--main-header-font-size-L);

& .balanceUnit {
font-size: var(--header-balance-unit-font-size-L);
}
Expand Down
16 changes: 0 additions & 16 deletions src/components/sendWritable/sendWritable.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,22 +102,6 @@ input:read-only {
padding-right: 85px;
}

@media (--xLarge-viewport) {
.headerWrapper {
& h2 {
font-size: var(--font-size-h2-xl);
}
}
}

@media (--large-viewport) {
.headerWrapper {
& h2 {
font-size: var(--font-size-h2-l);
}
}
}

@media (--small-viewport) {
.headerWrapper {
display: none;
Expand Down
9 changes: 0 additions & 9 deletions src/components/singleTransaction/transaction.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
--title-bar-extra-padding-XS: 52px;
--header-subtitle-font-size-XL: 18px;
--header-subtitle-font-size-L: 16px;
--main-header-font-size-XL: 32px;
--main-header-font-size-L: 28px;
--main-header-font-size-XS: 24px;
--grid-padding-XL: 48px;
--grid-padding-L: 32px;
--grid-padding-XS: 19px;
Expand Down Expand Up @@ -51,7 +48,6 @@
padding: 20px var(--grid-padding-XL);

& h2 {
font-size: var(--main-header-font-size-XL);
margin-bottom: 7px;
}
}
Expand All @@ -64,7 +60,6 @@
padding: 20px var(--grid-padding-L);

& h2 {
font-size: var(--main-header-font-size-L);
margin-bottom: 5px;
}
}
Expand Down Expand Up @@ -93,10 +88,6 @@

& header {
padding: 20px var(--grid-padding-XS) calc(20px + var(--title-bar-extra-padding-XS)) var(--grid-padding-XS);

& h2 {
font-size: var(--main-header-font-size-XS);
}
}

& .content {
Expand Down
3 changes: 0 additions & 3 deletions src/components/toolbox/buttons/css/iconButton.css
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion src/components/toolbox/buttons/css/importantButton.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import './base.css';

.button {
font-size: 1em;
font-size: var(--button-font-size);
}
4 changes: 3 additions & 1 deletion src/components/toolbox/buttons/css/lightButton.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import './base.css';

.button {
font-size: 1em;
font-size: var(--button-font-size);
}
5 changes: 2 additions & 3 deletions src/components/toolbox/buttons/iconButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import React from 'react';
import { themr } from 'react-css-themr';
import { IconButton as ToolBoxIconButton } from 'react-toolbox/lib/button';
import iconButtonTheme from './css/iconButton.css';

// this component is unnecessary and it need to be deleted
class IconButton extends React.Component {
render() {
return <ToolBoxIconButton {...this.props} theme={this.props.theme} />;
}
}

export default themr('iconButton', iconButtonTheme)(IconButton);
export default IconButton;
11 changes: 0 additions & 11 deletions src/components/transactions/transactions.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
--header-balance-unit-font-size-L: 18px;
--header-subtitle-font-size-XL: 18px;
--header-subtitle-font-size-L: 16px;
--main-header-font-size-XL: 32px;
--main-header-font-size-L: 28px;
--main-header-font-size-XS: 24px;
--grid-padding-XL: var(--box-padding-left-L); /* L until we add this padding to everywhere else too */
--grid-padding-L: var(--box-padding-left-L);
--grid-padding-M: var(--box-padding-left-M);
Expand Down Expand Up @@ -290,8 +287,6 @@
padding: 20px var(--grid-padding-XL);

& h2 {
font-size: var(--main-header-font-size-XL);

& .balanceUnit {
font-size: var(--header-balance-unit-font-size-XL);
}
Expand Down Expand Up @@ -373,8 +368,6 @@
padding: 20px var(--grid-padding-L);

& h2 {
font-size: var(--main-header-font-size-L);

& .balanceUnit {
font-size: var(--header-balance-unit-font-size-L);
}
Expand Down Expand Up @@ -479,10 +472,6 @@
& header {
padding: 20px var(--grid-padding-M);

& h2 {
font-size: var(--main-header-font-size-XS);
}

& .account {
display: none;
}
Expand Down
Loading