From b37c94ca107450dfcf137fd9e298d692a1caf370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nejc=20Kova=C4=8D?= Date: Wed, 27 Jul 2022 15:14:39 +0200 Subject: [PATCH] Urejanje --> oblika: css test --- admin/survey/classes/class.SurveyTheme.php | 56 ++++++++++++------- public/css/admin_new.css | 23 +++++++- public/img/icons/dots.svg | 3 + .../pages/survey_edit/oblika_teme.scss | 9 ++- 4 files changed, 67 insertions(+), 24 deletions(-) create mode 100644 public/img/icons/dots.svg diff --git a/admin/survey/classes/class.SurveyTheme.php b/admin/survey/classes/class.SurveyTheme.php index 8b6f3abb3..e99b8da9c 100644 --- a/admin/survey/classes/class.SurveyTheme.php +++ b/admin/survey/classes/class.SurveyTheme.php @@ -371,17 +371,23 @@ class SurveyTheme { //Gumbi echo '
'; - //Predogled - echo ''; + echo ''; - //Prilagodi - echo '
'; - echo ''; - echo $lang['srv_te_theme_edit']; - echo '
'; + echo '
'; + + //Predogled + echo ''; + + //Prilagodi + echo '
'; + echo ''; + echo $lang['srv_te_theme_edit']; + echo '
'; + + echo '
'; echo '
'; @@ -417,17 +423,23 @@ class SurveyTheme { //Gumbi echo '
'; - //Predogled - echo ''; + echo ''; - //Prilagodi - echo '
'; - echo ''; - echo $lang['srv_te_theme_edit']; - echo '
'; + echo '
'; + + //Predogled + echo ''; + + //Prilagodi + echo '
'; + echo ''; + echo $lang['srv_te_theme_edit']; + echo '
'; + + echo '
'; echo '
'; @@ -581,6 +593,8 @@ class SurveyTheme { //Gumbi echo '
'; + echo ''; + //Aktiviraj echo '
'; echo ''; @@ -633,6 +647,8 @@ class SurveyTheme { //Gumbi echo '
'; + echo ''; + //Aktiviraj echo '
'; echo ''; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 2435ffb1a..0ef3cf0f3 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -5117,7 +5117,7 @@ p, span { } .bold { - font-weight: 400; + font-weight: 800; } .semi-bold { @@ -9816,6 +9816,17 @@ fieldset { margin-inline-end: 0; border: 1px solid #E5E5E5; } +fieldset .bold { + font-weight: 400; + color: #1E88E5; + text-decoration: underline; +} +fieldset .spaceLeft { + display: flex; +} +fieldset .authority_name { + font-weight: 800; +} fieldset legend { padding: 0 15px; font-size: 16px; @@ -20692,6 +20703,12 @@ div.page_tema div.theme_list div.theme span.desc { div.page_tema div.theme_list div.options { display: flex; flex-direction: row; + position: relative; +} +div.page_tema div.theme_list div.options div.buttons-window { + position: absolute; + bottom: 12px; + max-width: 113px; } div.page_tema div.theme_list div.options div.button { background: #FFFFFF; @@ -20699,7 +20716,7 @@ div.page_tema div.theme_list div.options div.button { box-sizing: border-box; border-radius: 2px; height: 28px; - width: fit-content; + width: 100%; display: flex; align-items: center; padding: 7px 12px; @@ -27977,7 +27994,7 @@ and open the template in the editor. .setting_horizontal_wrapper { display: flex; flex-direction: row; - margin-bottom: 16px; + margin-bottom: 0px; } .setting_horizontal_wrapper .setting_holder { margin-right: 32px; diff --git a/public/img/icons/dots.svg b/public/img/icons/dots.svg new file mode 100644 index 000000000..93519738c --- /dev/null +++ b/public/img/icons/dots.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss b/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss index b802fe623..9985059c6 100644 --- a/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss +++ b/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss @@ -59,6 +59,13 @@ div.page_tema { div.options { display: flex; flex-direction: row; + position: relative; + + div.buttons-window{ + position: absolute; + bottom: 12px; + max-width: 113px; + } div.button { background: $white; @@ -67,7 +74,7 @@ div.page_tema { border-radius: 2px; height: 28px; - width: fit-content; + width: 100%; display: flex; align-items: center;