From 06c31d1d03402746e9cc3b8c757493218533b41b Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Wed, 13 Feb 2019 12:37:50 -0400 Subject: [PATCH 1/3] app fixes --- sass/badge/_index.scss | 9 +++++++-- sass/form/_index.scss | 28 +++++++++++++++++++--------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/sass/badge/_index.scss b/sass/badge/_index.scss index 6377a45..0218db2 100644 --- a/sass/badge/_index.scss +++ b/sass/badge/_index.scss @@ -16,10 +16,10 @@ .badge--cost:not(.badge--large) { background-color: $lbry-yellow-2; + color: $lbry-black; [data-mode="dark"] & { background-color: $lbry-yellow-3; - color: $lbry-black; } } @@ -33,7 +33,7 @@ } .badge--large { - font-size: 5rem; + font-size: 4rem; line-height: 1; } @@ -50,3 +50,8 @@ background-color: $lbry-teal-5; color: $lbry-white; } + +.badge--alert { + background-color: $lbry-red-2; + color: $lbry-white; +} diff --git a/sass/form/_index.scss b/sass/form/_index.scss index 28e0e8d..4e85803 100644 --- a/sass/form/_index.scss +++ b/sass/form/_index.scss @@ -1,23 +1,33 @@ form { // setting the font size here sizes everything within - margin-bottom: var(--spacing-s); + &:not(:last-child) { + margin-bottom: var(--spacing-s); + } - button, + button:not(.button--link), input, select { height: var(--spacing-l); border: 1px solid; } + select, + radio-element, + checkbox-element { + cursor: pointer; + } + [type="email"], - [type="text"] { + [type="text"], + [type="number"], + [type="password"] { padding-right: var(--spacing-s); padding-left: var(--spacing-s); transition: border 0.2s; } - [type="button"], - [type="submit"] { + [type="submit"], + .button--primary { color: $lbry-white; padding-right: var(--spacing-m); padding-left: var(--spacing-m); @@ -139,7 +149,8 @@ checkbox-element { input { &[type="checkbox"] { - width: 0; height: 0; + width: 0; + height: 0; visibility: hidden; &:not(:checked) { @@ -183,7 +194,8 @@ radio-element { input { &[type="radio"] { - width: 0; height: 0; + width: 0; + height: 0; visibility: hidden; &:not(:checked) { @@ -218,8 +230,6 @@ radio-toggle { } } - - // Custom elements are apparently difficult to use in React, so use classes .checkbox-element { From cdd6da853f249ac8370ccb42f4b7b64ffd3c9064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?netop=3A//=20=E3=82=A6=E3=82=A7=E3=83=83=E3=83=96?= Date: Wed, 13 Feb 2019 17:31:55 -0600 Subject: [PATCH 2/3] Order --- sass/form/_index.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sass/form/_index.scss b/sass/form/_index.scss index 4e85803..5369678 100644 --- a/sass/form/_index.scss +++ b/sass/form/_index.scss @@ -11,16 +11,16 @@ form { border: 1px solid; } - select, + checkbox-element, radio-element, - checkbox-element { + select { cursor: pointer; } [type="email"], - [type="text"], [type="number"], - [type="password"] { + [type="password"] + [type="text"] { padding-right: var(--spacing-s); padding-left: var(--spacing-s); transition: border 0.2s; From 299e0e825d86213577659bffa1d3ebed899fdecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?netop=3A//=20=E3=82=A6=E3=82=A7=E3=83=83=E3=83=96?= Date: Wed, 13 Feb 2019 17:32:56 -0600 Subject: [PATCH 3/3] Autoformatter revert --- sass/form/_index.scss | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sass/form/_index.scss b/sass/form/_index.scss index 5369678..f04cd73 100644 --- a/sass/form/_index.scss +++ b/sass/form/_index.scss @@ -149,8 +149,7 @@ checkbox-element { input { &[type="checkbox"] { - width: 0; - height: 0; + width: 0; height: 0; visibility: hidden; &:not(:checked) { @@ -194,8 +193,7 @@ radio-element { input { &[type="radio"] { - width: 0; - height: 0; + width: 0; height: 0; visibility: hidden; &:not(:checked) {