diff --git a/common/assets/fonts/Lato-Bold.ttf b/common/assets/fonts/Lato-Bold.ttf deleted file mode 100755 index 29f691d5..00000000 Binary files a/common/assets/fonts/Lato-Bold.ttf and /dev/null differ diff --git a/common/assets/fonts/Lato-Bold.woff b/common/assets/fonts/Lato-Bold.woff old mode 100755 new mode 100644 diff --git a/common/assets/fonts/Lato-Bold.woff2 b/common/assets/fonts/Lato-Bold.woff2 new file mode 100644 index 00000000..e9d0b3f2 Binary files /dev/null and b/common/assets/fonts/Lato-Bold.woff2 differ diff --git a/common/assets/fonts/Lato-Light.ttf b/common/assets/fonts/Lato-Light.ttf deleted file mode 100755 index 834d1c05..00000000 Binary files a/common/assets/fonts/Lato-Light.ttf and /dev/null differ diff --git a/common/assets/fonts/Lato-Light.woff b/common/assets/fonts/Lato-Light.woff old mode 100755 new mode 100644 diff --git a/common/assets/fonts/Lato-Light.woff2 b/common/assets/fonts/Lato-Light.woff2 new file mode 100644 index 00000000..652fc098 Binary files /dev/null and b/common/assets/fonts/Lato-Light.woff2 differ diff --git a/common/assets/fonts/Lato-Regular.ttf b/common/assets/fonts/Lato-Regular.ttf deleted file mode 100755 index 74decd9e..00000000 Binary files a/common/assets/fonts/Lato-Regular.ttf and /dev/null differ diff --git a/common/assets/fonts/Lato-Regular.woff b/common/assets/fonts/Lato-Regular.woff old mode 100755 new mode 100644 diff --git a/common/assets/fonts/Lato-Regular.woff2 b/common/assets/fonts/Lato-Regular.woff2 new file mode 100644 index 00000000..597b8551 Binary files /dev/null and b/common/assets/fonts/Lato-Regular.woff2 differ diff --git a/common/assets/fonts/social-media.eot b/common/assets/fonts/social-media.eot deleted file mode 100644 index b17b3ff3..00000000 Binary files a/common/assets/fonts/social-media.eot and /dev/null differ diff --git a/common/assets/fonts/social-media.svg b/common/assets/fonts/social-media.svg deleted file mode 100644 index a903a42f..00000000 --- a/common/assets/fonts/social-media.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/common/assets/fonts/social-media.ttf b/common/assets/fonts/social-media.ttf deleted file mode 100644 index ea56ac6c..00000000 Binary files a/common/assets/fonts/social-media.ttf and /dev/null differ diff --git a/common/assets/styles/etherwallet-fonts.less b/common/assets/styles/etherwallet-fonts.less index dae83ee5..711faa4f 100755 --- a/common/assets/styles/etherwallet-fonts.less +++ b/common/assets/styles/etherwallet-fonts.less @@ -1,24 +1,23 @@ @font-face { font-family: 'Lato'; - src: url('../fonts/Lato-Light.woff') format('woff'), - url('../fonts/Lato-Light.ttf') format('truetype'); + src: url('../fonts/Lato-Light.woff2') format('woff2'), + url('../fonts/Lato-Light.woff') format('woff'); font-style: normal; font-weight: 300; } @font-face { font-family: 'Lato'; - src: url('../fonts/Lato-Regular.woff') format('woff'), - url('../fonts/Lato-Regular.ttf') format('truetype'); + src: url('../fonts/Lato-Regular.woff2') format('woff2'), + url('../fonts/Lato-Regular.woff') format('woff'); font-style: normal; font-weight: 400; } @font-face { font-family: 'Lato'; - src: url('../fonts/Lato-Bold.woff') format('woff'), - url('../fonts/Lato-Bold.ttf') format('truetype'); - + src: url('../fonts/Lato-Bold.woff2') format('woff2'), + url('../fonts/Lato-Bold.woff') format('woff'); font-style: normal; font-weight: 700; -} \ No newline at end of file +} diff --git a/common/components/BalanceSidebar/AccountInfo.scss b/common/components/BalanceSidebar/AccountInfo.scss index de16ff6a..1286d6a0 100644 --- a/common/components/BalanceSidebar/AccountInfo.scss +++ b/common/components/BalanceSidebar/AccountInfo.scss @@ -71,7 +71,7 @@ padding-left: 1em; margin: 0; table { - font-weight: 200; + font-weight: 300; border-bottom: 0; min-width: 200px; td { diff --git a/common/components/Header/index.scss b/common/components/Header/index.scss index 5d4c90dd..5a2b8237 100644 --- a/common/components/Header/index.scss +++ b/common/components/Header/index.scss @@ -1,5 +1,5 @@ -@import "common/sass/variables"; -@import "common/sass/mixins"; +@import 'common/sass/variables'; +@import 'common/sass/mixins'; $small-size: 900px; @@ -16,7 +16,8 @@ $small-size: 900px; } @keyframes dropdown-is-flashing { - 0%, 100% { + 0%, + 100% { opacity: 0.8; } 50% { @@ -109,7 +110,7 @@ $small-size: 900px; &-right { font-size: 18px; - font-weight: 200; + font-weight: 300; color: white; flex: 1 auto; text-align: right; @@ -139,7 +140,7 @@ $small-size: 900px; @media screen and (max-width: $screen-xs) { .btn { - padding: .3rem .5rem; + padding: 0.3rem 0.5rem; } } diff --git a/common/components/WalletDecrypt/components/WalletButton.scss b/common/components/WalletDecrypt/components/WalletButton.scss index 14769c15..b209e824 100644 --- a/common/components/WalletDecrypt/components/WalletButton.scss +++ b/common/components/WalletDecrypt/components/WalletButton.scss @@ -27,11 +27,11 @@ flex: 1; height: 155px; max-width: 230px; - min-width: 200px; + min-width: 300px; padding: 25px 15px; margin: 0 $space-md $space; - background: #FFF; + background: #fff; box-shadow: 0 1px 4px rgba(#000, 0.2); border-radius: 8px; text-align: center; @@ -52,8 +52,7 @@ &:focus { transform: translateY(-2px); z-index: 2; - box-shadow: 0 1px 4px rgba(#000, 0.12), - 0 4px 6px rgba(#000, 0.12); + box-shadow: 0 1px 4px rgba(#000, 0.12), 0 4px 6px rgba(#000, 0.12); .WalletButton-title { color: $brand-primary; @@ -66,8 +65,7 @@ &:active { transform: translateY(-1px); - box-shadow: 0 1px 2px rgba(#000, 0.2), - 0 3px 4px rgba(#000, 0.2); + box-shadow: 0 1px 2px rgba(#000, 0.2), 0 3px 4px rgba(#000, 0.2); } } @@ -173,7 +171,8 @@ @media screen and (max-width: $screen-xs) { padding: 16px; - &, &--small { + &, + &--small { height: auto; width: 100%; min-width: 100%; @@ -204,8 +203,8 @@ margin: 0; width: 48px; text-align: center; - border-left: 1px solid #F4F4F4; - background: #FEFEFE; + border-left: 1px solid #f4f4f4; + background: #fefefe; a { position: absolute; diff --git a/common/sass/fonts.scss b/common/sass/fonts.scss index c99d6156..cec2f27b 100644 --- a/common/sass/fonts.scss +++ b/common/sass/fonts.scss @@ -1 +1 @@ -@import './fonts/social-media' \ No newline at end of file +@import './fonts/social-media'; diff --git a/common/sass/fonts/social-media.scss b/common/sass/fonts/social-media.scss index 4b2dd126..f0e7acf1 100644 --- a/common/sass/fonts/social-media.scss +++ b/common/sass/fonts/social-media.scss @@ -1,11 +1,7 @@ @font-face { font-family: 'social-media'; - src: url('../assets/fonts/social-media.eot'); - src: url('../assets/fonts/social-media.eot') format('embedded-opentype'), - url('../assets/fonts/social-media.woff2') format('woff2'), - url('../assets/fonts/social-media.woff') format('woff'), - url('../assets/fonts/social-media.ttf') format('truetype'), - url('../assets/fonts/social-media.svg') format('svg'); + src: url('../assets/fonts/social-media.woff2') format('woff2'), + url('../assets/fonts/social-media.woff') format('woff'); font-weight: normal; font-style: normal; } diff --git a/common/sass/styles/overrides/type.scss b/common/sass/styles/overrides/type.scss index f929082d..8b44a535 100644 --- a/common/sass/styles/overrides/type.scss +++ b/common/sass/styles/overrides/type.scss @@ -1,48 +1,85 @@ // Overrides Bootstrap type defaults -@import "common/sass/variables"; -@import "common/sass/mixins"; +@import 'common/sass/variables'; +@import 'common/sass/mixins'; // Headings -h1, h2, h3, h4, h5, h6, -.h1, .h2, .h3, .h4, .h5, .h6 { - letter-spacing: .02em; +h1, +h2, +h3, +h4, +h5, +h6, +.h1, +.h2, +.h3, +.h4, +.h5, +.h6 { + letter-spacing: 0.02em; } -h1, .h1, -h2, .h2, -h3, .h3 { +h1, +.h1, +h2, +.h2, +h3, +.h3 { margin-top: $space; margin-bottom: $space-sm; } -h4, .h4, -h5, .h5, -h6, .h6 { +h4, +.h4, +h5, +.h5, +h6, +.h6 { margin-top: $space; margin-bottom: $space-sm; } -h1, .h1 { font-weight: 300; } -h2, .h2 { font-weight: 300; } -h3, .h3 { font-weight: 700; } -h4, .h4 { font-weight: 700; } -h5, .h5 { font-weight: 400; } -h6, .h6 { font-weight: 400; } - - +h1, +.h1 { + font-weight: 300; +} +h2, +.h2 { + font-weight: 300; +} +h3, +.h3 { + font-weight: 700; +} +h4, +.h4 { + font-weight: 700; +} +h5, +.h5 { + font-weight: 400; +} +h6, +.h6 { + font-weight: 400; +} // Text p { - margin: 0 0 $space-sm; + margin: 0 0 $space-sm; font-weight: 300; - strong, .strong, &.strong { + strong, + .strong, + &.strong { font-weight: 400; } } -i { font-style: normal } +i { + font-style: normal; +} -strong, .strong { +strong, +.strong { font-weight: 600; } @@ -53,12 +90,13 @@ a { transition: $transition; &:hover { - opacity: .8; - color: $link-hover-color; - } - &:active, &:focus { - opacity: 1; - } + opacity: 0.8; + color: $link-hover-color; + } + &:active, + &:focus { + opacity: 1; + } &:focus { @include tab-focus(); } @@ -77,19 +115,17 @@ a { } .text-light { - font-weight: 200; + font-weight: 300; } - // Page Header .page-header { padding-bottom: $space-sm - 1; } - // Lists li { - margin-bottom: .5em; + margin-bottom: 0.5em; font-weight: 300; strong { font-weight: 400; @@ -97,16 +133,15 @@ li { } .list-inline { - margin-left: -5px; + margin-left: -5px; - > li { - display: inline-block; + > li { + display: inline-block; padding-left: 5px; padding-right: 5px; - } + } } - // Blockquotes blockquote { padding: $space-sm $line-height-computed;