diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css index 37a6ecdd0..cdef4203c 100644 --- a/frontend/simple/css/style.css +++ b/frontend/simple/css/style.css @@ -1,11 +1,11 @@ +@charset "UTF-8"; /* Created on : 28.3.2020 Author : Peter Hrvatin */ -/* BARVE */ -/* FONTI */ -@import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap"); +/* BARVE */ /* FONTI */ @import url("https://fonts.googleapis.com/css?family=Montserrat:300,400,400i,600,700&subset=latin-ext"); +@import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap"); .thin { font-weight: 300; } @@ -736,7 +736,6 @@ body.reset_password_activate div.label { header nav span.menu_item a { line-height: 18px; } - body #main .main_content { padding: 10px 20px 40px 20px; } @@ -778,7 +777,6 @@ body #main .main_content input[type=button] { margin: 0; width: 100%; } - body.landing_page, body.login, body.register, @@ -864,7 +862,6 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle { width: 100%; box-sizing: border-box; } - footer { padding: 0 20px; } @@ -882,7 +879,6 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle { footer .footer_content .logo_holder img { margin: 20px auto 30px auto; } - .cookie_notice { flex-direction: column; } @@ -891,27 +887,38 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle { text-align: center; } } - -/*# sourceMappingURL=style.css.map */ - -/* -------------------------------------------------------------------------------------- */ - /* Author : Nejc Kovač Urejanje landing page */ - /* @import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap"); */ - body.landing_page #main { background-image: none; } +header { + height: unset; + padding-top: 13px; + padding-left: 0px; + padding-right: 0px; + max-width: 1160px; + width: 95%; + margin: auto; +} + +header .logo a img { + height: 45px; +} + +.nav-desktop { + align-items: center; + padding-bottom: 13px; +} + .landing_page_content { font-family: "Source Sans Pro", "sans-serif"; text-align: center; color: #333333; - } .landing_page_content .landing_page_title { @@ -920,16 +927,12 @@ body.landing_page #main { line-height: 63px; } - - body.landing_page #main .app_subtitle { text-shadow: unset; color: #333333; - font-weight: 400; line-height: 26px; font-size: 18px; - margin-top: 25px; margin-bottom: 24px; } @@ -948,12 +951,9 @@ body.landing_page #main .landing_page_window #login_holder .login_form { body.landing_page #main .landing_page_window .tabs .tab { font-size: 16px; font-weight: 600; - background-color: unset; color: #777777; - height: 39px; - display: flex; justify-content: center; align-items: center; @@ -966,37 +966,31 @@ body.landing_page #main .landing_page_window .tabs .tab.active { body.landing_page #main .landing_page_window label { text-align: left; font-size: 16px; - margin: 15px 0px 4px 0px; } - -.landing_page_window input[type="text"] { - padding: 0px; - height: 38px; - max-width: 354px; -} -.landing_page_window input[type="password"] { +.landing_page_window input[type=text] { padding: 0px; height: 38px; max-width: 354px; } +.landing_page_window input[type=password] { + padding: 0px; + height: 38px; + max-width: 354px; +} -body.landing_page #main .landing_page_window input[type="submit"] { +body.landing_page #main .landing_page_window input[type=submit] { align-self: unset; width: unset; max-width: 354px; - margin: 16px 0px; - font-weight: 700; padding: 12.5px 0px; line-height: 20px; } - - body.landing_page #main .landing_page_window #login_holder .login_form .lostpass { position: unset; text-align: left; @@ -1005,15 +999,13 @@ body.landing_page #main .landing_page_window #login_holder .login_form .lostpass font-weight: 400; font-size: 16px; line-height: 20px; - } + body.landing_page #main .landing_page_window #login_holder .login_form .lostpass a { font-weight: 400; } - /* REGISTRACIJA */ - body.landing_page #main .landing_page_window .register_window { padding: 24px 23px 25px 23px; } @@ -1038,8 +1030,42 @@ body.landing_page #main .landing_page_window .register_window .lostpass { line-height: 20px; } -footer .footer_content .col1-flex{ +footer .footer_content { + max-width: 1160px; + width: 95%; + margin: auto; + padding: 0px; +} + +footer .footer_content h2 { + font-family: "Source Sans Pro"; + text-transform: uppercase; + font-size: 18px; + line-height: 26px; + font-weight: 700; + margin: 0px; + padding-bottom: 12px; +} + +footer .footer_content .col a:hover { + color: #4ca0ea; +} + +footer .footer_content .col1-flex { display: flex; flex-direction: column; } +footer .footer_content .col span { + padding: 0px 0px 12px 0px; +} + +footer .footer_content .col a { + color: #333333; +} + +footer .footer_content .col3 .social_logo_flex a:first-of-type { + margin-right: 20px; +} + +/*# sourceMappingURL=style.css.map */ diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss new file mode 100644 index 000000000..605eaa933 --- /dev/null +++ b/resources/sass/frontend_simple/basic/popravki.scss @@ -0,0 +1,208 @@ +$SansPro_font: "Source Sans Pro"; +$max_sirina: (1160px); +$black: #333333; +$light_blue: #4ca0ea; +$blue: #1e88e5; + +@import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap"); + +/* + Author : Nejc Kovač + Urejanje landing page +*/ + +/* @import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap"); */ + + +body.landing_page #main { + background-image: none; +} + +header { + height: unset; + padding-top: 13px; + padding-left: 0px; + padding-right: 0px; + max-width: 1160px; + width: 95%; + margin: auto; +} + +header .logo a img { + height: 45px; +} +.nav-desktop { + align-items: center; + padding-bottom: 13px; +} + + +.landing_page_content { + font-family: "Source Sans Pro", "sans-serif"; + text-align: center; + color: #333333; +} + +.landing_page_content .landing_page_title { + font-weight: 300; + font-size: 50px; + line-height: 63px; +} + +body.landing_page #main .app_subtitle { +text-shadow: unset; +color: #333333; + +font-weight: 400; +line-height: 26px; +font-size: 18px; + +margin-top: 25px; +margin-bottom: 24px; +} + +body.landing_page #main .landing_page_window { + border: 1px solid #C4C4C4; + max-width: 400px; + width: unset; + min-height: 327px; +} + +body.landing_page #main .landing_page_window #login_holder .login_form { + padding: 25px 23px; +} + +body.landing_page #main .landing_page_window .tabs .tab { + font-size: 16px; + font-weight: 600; + + background-color: unset; + color: #777777; + + height: 39px; + + display: flex; + justify-content: center; + align-items: center; +} + +body.landing_page #main .landing_page_window .tabs .tab.active { + color: #1E88E5; +} + +body.landing_page #main .landing_page_window label { + text-align: left; + font-size: 16px; + + margin: 15px 0px 4px 0px; +} + +.landing_page_window input[type="text"] { + padding: 0px; + height: 38px; + max-width: 354px; +} +.landing_page_window input[type="password"] { + padding: 0px; + height: 38px; + max-width: 354px; +} + +body.landing_page #main .landing_page_window input[type="submit"] { + align-self: unset; + width: unset; + max-width: 354px; + + margin: 16px 0px; + + font-weight: 700; + padding: 12.5px 0px; + line-height: 20px; +} + + +body.landing_page #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; + +} +body.landing_page #main .landing_page_window #login_holder .login_form .lostpass a { + font-weight: 400; +} + + +/* REGISTRACIJA */ + +body.landing_page #main .landing_page_window .register_window { + padding: 24px 23px 25px 23px; +} + +body.landing_page #main .landing_page_window .register_window a { + position: unset; + text-align: left; + text-decoration-line: underline; + text-decoration-color: $blue; + font-weight: 400; + font-size: 16px; + line-height: 20px; +} + +body.landing_page #main .landing_page_window .register_window .lostpass { + position: unset; + text-align: left; + text-decoration-line: underline; + text-decoration-color: $blue; + font-weight: 400; + font-size: 16px; + line-height: 20px; +} + + +footer .footer_content { + max-width: $max_sirina; + width: 95%; + margin: auto; + padding: 0px; +} + + +footer .footer_content h2 { + font-family: $SansPro_font; + text-transform: uppercase; + font-size: 18px; + line-height: 26px; + font-weight: 700; + + margin: 0px; + padding-bottom: 12px; +} + +footer .footer_content .col a:hover{ + color: $light_blue; +} + +// footer .footer_content .col { +// max-width: 290px; +// } + + +footer .footer_content .col1-flex{ + display: flex; + flex-direction: column; +} +footer .footer_content .col span{ + padding: 0px 0px 12px 0px; +} +footer .footer_content .col a { + color: $black; +} + +footer .footer_content .col3 .social_logo_flex a:first-of-type{ + margin-right: 20px; +} + \ No newline at end of file diff --git a/resources/sass/frontend_simple/style.scss b/resources/sass/frontend_simple/style.scss index 7a312df58..31e41e975 100644 --- a/resources/sass/frontend_simple/style.scss +++ b/resources/sass/frontend_simple/style.scss @@ -26,3 +26,7 @@ // Mobile popravki @import "./basic/mobile.scss"; + +// popravki - Nejc Kovac +@import "./basic/popravki.scss"; +