From 9886482dd153b17658e66def59e02bfb95e19b2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nejc=20Kova=C4=8D?= Date: Fri, 15 Jul 2022 13:22:12 +0200 Subject: [PATCH] LOGIN/REGISTER FORM errors popravki --- frontend/simple/css/style.css | 48 +++++++++++++++---- .../sass/frontend_simple/basic/fonts.scss | 2 +- .../sass/frontend_simple/basic/popravki.scss | 39 ++++++++++++++- .../sass/frontend_simple/modules/GDPR.scss | 1 - 4 files changed, 79 insertions(+), 11 deletions(-) diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css index 46b97cf4d..6364f2a60 100644 --- a/frontend/simple/css/style.css +++ b/frontend/simple/css/style.css @@ -105,7 +105,7 @@ input[type=email] { padding: 8px 18px; font-size: 16px; color: #333; - font-family: "Source Sans Pro"; + font-family: "Source Sans Pro", "sans-serif"; background-color: white; border: 1px solid #cccccc; } @@ -1013,7 +1013,7 @@ header { max-width: 1160px; width: 95%; margin: auto; - font-family: "Source Sans Pro"; + font-family: "Source Sans Pro", "sans-serif"; } header nav { @@ -1141,7 +1141,7 @@ body.landing_page #main .landing_page_window input[type=submit] { font-weight: 700; padding: 12.5px 0px; line-height: 20px; - font-family: "Source Sans Pro"; + font-family: "Source Sans Pro", "sans-serif"; } body.landing_page #main .landing_page_window #login_holder .login_form .lostpass { @@ -1203,7 +1203,7 @@ footer .footer_content { } footer .footer_content h2 { - font-family: "Source Sans Pro"; + font-family: "Source Sans Pro", "sans-serif"; color: #1e88e5; text-transform: uppercase; font-size: 18px; @@ -1239,7 +1239,7 @@ footer .footer_content .col a { font-weight: 400; font-size: 18px; line-height: 26px; - font-family: "Source Sans Pro"; + font-family: "Source Sans Pro", "sans-serif"; } footer .footer_content .col3 .social_logo_flex a:first-of-type { @@ -1258,6 +1258,7 @@ iframe { body.login_noEmail #main { background-image: none; + background-color: #F8F8F8; } body.login_noEmail #main .main_content { @@ -1310,6 +1311,15 @@ body.login_noEmail #main .landing_page_window #login_holder .login_form label:fi body.login_noEmail #main .landing_page_window #login_holder .login_form .lostpass { position: unset; + text-align: left; + text-decoration-line: underline; + text-decoration-color: #1e88e5; + font-weight: 400; + font-size: 16px; + line-height: 20px; +} +body.login_noEmail #main .landing_page_window #login_holder .login_form .lostpass a { + font-weight: 400; } body.landing_page #main .landing_page_window .error_holder, body.register #main .landing_page_window .error_holder, body.login #main .landing_page_window .error_holder, body.login_noEmail #main .landing_page_window .error_holder { @@ -1320,6 +1330,7 @@ body.login_noEmail #main .landing_page_window input[type=submit] { width: 100%; max-width: 100%; margin: 16px 0px; + font-family: "Source Sans Pro", "sans-serif"; } body.landing_page #main .landing_page_window #registration_holder, @@ -1335,6 +1346,7 @@ body.login_noEmail #main .landing_page_window label:first-of-type { body.login #main { background-image: none; + background-color: #F8F8F8; } body.login #main .main_content { @@ -1384,6 +1396,15 @@ body.login #main .landing_page_window #login_holder .login_form label:first-of-t body.login #main .landing_page_window #login_holder .login_form .lostpass { position: unset; + text-align: left; + text-decoration-line: underline; + text-decoration-color: #1e88e5; + font-weight: 400; + font-size: 16px; + line-height: 20px; +} +body.login #main .landing_page_window #login_holder .login_form .lostpass a { + font-weight: 400; } body.login #main .landing_page_window .error_holder { @@ -1394,6 +1415,7 @@ body.login #main .landing_page_window input[type=submit] { width: 100%; max-width: 100%; margin: 16px 0px; + font-family: "Source Sans Pro", "sans-serif"; } body.login #main .landing_page_window #registration_holder { @@ -1406,6 +1428,7 @@ body.login #main .landing_page_window label:first-of-type { body.register #main { background-image: none; + background-color: #F8F8F8; } body.register #main .main_content { @@ -1455,6 +1478,15 @@ body.register #main .landing_page_window #login_holder .login_form label:first-o body.register #main .landing_page_window #login_holder .login_form .lostpass { position: unset; + text-align: left; + text-decoration-line: underline; + text-decoration-color: #1e88e5; + font-weight: 400; + font-size: 16px; + line-height: 20px; +} +body.register #main .landing_page_window #login_holder .login_form .lostpass a { + font-weight: 400; } body.register #main .landing_page_window .error_holder { @@ -1465,6 +1497,7 @@ body.register #main .landing_page_window input[type=submit] { width: 100%; max-width: 100%; margin: 16px 0px; + font-family: "Source Sans Pro", "sans-serif"; } body.register #main .landing_page_window #registration_holder { @@ -1537,7 +1570,7 @@ body.gdpr .input_field div.label label { padding: 0px; padding-left: 8px; margin: 0px; - font-family: "Source Sans Pro"; + font-family: "Source Sans Pro", "sans-serif"; font-size: 16px; } @@ -1593,13 +1626,12 @@ form .opis { } #gdpr-note { - padding: 0px; padding-left: 8px; margin: 0px; width: 100%; border-radius: 0px; font-size: 16px; - font-family: "Source Sans Pro"; + font-family: "Source Sans Pro", "sans-serif"; } .register_holder p:last-of-type { diff --git a/resources/sass/frontend_simple/basic/fonts.scss b/resources/sass/frontend_simple/basic/fonts.scss index cc15f9def..b1c2f8e8c 100644 --- a/resources/sass/frontend_simple/basic/fonts.scss +++ b/resources/sass/frontend_simple/basic/fonts.scss @@ -5,7 +5,7 @@ $font: 'Montserrat', sans-serif; -$SansPro_font: "Source Sans Pro"; +$SansPro_font: "Source Sans Pro", "sans-serif"; .thin{ diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss index a8624fd86..34f0d7b80 100644 --- a/resources/sass/frontend_simple/basic/popravki.scss +++ b/resources/sass/frontend_simple/basic/popravki.scss @@ -1,4 +1,4 @@ -$SansPro_font: "Source Sans Pro"; +$SansPro_font: "Source Sans Pro", "sans-serif"; $max_sirina: (1160px); $black: #333333; $light_blue: #4ca0ea; @@ -303,6 +303,7 @@ iframe { body.login_noEmail #main{ background-image: none; + background-color: $color_background_grey; } body.login_noEmail #main .main_content{ @@ -359,6 +360,17 @@ body.login_noEmail #main .landing_page_window #login_holder .login_form label:fi body.login_noEmail #main .landing_page_window #login_holder .login_form .lostpass { position: unset; + text-align: left; + text-decoration-line: underline; + text-decoration-color: $blue; + font-weight: 400; + font-size: 16px; + line-height: 20px; + + a { + font-weight: 400; + } + } body.landing_page #main .landing_page_window .error_holder, body.register #main .landing_page_window .error_holder, body.login #main .landing_page_window .error_holder, body.login_noEmail #main .landing_page_window .error_holder { @@ -370,6 +382,7 @@ body.login_noEmail #main .landing_page_window input[type=submit]{ max-width: 100%; margin: 16px 0px; + font-family: $SansPro_font; } @@ -391,6 +404,7 @@ body.login_noEmail #main .landing_page_window label:first-of-type { body.login #main{ background-image: none; + background-color: $color_background_grey; } body.login #main .main_content{ @@ -444,6 +458,16 @@ body.login #main .landing_page_window #login_holder .login_form label:first-of-t body.login #main .landing_page_window #login_holder .login_form .lostpass { position: unset; + text-align: left; + text-decoration-line: underline; + text-decoration-color: $blue; + font-weight: 400; + font-size: 16px; + line-height: 20px; + + a { + font-weight: 400; + } } @@ -456,6 +480,7 @@ body.login #main .landing_page_window input[type=submit]{ max-width: 100%; margin: 16px 0px; + font-family: $SansPro_font; } @@ -474,6 +499,7 @@ body.login #main .landing_page_window label:first-of-type { body.register #main{ background-image: none; + background-color: $color_background_grey; } body.register #main .main_content{ @@ -528,6 +554,16 @@ body.register #main .landing_page_window #login_holder .login_form label:first-o body.register #main .landing_page_window #login_holder .login_form .lostpass { position: unset; + text-align: left; + text-decoration-line: underline; + text-decoration-color: $blue; + font-weight: 400; + font-size: 16px; + line-height: 20px; + + a { + font-weight: 400; + } } @@ -540,6 +576,7 @@ body.register #main .landing_page_window input[type=submit]{ max-width: 100%; margin: 16px 0px; + font-family: $SansPro_font; } diff --git a/resources/sass/frontend_simple/modules/GDPR.scss b/resources/sass/frontend_simple/modules/GDPR.scss index 12b68d7cc..4ccb5158a 100644 --- a/resources/sass/frontend_simple/modules/GDPR.scss +++ b/resources/sass/frontend_simple/modules/GDPR.scss @@ -132,7 +132,6 @@ form .opis { } #gdpr-note { - padding: 0px; padding-left: 8px; margin: 0px; width: 100%;