diff --git a/admin/survey/classes/class.SurveyTheme.php b/admin/survey/classes/class.SurveyTheme.php index 716787e03..3b210f76e 100644 --- a/admin/survey/classes/class.SurveyTheme.php +++ b/admin/survey/classes/class.SurveyTheme.php @@ -774,6 +774,7 @@ class SurveyTheme { // echo ''; // Ime teme + echo ""; echo ''; echo self::strip_name($simple_name.($simple_name=='1kaBlue' || $simple_name=='MobileBlue' ? ' ('.$lang['default'].')' : '')); diff --git a/public/css/admin_new.css b/public/css/admin_new.css index c69aecd9d..8014f736c 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -20934,16 +20934,14 @@ div.page_tema div.theme_list div.options div.buttons-window { position: absolute; bottom: 20px; max-width: 113px; + filter: drop-shadow(2px 2px 2px rgba(0, 0, 0, 0.25)); margin-right: 5px; background-color: white; } -div.page_tema div.theme_list div.options div.buttons-window .button.palette { - padding-top: 20px; - padding-bottom: 4px; -} div.page_tema div.theme_list div.options div.buttons-window .button { border: none; - padding: 19px 16px 0px 16px; + margin: 8px auto 8px auto; + text-align: center; } div.page_tema div.theme_list div.options div.buttons-window .button .fa-hand-pointer { margin-right: 12px; @@ -20951,11 +20949,8 @@ div.page_tema div.theme_list div.options div.buttons-window .button .fa-hand-poi div.page_tema div.theme_list div.options div.buttons-window .button .trash { margin-right: 12px; } -div.page_tema div.theme_list div.options div.buttons-window .button:last-of-type { - padding-bottom: 19px; -} -div.page_tema div.theme_list div.options div.buttons-window .theme_delete { - padding-top: 22px; +div.page_tema div.theme_list div.options div.buttons-window .button .faicon { + vertical-align: middle; } div.page_tema div.theme_list div.options div.buttons-window.active { display: block; @@ -21031,10 +21026,10 @@ div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label { background-color: #F8F8F8; border: 1px solid #F8F8F8; padding: 14px 16px; + margin-bottom: 16px; } div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_content { border-bottom: 1px solid #E5E5E5; - padding-bottom: 15px; box-sizing: border-box; } div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_content img { @@ -21046,15 +21041,23 @@ 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_content span.theme_name { font-weight: 600; + font-family: "Roboto"; + font-weight: 500; } div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options { display: flex; flex-direction: row; justify-content: space-between; box-sizing: border-box; + margin-bottom: 16px; } div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options span.theme_name { font-weight: 500; + text-transform: uppercase; + font-family: "Roboto"; + font-size: 14px; + display: flex; + align-items: center; } div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options div.button { background: #FFFFFF; @@ -21075,6 +21078,9 @@ div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_l margin: 0; color: #1E88E5; } +div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options div.button span.faicon:hover { + color: #0059AB; +} div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options div.button.wtext { padding: 7px 12px; } @@ -21431,6 +21437,10 @@ fieldset#theme-upload h2 span.name { text-transform: none; } +.fa-desktop { + color: #0059AB; +} + fieldset.comments legend span { font-size: 14px; text-transform: none; 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 e2a91ca89..b7896880f 100644 --- a/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss +++ b/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss @@ -76,36 +76,44 @@ div.page_tema { bottom: 20px; max-width: 113px; // display: none; + filter: drop-shadow(2px 2px 2px rgba(0, 0, 0, 0.25)); + margin-right: 5px; background-color: #FFFF; .button.palette{ - padding-top: 20px; - padding-bottom: 4px; + // padding-bottom: 20px; } .button{ border: none; - padding: 19px 16px 0px 16px; + margin: 8px auto 8px auto; // margin: 5px 0px; + text-align: center; + .fa-hand-pointer{ margin-right: 12px; } .trash{ margin-right: 12px; } + + .faicon{ + vertical-align: middle; + } + } + .button:first-of-type{ + // padding-top: 16px; } .button:last-of-type{ - padding-bottom: 19px; - } - .theme_delete{ - padding-top: 22px; + // padding-bottom: 16px; } + } div.buttons-window.active { display: block; @@ -196,11 +204,12 @@ div.page_tema { border: 1px solid $light-gray; padding: 14px 16px; + margin-bottom: 16px; .theme_label_content{ border-bottom: 1px solid $gray; - padding-bottom: 15px; + // padding-bottom: 15px; box-sizing: border-box; img { @@ -215,6 +224,11 @@ div.page_tema { span.theme_name { font-weight: $semi-bold; + font-family: 'Roboto'; + + font-weight: 500; + + } } @@ -223,9 +237,18 @@ div.page_tema { flex-direction: row; justify-content: space-between; box-sizing: border-box; + margin-bottom: 16px; span.theme_name { font-weight: 500; + text-transform: uppercase; + font-family: 'Roboto'; + font-size: 14px; + + display: flex; + align-items: center; + + } @@ -252,6 +275,9 @@ div.page_tema { margin: 0; color: $blue; } + span.faicon:hover{ + color: #0059AB; + } &.wtext { padding: 7px 12px; @@ -507,4 +533,9 @@ fieldset#theme-upload { } } +} + + +.fa-desktop{ + color: #0059AB; } \ No newline at end of file