diff --git a/admin/survey/classes/class.SurveyTheme.php b/admin/survey/classes/class.SurveyTheme.php index 54de5a080..3ddfaba8e 100644 --- a/admin/survey/classes/class.SurveyTheme.php +++ b/admin/survey/classes/class.SurveyTheme.php @@ -785,7 +785,7 @@ class SurveyTheme { // Ime teme echo ""; echo ''; - echo self::strip_name($simple_name.($simple_name=='1kaBlue' || $simple_name=='MobileBlue' ? ' ('.$lang['default'].')' : '')); + echo self::strip_name($simple_name.($simple_name=='1kaBlue' || $simple_name=='MobileBlue' ? '
('.$lang['default'].')
' : '')); // Vprasajcki if( in_array($simple_name, array('Fdv', 'Cdi', 'Uni', 'MobileFdv', 'MobileCdi', 'MobileUni')) ){ @@ -799,11 +799,6 @@ class SurveyTheme { echo ' (CSS)'; echo '
'; - // Predogled - echo ''; - // Prilagodi - samo ce je tema aktivna if($is_current_skin || $is_current_mobile_skin){ @@ -816,6 +811,13 @@ class SurveyTheme { echo ' '; echo ''; } + + // Predogled + echo ''; + + echo ''; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 7a1dff4b9..817c74093 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -10183,7 +10183,7 @@ div .table-horizontal-scroll-wrapper2 table { text-align: center; color: #333333; position: relative; - margin: 4px 0px; + padding: 4px 16px; } #anketa_edit .table_header { width: 100%; @@ -20993,7 +20993,7 @@ div.page_tema div.theme_list div.options div.button:last-child { margin-right: 0px; } div.page_tema div.theme_list div.options div.button span.faicon { - margin-right: 10px; + margin-right: 8px; color: #1E88E5; background-color: unset; } @@ -21083,6 +21083,10 @@ div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_l display: flex; align-items: center; } +div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options span.theme_name .privzeto { + text-transform: capitalize; + margin-left: 5px; +} div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options div.button { background: #FFFFFF; border: 1px solid #E5E5E5; @@ -21101,6 +21105,8 @@ div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_l div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options div.button span.faicon { margin: 0; color: #1E88E5; + width: 14px; + height: 14px; } div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options div.button span.faicon:hover { color: #0059AB; diff --git a/resources/sass/admin_new/components/table/table.scss b/resources/sass/admin_new/components/table/table.scss index c3316f5e0..94d85c368 100644 --- a/resources/sass/admin_new/components/table/table.scss +++ b/resources/sass/admin_new/components/table/table.scss @@ -131,7 +131,7 @@ div { color: #333333; position: relative; - margin: 4px 0px; + padding: 4px 16px; } 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 687ad2cf4..d4a543c52 100644 --- a/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss +++ b/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss @@ -146,7 +146,7 @@ div.page_tema { cursor: pointer; span.faicon { - margin-right: 10px; + margin-right: 8px; color: $blue; background-color: unset; } @@ -259,6 +259,10 @@ div.page_tema { display: flex; align-items: center; + .privzeto{ + text-transform: capitalize; + margin-left: 5px; + } } @@ -285,6 +289,8 @@ div.page_tema { span.faicon { margin: 0; color: $blue; + width: 14px; + height: 14px; } span.faicon:hover{ color: #0059AB;