diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php index 6b680b65a..92d34185a 100644 --- a/admin/survey/SurveyAdminAjax.php +++ b/admin/survey/SurveyAdminAjax.php @@ -6943,13 +6943,13 @@ class SurveyAdminAjax { echo '

'; } - # Prevod + // # Prevod - echo '

Prevod: '; - echo 'Belarussian, '; - echo 'Bulgarian'; + // echo '

Prevod: '; + // echo 'Belarussian, '; + // echo 'Bulgarian'; - echo '

'; + // echo '

'; diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 5fd1ee2c6..72c8032a8 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -2797,6 +2797,7 @@ class SurveyAdminSettings { echo '
'; echo '
'; echo $lang['srv_publication_invitations']; + // echo ''; echo '
'; echo $lang['srv_publication_invitations_text']; echo ''; @@ -2923,23 +2924,23 @@ class SurveyAdminSettings { $link1 = $site_url.'a/'.$row['hash']; echo '
'; echo ''.$link1.''.(count($lang_array) > 0 ? ' - '.$base_lang_resp : ''); - echo '
- English
'; + // echo '
- English
'; echo ''; echo '
'; - $link1 = $site_url.'a/'.$row['hash']; - echo '
'; - echo ''.$link1.''.(count($lang_array) > 0 ? ' - '.$base_lang_resp : ''); - echo '
- Slovenščina
'; - echo ''; - echo '
'; + // $link1 = $site_url.'a/'.$row['hash']; + // echo '
'; + // echo ''.$link1.''.(count($lang_array) > 0 ? ' - '.$base_lang_resp : ''); + // echo '
- Slovenščina
'; + // echo ''; + // echo '
'; - $link1 = $site_url.'a/'.$row['hash']; - echo '
'; - echo ''.$link1.''.(count($lang_array) > 0 ? ' - '.$base_lang_resp : ''); - echo '
- Italian
'; - echo ''; - echo '
'; + // $link1 = $site_url.'a/'.$row['hash']; + // echo '
'; + // echo ''.$link1.''.(count($lang_array) > 0 ? ' - '.$base_lang_resp : ''); + // echo '
- Italian
'; + // echo ''; + // echo '
'; // Imamo vec linkov za skupine $ss = new SurveySkupine($this->anketa); diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css index 433c72ab7..f89329de0 100644 --- a/frontend/simple/css/style.css +++ b/frontend/simple/css/style.css @@ -508,6 +508,10 @@ body.login_noEmail #main .landing_page_window .g-recaptcha { display: none !important; } }*/ +body { + font-family: "Source Sans Pro", "sans-serif"; +} + /************GDPR OBRAZEC***************/ body.gdpr { line-height: 26px; @@ -542,6 +546,9 @@ body.gdpr div.label { /******************************/ /************REGISTRACIJSKI OBRAZEC***************/ +body.register .register_holder { + background-color: red; +} body.register .register_holder .subtitle { padding: 0; margin: 0; @@ -1503,6 +1510,17 @@ body.register #main .landing_page_window label:first-of-type { margin-top: 0px; } +.register_email input[type=button] { + font-family: "Source Sans Pro", "sans-serif"; +} + +body.reset_password { + color: #333; +} +body.reset_password input[type=button] { + font-family: "Source Sans Pro", "sans-serif"; +} + /* GDPR ZAHTEVEK -------------------------------------- */ #main { background-color: #FFFFFF; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 3ad9e8245..17b521e5b 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -13411,7 +13411,8 @@ div.drop_setting_transition { #branching ul li .pb_new .pb_page { display: flex; align-items: center; - width: 200px; + white-space: nowrap; + padding-right: 16px; font-size: 16px; font-weight: 600; line-height: 16px; @@ -13421,7 +13422,8 @@ div.drop_setting_transition { #branching ul li .pb_new .pb_page_hover { display: none; align-items: center; - width: 200px; + white-space: nowrap; + padding-right: 16px; font-weight: 400; font-size: 12px; } @@ -14522,6 +14524,7 @@ div#variabla_new span.correct { flex-shrink: 0; width: auto; margin-left: 8px; + padding-right: 0px; font-weight: 600; font-size: 10px; text-align: right; @@ -24504,8 +24507,6 @@ div#vabila div.button_holder .copy_survey_url_holder button { } div#vabila div.button_holder #nice_url_button { margin: 0 0 0 32px; - background-color: #FFC700; - border: 1px #FFC700 solid; } div#vabila div.button_holder #nice_url_holder { display: flex; @@ -24554,11 +24555,11 @@ div#vabila div.more { display: flex; flex-direction: row; flex-wrap: wrap; - gap: 16px 32px; + gap: 16px; } div#vabila div.more div.more_block { height: auto; - width: 298px; + width: 464px; background-color: #FFFFFF; border: 1px solid #E5E5E5; padding: 16px; @@ -24596,6 +24597,9 @@ div#vabila div.more div.more_block div.more_title div.more_title_icon span.fa-1 bottom: 1px; right: 1px; } +div#vabila div.more div.more_block div.more_title .mail_yellow { + margin-left: 32px; +} div#vabila div.more div.more_block div.more_title a.help { color: inherit; text-decoration: none; @@ -24646,7 +24650,12 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more { display: none; } -@media screen and (max-width: 1300px) { +@media screen and (max-width: 1130px) { + .more_block { + width: 42% !important; + } +} +@media screen and (max-width: 1025px) { #vabila .copy_survey_url_holder .input_box { width: 300px; } @@ -24658,6 +24667,37 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more { } #vabila .button_holder #nice_url_holder { margin: 16px 0px !important; + flex-direction: row; + } +} +@media screen and (max-width: 850px) { + .page_vabila #vabila .button_holder #nice_url_holder { + flex-direction: row !important; + } + .page_vabila #vabila .button_holder #nice_url_holder .url { + margin-top: 9px; + } + .page_vabila #vabila .button_holder #nice_url_holder .buttons { + margin: 9px 0px 0px 0px !important; + } +} +@media screen and (max-width: 725px) { + h2 { + font-size: 20px !important; + } +} +@media screen and (max-width: 660px) { + .page_vabila #vabila .more .more_block { + width: unset !important; + width: 100% !important; + } + .page_vabila #vabila .more .more_block #text { + width: 100%; + } +} +@media screen and (max-width: 500px) { + .page_vabila #vabila .button_holder #nice_url_holder { + flex-direction: column !important; } } .page_invitations .invitations_holder.half-half { diff --git a/public/img/icons/lock_yellow.svg b/public/img/icons/lock_yellow.svg new file mode 100644 index 000000000..c623e3512 --- /dev/null +++ b/public/img/icons/lock_yellow.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/resources/sass/admin_new/pages/survey_edit/branching.scss b/resources/sass/admin_new/pages/survey_edit/branching.scss index 040d8beca..88ccf5df3 100644 --- a/resources/sass/admin_new/pages/survey_edit/branching.scss +++ b/resources/sass/admin_new/pages/survey_edit/branching.scss @@ -118,7 +118,8 @@ $branching_main_size_small: calc(100% - 525px); display: flex; align-items: center; - width: 200px; + white-space: nowrap; + padding-right: 16px; font-size: 16px; font-weight: 600; @@ -130,7 +131,9 @@ $branching_main_size_small: calc(100% - 525px); .pb_page_hover{ display: none; align-items: center; - width: 200px; + + white-space: nowrap; + padding-right: 16px; font-weight: 400; font-size: 12px; diff --git a/resources/sass/admin_new/pages/survey_edit/branching_collapsed.scss b/resources/sass/admin_new/pages/survey_edit/branching_collapsed.scss index 2e6ee2471..d942e31d7 100644 --- a/resources/sass/admin_new/pages/survey_edit/branching_collapsed.scss +++ b/resources/sass/admin_new/pages/survey_edit/branching_collapsed.scss @@ -55,6 +55,7 @@ width: auto; margin-left: 8px; + padding-right: 0px; font-weight: 600; font-size: 10px; diff --git a/resources/sass/admin_new/pages/survey_objava/pregled.scss b/resources/sass/admin_new/pages/survey_objava/pregled.scss index d48d8bcc4..4efaf9319 100644 --- a/resources/sass/admin_new/pages/survey_objava/pregled.scss +++ b/resources/sass/admin_new/pages/survey_objava/pregled.scss @@ -124,8 +124,7 @@ div#vabila { // Nice URL - gumb #nice_url_button{ margin: 0 0 0 32px; - background-color: #FFC700; - border: 1px #FFC700 solid; + } // Nice URL - dodajanje @@ -190,11 +189,11 @@ div#vabila { flex-direction: row; flex-wrap: wrap; - gap: 16px 32px; + gap: 16px; div.more_block { height: auto; - width: 298px; + width: 464px; background-color: $white; border: 1px solid $gray; @@ -246,6 +245,10 @@ div#vabila { } } + .mail_yellow{ + margin-left: 32px; + } + a.help { color: inherit; text-decoration: none; @@ -255,6 +258,16 @@ div#vabila { } } + + // div.more_block:first-of-type{ + // .more_title{ + // color: #FFC700; + // } + + // span.faicon.empty{ + // color: #FFC700; + // } + // } } } @@ -324,7 +337,16 @@ div#general_popup { } -@media screen and (max-width: 1300px){ +@media screen and (max-width: 1130px){ + + .more_block{ + width: 42% !important; + } +} + + + +@media screen and (max-width: 1025px){ #vabila{ @@ -346,6 +368,9 @@ div#general_popup { #nice_url_holder { margin: 16px 0px !important; + flex-direction: row; + + } @@ -355,7 +380,99 @@ div#general_popup { } + +} + +@media screen and (max-width: 850px) { + .page_vabila{ + + #vabila{ + + .button_holder{ + + #nice_url_holder { + + flex-direction: row !important; + + .url{ + margin-top: 9px; + } + + .buttons{ + margin: 9px 0px 0px 0px !important; + + } + + } + + + + } + + } + + } +} + +@media screen and (max-width: 725px) { + + h2 { + font-size: 20px !important ; + } +} + +@media screen and (max-width: 660px) { + .page_vabila{ + + #vabila{ + + + .more{ + + .more_block{ + width: unset !important; + width: 100% !important; + + #text { + width: 100%; + } + + + } + + + } + -} \ No newline at end of file + } + + } +} + + +@media screen and (max-width: 500px) { + .page_vabila{ + + #vabila{ + + .button_holder{ + + #nice_url_holder { + + flex-direction: column !important; + + + + } + + + + } + } + + } + + +} diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss index 3e0c7a509..24592d2c3 100644 --- a/resources/sass/frontend_simple/basic/popravki.scss +++ b/resources/sass/frontend_simple/basic/popravki.scss @@ -587,4 +587,19 @@ body.register #main .landing_page_window label:first-of-type { margin-top: 0px; } -// ----------------------------------------- \ No newline at end of file +// ------REGISTER_EMAIL---------------------------------- + +.register_email input[type="button"] { + font-family: $SansPro_font; +} + +// ------RESET PASSWORD---------------------------------- + +body.reset_password{ + + color: #333; + + input[type="button"]{ + font-family: $SansPro_font; + } +} \ No newline at end of file diff --git a/resources/sass/frontend_simple/modules/pages.scss b/resources/sass/frontend_simple/modules/pages.scss index a1f317a4d..7cac65514 100644 --- a/resources/sass/frontend_simple/modules/pages.scss +++ b/resources/sass/frontend_simple/modules/pages.scss @@ -1,3 +1,7 @@ +body { + font-family: $SansPro_font; +} + /************GDPR OBRAZEC***************/ body.gdpr{ line-height: 26px; @@ -40,8 +44,11 @@ body.gdpr{ /************REGISTRACIJSKI OBRAZEC***************/ body.register{ + .register_holder{ + background-color: red; + .subtitle{ padding: 0; margin: 0;