diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index ba511a2b5..b8d6efdce 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -320,18 +320,18 @@ class SurveyAdmin else{ echo '
'; - // breadcrumbs - echo '
'; + // breadcrumbs + echo '
'; - if ((isset($_GET['a']) && $this->first_action == 'NAVI_STATUS')? $breadcrumbs_a = '_' . $_GET['a'] : $breadcrumbs_a = ''); - if ((isset($_GET['m']) && $this->first_action == 'NAVI_ANALYSIS' && $_GET['m'] == 'charts')? $breadcrumbs_m = '_' . $_GET['m'] : $breadcrumbs_m = ''); - - echo $lang['navigation_'.$this->first_action] . ' > ' . $lang['navigation_'.$this->second_action.$breadcrumbs_a.$breadcrumbs_m]; - if (isset($this->third_action)) { - echo ' > '.$lang['navigation_'.$this->third_action]; - } - //echo '
'.$this->first_action .' > '.$this->second_action. ' > '.$this->third_action; - echo '
'; + if ((isset($_GET['a']) && $this->first_action == 'NAVI_STATUS')? $breadcrumbs_a = '_' . $_GET['a'] : $breadcrumbs_a = ''); + if ((isset($_GET['m']) && $this->first_action == 'NAVI_ANALYSIS' && $_GET['m'] == 'charts')? $breadcrumbs_m = '_' . $_GET['m'] : $breadcrumbs_m = ''); + + echo $lang['navigation_'.$this->first_action] . ' > ' . $lang['navigation_'.$this->second_action.$breadcrumbs_a.$breadcrumbs_m]; + if (isset($this->third_action)) { + echo ' > '.$lang['navigation_'.$this->third_action]; + } + //echo '
'.$this->first_action .' > '.$this->second_action. ' > '.$this->third_action; + echo '
'; echo '
'; diff --git a/admin/survey/redesign_test.php b/admin/survey/redesign_test.php index 3089a33b5..c8daf2d99 100644 --- a/admin/survey/redesign_test.php +++ b/admin/survey/redesign_test.php @@ -1,102 +1,172 @@ -
- -
- Naslov menija -
+ - Posamezna stran -
+?> -
- Posamezna stran -
- -
- Posamezna stran -
- -
- Posamezna stran -
- -
- Naslov menija -
- -
- Posamezna stran -
- -
- Posamezna stran -
- -
- Posamezna stran -
- -
- Posamezna stran -
- - - -
- -
- Box z vsebino - -
- -
- -
-
- -
- -
- -
-
- -
- -
- - - - -
- -
- -
- -
- - - - -
- -
- -
- - - -
- -
- Povezava: www.1ka.si -
- -
+ + + + 1KA | Spletne ankete + + + + + + + + + + + + + + + + + + +
+ +
+ Header +
+ +
+ +
+ + +
+
+ + +
+ Footer +
+ +
+ + + + + + + \ No newline at end of file diff --git a/public/css/admin_new.css b/public/css/admin_new.css new file mode 100644 index 000000000..fc53c68cf --- /dev/null +++ b/public/css/admin_new.css @@ -0,0 +1,128 @@ +/* + Main scss with includes +*/ +/* + Basic scss - variables, layout, colors, font... +*/ +/* + All colors +*/ +/* + Only layout styles - position, display, max-width... +*/ +body { + padding: 0; + margin: 0; +} +body #main_holder { + display: flex; + flex-direction: column; +} +body #main_holder #main { + padding: 64px 0; +} +body #main_holder #main .fullwidth { + max-width: 100%; +} +body #main_holder #main .narrow { + margin: 0 auto; + max-width: 1060px; +} +body #main_holder #main .wide { + margin: 0 auto; + max-width: 1360px; +} +body #main_holder #main .menu_left { + display: flex; + flex-direction: row; + justify-content: center; +} +body #main_holder #main .menu_left .left { + box-sizing: border-box; + width: 300px; + padding-right: 64px; +} +body #main_holder #main .menu_left .right { + flex-grow: 1; +} +/* + Components scss +*/ +header { + height: 170px; + background-color: #eee; +} + +footer { + height: 120px; + background-color: #eee; +} + +/* + Form scss - input fields, buttons... +*/ +button, +submit { + box-sizing: border-box; + font-weight: 600; + box-shadow: none; + border: 0; +} +button.small, +submit.small { + padding: 5px 32px; + font-size: 14px; +} +button.medium, +submit.medium { + padding: 10px 32px; + font-size: 16px; +} +button.large, +submit.large { + padding: 12px 32px; + font-size: 20px; +} +button.blue, +submit.blue { + color: #FFFFFF; + background-color: #1E88E5; +} +button.white-blue, +submit.white-blue { + color: #1E88E5; + background-color: #FFFFFF; + border: 1px #1E88E5 solid; +} +button.white-black, +submit.white-black { + color: #333333; + background-color: #FFFFFF; + border: 1px #333333 solid; +} +button.gray, +submit.gray { + color: #333333; + background-color: #E5E5E5; + border: 1px #333333 solid; +} +button.yellow, +submit.yellow { + color: #333333; + background-color: #FFC700; +} +button.red, +submit.red { + color: #FFFFFF; + background-color: #FF0000; +} + +fieldset { + padding: 32px; +} + +/* + Specific pages scss +*/ + +/*# sourceMappingURL=admin_new.css.map */ diff --git a/resources/sass/admin_new/basic/animations.scss b/resources/sass/admin_new/basic/animations.scss new file mode 100644 index 000000000..e69de29bb diff --git a/resources/sass/admin_new/basic/basic.scss b/resources/sass/admin_new/basic/basic.scss new file mode 100644 index 000000000..1d95d757e --- /dev/null +++ b/resources/sass/admin_new/basic/basic.scss @@ -0,0 +1,10 @@ +/* + Basic scss - variables, layout, colors, font... +*/ + + +@import "font"; +@import "colors"; +@import "variables"; +@import "layout"; +@import "animations"; diff --git a/resources/sass/admin_new/basic/colors.scss b/resources/sass/admin_new/basic/colors.scss new file mode 100644 index 000000000..cf08c5446 --- /dev/null +++ b/resources/sass/admin_new/basic/colors.scss @@ -0,0 +1,15 @@ +/* + All colors +*/ + + + +$blue: #1E88E5; + +$black: #333333; +$white: #FFFFFF; +$gray: #E5E5E5; + +$yellow: #FFC700; +$red: #FF0000; + diff --git a/resources/sass/admin_new/basic/font.scss b/resources/sass/admin_new/basic/font.scss new file mode 100644 index 000000000..e69de29bb diff --git a/resources/sass/admin_new/basic/icons.scss b/resources/sass/admin_new/basic/icons.scss new file mode 100644 index 000000000..e69de29bb diff --git a/resources/sass/admin_new/basic/layout.scss b/resources/sass/admin_new/basic/layout.scss new file mode 100644 index 000000000..ebb774765 --- /dev/null +++ b/resources/sass/admin_new/basic/layout.scss @@ -0,0 +1,56 @@ +/* + Only layout styles - position, display, max-width... +*/ + +body{ + padding: 0; + margin: 0; + + #main_holder{ + display: flex; + flex-direction: column; + + header{ + + } + + #main{ + padding: 64px 0; + + .fullwidth{ + max-width: 100%; + } + + .narrow{ + margin: 0 auto; + max-width: 1060px; + } + + .wide{ + margin: 0 auto; + max-width: 1360px; + } + + .menu_left{ + display: flex; + flex-direction: row; + justify-content: center; + + .left{ + box-sizing: border-box; + + width: 300px; + padding-right: 64px; + } + + .right{ + flex-grow: 1; + } + } + } + + footer{ + + } + } +} \ No newline at end of file diff --git a/resources/sass/admin_new/basic/variables.scss b/resources/sass/admin_new/basic/variables.scss new file mode 100644 index 000000000..e69de29bb diff --git a/resources/sass/admin_new/components/components.scss b/resources/sass/admin_new/components/components.scss new file mode 100644 index 000000000..3209b2a05 --- /dev/null +++ b/resources/sass/admin_new/components/components.scss @@ -0,0 +1,14 @@ +/* + Components scss +*/ + + +// Layout components +@import "header/header"; +@import "footer/footer"; +@import "main/main"; + +// Functional components +@import "form/form"; +@import "table/table"; +@import "popup/popup"; \ No newline at end of file diff --git a/resources/sass/admin_new/components/footer/footer.scss b/resources/sass/admin_new/components/footer/footer.scss new file mode 100644 index 000000000..0e582d7a0 --- /dev/null +++ b/resources/sass/admin_new/components/footer/footer.scss @@ -0,0 +1,5 @@ +footer{ + height: 120px; + + background-color: #eee; +} \ No newline at end of file diff --git a/resources/sass/admin_new/components/form/button.scss b/resources/sass/admin_new/components/form/button.scss new file mode 100644 index 000000000..9609b5d4f --- /dev/null +++ b/resources/sass/admin_new/components/form/button.scss @@ -0,0 +1,62 @@ +button, +submit{ + box-sizing: border-box; + + font-weight: 600; + + box-shadow: none; + border: 0; + + // Button sizes + &.small{ + padding: 5px 32px; + + font-size: 14px; + } + &.medium{ + padding: 10px 32px; + + font-size: 16px; + } + &.large{ + padding: 12px 32px; + + font-size: 20px; + } + + + // Button colors + &.blue{ + color: $white; + + background-color: $blue; + } + &.white-blue{ + color: $blue; + + background-color: $white; + border: 1px $blue solid; + } + &.white-black{ + color: $black; + + background-color: $white; + border: 1px $black solid; + } + &.gray{ + color: $black; + + background-color: $gray; + border: 1px $black solid; + } + &.yellow{ + color: $black; + + background-color: $yellow; + } + &.red{ + color: $white; + + background-color: $red; + } +} \ No newline at end of file diff --git a/resources/sass/admin_new/components/form/fieldset.scss b/resources/sass/admin_new/components/form/fieldset.scss new file mode 100644 index 000000000..340f76041 --- /dev/null +++ b/resources/sass/admin_new/components/form/fieldset.scss @@ -0,0 +1,4 @@ +fieldset{ + padding: 32px; + +} \ No newline at end of file diff --git a/resources/sass/admin_new/components/form/form.scss b/resources/sass/admin_new/components/form/form.scss new file mode 100644 index 000000000..a77f60b14 --- /dev/null +++ b/resources/sass/admin_new/components/form/form.scss @@ -0,0 +1,8 @@ +/* + Form scss - input fields, buttons... +*/ + + +@import "button"; +@import "input"; +@import "fieldset"; \ No newline at end of file diff --git a/resources/sass/admin_new/components/form/input.scss b/resources/sass/admin_new/components/form/input.scss new file mode 100644 index 000000000..e69de29bb diff --git a/resources/sass/admin_new/components/header/header.scss b/resources/sass/admin_new/components/header/header.scss new file mode 100644 index 000000000..1a3979368 --- /dev/null +++ b/resources/sass/admin_new/components/header/header.scss @@ -0,0 +1,5 @@ +header{ + height: 170px; + + background-color: #eee; +} \ No newline at end of file diff --git a/resources/sass/admin_new/components/main/main.scss b/resources/sass/admin_new/components/main/main.scss new file mode 100644 index 000000000..85431f03d --- /dev/null +++ b/resources/sass/admin_new/components/main/main.scss @@ -0,0 +1 @@ +@import "menu_left"; \ No newline at end of file diff --git a/resources/sass/admin_new/components/main/menu_left.scss b/resources/sass/admin_new/components/main/menu_left.scss new file mode 100644 index 000000000..e69de29bb diff --git a/resources/sass/admin_new/components/popup/popup.scss b/resources/sass/admin_new/components/popup/popup.scss new file mode 100644 index 000000000..e69de29bb diff --git a/resources/sass/admin_new/components/table/table.scss b/resources/sass/admin_new/components/table/table.scss new file mode 100644 index 000000000..e69de29bb diff --git a/resources/sass/admin_new/mobile/basic.scss b/resources/sass/admin_new/mobile/basic.scss new file mode 100644 index 000000000..19bca6a05 --- /dev/null +++ b/resources/sass/admin_new/mobile/basic.scss @@ -0,0 +1,66 @@ +#main{ + margin-top: 70px; + padding-bottom: 30px; + /*overflow-x: scroll;*/ + + #anketa_edit{ + box-sizing: border-box !important; + padding: 15px !important; + } + + #placeholder{ + width: auto; + } +} + +fieldset { + width: 100% !important; + + box-sizing: border-box !important; + margin-left: 0 !important; + margin-right: 0 !important; + + .nastavitveSpan1, + .nastavitveSpan2, + .nastavitveSpan3, + .nastavitveSpan4, + .nastavitveSpan5, + .nastavitveSpan6{ + width: auto !important; + display: block !important; + float: none !important; + + text-align: left !important; + padding: 15px 0 5px 0 !important; + } + + select, + .select2-container, + input[type="text"], + textarea{ + width: 100% !important; + box-sizing: border-box; + } + + .setting{ + height: auto !important; + } +} + +#vnosi_paginacija { + div { + select { + display: inline-block; + width: fit-content; + margin: 0 5px; + text-align: center; + } + } +} + +div.breadcrumbs { + display: block; + padding: 15px; + color: $strong_blue; + font-weight: 600; +} \ No newline at end of file diff --git a/resources/sass/admin_new/mobile/footer.scss b/resources/sass/admin_new/mobile/footer.scss new file mode 100644 index 000000000..f8df9da45 --- /dev/null +++ b/resources/sass/admin_new/mobile/footer.scss @@ -0,0 +1,10 @@ +#srv_footer{ + display: flex; + flex-direction: column; + + margin-top: 0; + + .footer_left{ + margin-bottom: 10px; + } +} diff --git a/resources/sass/admin_new/mobile/header.scss b/resources/sass/admin_new/mobile/header.scss new file mode 100644 index 000000000..b957bcdb0 --- /dev/null +++ b/resources/sass/admin_new/mobile/header.scss @@ -0,0 +1,330 @@ +.desktop_header{ + display: none; +} + +.mobile_header{ + position: fixed; + z-index: 9990; + + display: flex; + align-items: center; + + width: 100vw; + height: 70px; + + border-bottom: 1px solid $grey_super_light; + + // Znotraj ankete + &.survey_edit{ + color: white; + background-color: $strong_blue; + } + + // Seznam anket + &.survey_list{ + color: $strong_blue; + background-color: white; + } + + + .mobile_menu_icon{ + width: 60px; + text-align: center; + + &.mobile_menu_close{ + display: none; + + span{ + font-size: 30px; + font-weight: 600; + line-height: 25px; + } + } + + span{ + cursor: pointer; + } + } + + .mobile_settings_icon{ + width: 60px; + text-align: center; + + &.mobile_settings_close{ + display: none; + + span{ + font-size: 30px; + font-weight: 600; + line-height: 25px; + } + } + + span{ + cursor: pointer; + + &::before{ + font-size: 24px; + } + } + } + + .mobile_survey_title{ + width: calc(100% - 120px); + + text-align: center; + font-size: 14px; + font-weight: 500; + } + .mobile_logo{ + width: calc(100% - 120px); + + #enka_logo{ + margin: 0 auto; + } + } +} + + + +/* Mobile meni */ +.mobile_menu{ + position: fixed; + z-index: 9995; + + display: flex; + flex-direction: column; + + top: 71px; + bottom: 0; + width: 85vw; + + color: $main_text; + + background-color: #ffffff; + + overflow: hidden; + -webkit-overflow-scrolling: touch; + overflow-y: auto; + pointer-events: none; + transform: translateX(-100%); + + &:not(.no-transition), + .submenu:not(.no-transition){ + transition: all 250ms; + } + + &.opened{ + pointer-events: auto; + transform: translateX(0px); + } + + &.submenu-opened{ + overflow: hidden; + } + + ul { + list-style-type: none; + padding: 0; + padding-left: 0px; + margin: 0; + + -webkit-overflow-scrolling: touch; + + > li { + display: block; + + > a { + position: relative; + display: block; + + padding: 18px 20px; + + font-size: 14px; + font-weight: 500; + text-decoration: none; + + transition: all 150ms; + + &:hover { + background-color: $soft_blue; + border-radius: 3px; + } + + .arrow_back{ + display: block; + position: absolute; + right: 20px; + top: 18px; + + transform: rotate(180deg); + } + } + + a.active { + color: $orange; + background-color: inherit; + } + + &:not(:last-child) > a { + border-bottom: 1px solid $grey_super_light; + } + } + } + + .submenu{ + overflow: hidden; + -webkit-overflow-scrolling: touch; + overflow-y: auto; + pointer-events: none; + z-index: 9998; + + position: fixed; + bottom: 0; + top: 0; + left: 100%; + + width:100%; + min-height: 100%; + + background-color: #ffffff; + + &.opened{ + left:0; + pointer-events:auto; + } + &.opened:not(.current){ + overflow:hidden; + } + } + + .submenu-header { + cursor: pointer; + position: relative; + display: flex; + + border-bottom: solid 1px $grey_super_light; + + > a { + display: block; + font-size: 14px; + font-weight: 500; + padding: 18px 20px; + padding-left: 20px; + text-decoration: none; + } + + > label { + display: block; + width: calc(100% - 110px); + + margin-bottom: 8px; + margin-top: 20px; + padding-left: 0px; + + font-size: 15px; + font-weight: 500; + text-align: center; + + opacity: .5; + } + } + + .mobile_menu_user{ + + li.has-submenu{ + + .arrow_back{ + line-height: 30px; + } + + a{ + font-size: 13px; + color: $main_text; + + .email{ + font-size: 12px; + } + } + } + + .submenu_user_content{ + display: flex; + flex-direction: column; + + padding: 20px; + + > div{ + padding: 5px 0 10px 0; + font-size: 14px; + font-weight: 500; + + .faicon{ + padding-right: 10px; + vertical-align: -1px; + } + } + } + } +} + +/* Mobile meni - NASTAVITVE V UREJANJU ANKETE*/ +.mobile_settings{ + position: fixed; + right: 0; + z-index: 9994; + + top: 71px; + bottom: 0; + width: 85vw; + + color: $main_text; + + background-color: #ffffff; + + overflow: hidden; + -webkit-overflow-scrolling: touch; + overflow-y: auto; + /*pointer-events: none;*/ + margin-right: -85vw; + + .mobile_settings_content { + display: flex; + flex-direction: column; + + padding: 20px; + + a{ + display: flex; + align-items: center; + + padding: 0 0 15px 0; + + font-size: 13px; + + &.anketa_img_nav{ + padding-bottom: 20px; + margin-bottom: 20px; + border-bottom: 1px $soft_blue solid; + } + + .faicon::before{ + padding-right: 10px; + font-size: 20px; + } + + .setting_icon{ + width: 60px; + min-width: 60px; + + &.bottom{ + width: 30px; + min-width: 30px; + } + } + .setting_text{ + width: auto; + } + } + } +} diff --git a/resources/sass/admin_new/mobile/mobile.scss b/resources/sass/admin_new/mobile/mobile.scss new file mode 100644 index 000000000..3fec17fdd --- /dev/null +++ b/resources/sass/admin_new/mobile/mobile.scss @@ -0,0 +1,35 @@ + +$breakpoint-tablet: 1100px; +$breakpoint-mobile: 850px; + + +// Samo responsive fixi za malo ozje ekrane, tablice +@media (max-width: $breakpoint-tablet) { + @import "responsive_fixes"; +} + +// Mobile popravki +@media (max-width: $breakpoint-mobile) { + + // Osnova + @import "basic"; + @import "header"; + @import "footer"; + + @import "popup"; + + // Posamezne strani + @import "pages/my_surveys"; + @import "pages/new_survey"; + @import "pages/status"; + @import "pages/branching"; + @import "pages/survey_settings"; + @import "pages/testing"; + @import "pages/publish"; + @import "pages/data"; + @import "pages/analysis"; + @import "pages/no_survey"; + @import "pages/settings_profile"; + @import "pages/archive"; +} + diff --git a/resources/sass/admin_new/mobile/pages/analysis.scss b/resources/sass/admin_new/mobile/pages/analysis.scss new file mode 100644 index 000000000..785e2065d --- /dev/null +++ b/resources/sass/admin_new/mobile/pages/analysis.scss @@ -0,0 +1,61 @@ + +// Tabele +.analysis_bottom_settings a:first-child{ + display: block; + margin: 0 0 20px 0 !important; +} + + + +// Grafi +.chart_holder{ + width: 100%; + box-sizing: border-box; + + .chart_img{ + min-height: auto; + float: none; + + pointer-events: none; + + img { + width: 100%; + } + } + + .chart_settings{ + display: none; + } + + .chart_bottom_settings{ + + &:first-child{ + display: block; + clear: both; + } + } +} + + + +// Porocila +table.analysis_reports{ + border-spacing: 0px; + + > tbody > tr, + > tbody > tr > td{ + display: flex; + flex-direction: column; + + width: 100%; + box-sizing: border-box; + } + + > tbody > tr > td{ + margin: 10px 0; + } + + fieldset{ + margin-bottom: 0 !important; + } +} \ No newline at end of file diff --git a/resources/sass/admin_new/mobile/pages/archive.scss b/resources/sass/admin_new/mobile/pages/archive.scss new file mode 100644 index 000000000..64ecd1522 --- /dev/null +++ b/resources/sass/admin_new/mobile/pages/archive.scss @@ -0,0 +1,19 @@ + +.page_arhivi, +.page_tracking, +.subpage_anal_arch, +.subpage_view_archive, +.subpage_anal_arch{ + flex-direction: column !important; + + .anketa_edit_left{ + display: none !important; + } + + .anketa_edit_main{ + width: 100% !important; + box-sizing: border-box; + + margin: 0 !important; + } +} diff --git a/resources/sass/admin_new/mobile/pages/branching.scss b/resources/sass/admin_new/mobile/pages/branching.scss new file mode 100644 index 000000000..4f84e19d7 --- /dev/null +++ b/resources/sass/admin_new/mobile/pages/branching.scss @@ -0,0 +1,266 @@ + +.page_branching #placeholder, +.page_ #placeholder{ + margin-left: 0; +} + +.locked .add-variable-mobile, +.spremenljivka_content:hover .add-variable { + display: none !important; +} + +#branching{ + width: 100%; + + li{ + margin: 0 10px 0 10px !important; + } + + .spr_edit{ + display: none !important; + } + + .content_div_normalmode{ + padding-bottom: 40px; + } + .add-variable-mobile { + display: block; + position: absolute; + left: 59px; + bottom: 20px; + } + + .empty_vrivanje { + padding: 30px 0 !important; + margin: 20px 10px 20px 10px !important; + + .empty_vrivanje_title{ + display: none; + + margin: 0 20px; + font-size: 14px; + } + .empty_vrivanje_subtitle{ + display: none; + + margin: 15px 20px 0 15px; + font-size: 13px; + } + + .mobile_add_question{ + position: relative; + bottom: auto; + } + } + + #bottom_icons_holder{ + display: flex; + flex-direction: column; + + .forma_bottom{ + display: flex; + flex-direction: column; + align-items: left; + + width: 100%; + height: auto; + padding: 30px 10px 20px 20px; + + .forma_bottom_inner{ + display: flex; + flex-direction: row; + + padding: 0 0 10px 0; + margin: 0; + + a{ + margin: 0 11px 0 2px; + padding: 0; + } + } + } + + } +} + + +// Toolbox na levi +#toolbox_advanced_settings{ + display: none !important; + top: 150px; +} +#toolbox_basic{ + display: none !important; + top: 187px; +} + +// Knjiznice ni nikoli +#toolbox_library{ + display: none !important; +} + + +// Mobile gumb za dodajanje vprašanja na konec +.mobile_add_question{ + display: block; + position: fixed; + bottom: 25px; + left: calc(50% - 95px); + + width: 190px; + + a{ + display: flex !important; + justify-content: center; + padding: 10px 20px 10px !important; + + font-size: 14px; + font-weight: 500; + } + + .plus{ + margin-right: 8px; + + font-size: 28px; + line-height: 15px; + font-weight: 600; + } +} + +// Mobile popup za dodajanje vprasanja +.mobile_add_question_popup{ + z-index: 9999; + position: fixed; + top: 0; + left: 0; + + width: 100%; + height: 100%; + + box-sizing: border-box; + padding: 40px 20px 20px 20px; + + background: white; + + .mobile_add_question_item{ + cursor: pointer; + position: relative; + + box-sizing: border-box; + width: 300px; + height: 45px; + + margin: 15px auto 5px auto; + + font-size: 16px; + font-weight: 500; + text-align: center; + + background-color: $soft_blue_very_lighten; + border: 1px $soft_blue_lighten solid; + + &:hover{ + background-color: $soft_blue_lighten; + border: 1px $soft_blue solid; + } + + span.faicon{ + position: absolute; + left: 20px; + line-height: 42px; + + &.matrix_32{ + line-height: 10px; + margin-top: 9px; + } + } + span.item_text{ + line-height: 42px; + } + } + + .mobile_add_question_button{ + position: absolute; + bottom: 25px; + left: calc(50% - 95px); + + box-sizing: border-box; + width: 190px; + + text-align: center; + + a{ + padding: 10px 20px 10px !important; + + font-size: 14px; + font-weight: 500; + } + } +} + + + +// Urejanje vprasanja popup +#vprasanje_float_editing{ + position: fixed; + z-index: 99999; + + width: 100%; + height: 100%; + max-height: 100%; + overflow-y: auto; + overflow-x: hidden; + + margin: 0 !important; + top: 0; + right: 0; + left: 0; + + box-shadow: 0px 0px 100px 100px #333; + + #vprasanje_edit{ + top: 0; + margin-bottom: 55px; + } + + #vprasanje_tabs{ + position: absolute; + top: 42px; + + a.tab_link{ + height: auto; + padding: 10px 9px; + } + } + + .tab{ + padding-top: 100px; + + h2{ + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 42px; + + box-sizing: border-box; + padding: 10px; + margin: 0; + } + } + + #vprasanje_buttons{ + display: flex; + justify-content: space-evenly; + position: relative; + + bottom: 30px; + padding: 0 15px; + + span{ + width: 40%; + margin-left: 0 !important; + text-align: center; + } + } +} \ No newline at end of file diff --git a/resources/sass/admin_new/mobile/pages/data.scss b/resources/sass/admin_new/mobile/pages/data.scss new file mode 100644 index 000000000..7fb84decb --- /dev/null +++ b/resources/sass/admin_new/mobile/pages/data.scss @@ -0,0 +1,98 @@ + +.page_data{ + + #vnosi_paginacija{ + display: flex; + flex-direction: column; + float: none; + + > div{ + margin: 5px 0; + } + + label{ + margin: 0; + padding: 0; + } + } + + #data_search_filter{ + display: flex; + width: 100%; + box-sizing: border-box; + + input{ + box-sizing: border-box; + margin-left: 10px; + width: 100%; + } + } + + .dataSettingsBasic{ + width: 100%; + box-sizing: border-box; + + margin: 0; + } + + #toggleDataCheckboxes{ + display: none; + } + + + #div_vnosi_data{ + + #dataTableScroller { + display: none; + } + + #tableContainer{ + overflow-y: hidden; + padding-bottom: 20px; + } + } + + #bottom_data_legend{ + display: block; + float: none; + + width: 100%; + box-sizing: border-box; + + margin: 5px 0 10px 0; + } +} + + + +// Ostale podstrani +.subpage_append, +.subpage_merge, +.subpage_calculation, +.subpage_coding_auto, +.subpage_recoding, +.subpage_coding, +.page_export{ + flex-direction: column !important; + + .anketa_edit_main{ + width: 100% !important; + box-sizing: border-box; + + margin: 0 !important; + } + + .anketa_edit_left{ + display: none !important; + } + + textarea{ + width: 100% !important; + } + + #inv_upload_recipients_nosbmt + span{ + display: block; + clear: both; + margin: 40px 0 0 0 !important; + } +} diff --git a/resources/sass/admin_new/mobile/pages/my_surveys.scss b/resources/sass/admin_new/mobile/pages/my_surveys.scss new file mode 100644 index 000000000..25e949a79 --- /dev/null +++ b/resources/sass/admin_new/mobile/pages/my_surveys.scss @@ -0,0 +1,103 @@ + +#main #moje_ankete_edit{ + padding: 20px !important; + + #anketa_edit{ + padding: 0 !important; + } + + #survey_list{ + display: flex; + flex-direction: column; + + > div{ + margin: 15px 0 20px 0; + } + + #anketa_new_float{ + display: flex; + justify-content: left; + } + + #pagination{ + margin-left: auto; + margin-right: auto; + + transform: none; + + display: none; + + &.bottom{ + display: block; + } + } + + #sortButton, + #filterButton, + #folderSwitch{ + display: none; + } + + #searchMySurveys{ + padding: 0; + + form{ + display: flex; + justify-content: center; + + input[type="text"]{ + width: 100%; + padding: 5px 0 5px 7px; + } + } + } + + .div_sl_new { + padding: 20px 0; + } + + // Tabela z mojimi anketami + table#surveyList_new{ + + td{ + display: none; + + &:nth-child(3), + &:nth-child(6){ + display: table-cell; + } + } + } + } + + + // Knjiznica + &.page_knjiznica{ + + .folder_left{ + line-height: 20px; + } + + .folder_right .library_item_setting_text{ + display: none; + } + + ul li.anketa{ + margin: 5px 0; + } + } + + + // Nastavitve + fieldset{ + + div.data { + margin-top: 10px; + } + + div.setting{ + margin-bottom: 10px; + } + } +} + diff --git a/resources/sass/admin_new/mobile/pages/new_survey.scss b/resources/sass/admin_new/mobile/pages/new_survey.scss new file mode 100644 index 000000000..70e0ba076 --- /dev/null +++ b/resources/sass/admin_new/mobile/pages/new_survey.scss @@ -0,0 +1,107 @@ + +#new_anketa_div{ + display: flex; + flex-direction: column; + + min-height: auto; + width: 100%; + + + #left_menu, + #right_content{ + width: 100%; + position: relative; + } + + #right_content{ + box-sizing: border-box; + + margin: 20px 0 0 0; + padding: 0; + + .setting{ + width: 100% !important; + margin: 0 !important; + padding: 0 !important; + } + + .survey_title_text_holder{ + flex-direction: column !important; + } + + select{ + width: 100% !important; + margin: 0; + } + input{ + width: 100% !important; + box-sizing: border-box; + } + + .survey_type_holder{ + flex-direction: column !important; + + label{ + margin-bottom: 15px; + + > div{ + box-sizing: border-box; + padding: 10px !important; + } + } + } + + .fieldset{ + line-height: 24px; + + input[type="file"]{ + margin-top: 20px; + } + } + } + + #input_field_holder, + #preview_field_holder{ + width: 100% !important; + float: none; + + box-sizing: border-box; + margin: 0 !important; + padding: 10px 0 !important; + } + .from_text_instructions{ + line-height: 20px !important; + } + + .fieldset.noSurvey_template{ + display: flex; + flex-direction: column; + + .template{ + align-self: center; + width: auto !important; + + .template_preview { + margin-right: 10px !important; + } + } + } + + #left_menu ul.template_type_menu{ + display: none; + } + select.template_type_menu{ + display: block !important; + + height: 40px; + width: 100%; + padding: 2px 5px; + margin-bottom: 40px !important; + + font-size: 15px !important; + + border: 1px solid #c8e3f8 !important; + border-radius: 1px; + } + +} diff --git a/resources/sass/admin_new/mobile/pages/no_survey.scss b/resources/sass/admin_new/mobile/pages/no_survey.scss new file mode 100644 index 000000000..5997d9d4d --- /dev/null +++ b/resources/sass/admin_new/mobile/pages/no_survey.scss @@ -0,0 +1,31 @@ +.noSurvey_sequence { + padding: 0; + + .main_holder{ + + &.main{ + flex-direction: column; + } + + .left_holder{ + width: 90% !important; + margin: auto; + } + + .right_holder{ + width: 90% !important; + margin: auto; + } + + } + + .buttons_holder { + flex-direction: column; + align-items: center; + + a .button { + margin: 10px 30px; + } + } +} + diff --git a/resources/sass/admin_new/mobile/pages/publish.scss b/resources/sass/admin_new/mobile/pages/publish.scss new file mode 100644 index 000000000..0d1de2835 --- /dev/null +++ b/resources/sass/admin_new/mobile/pages/publish.scss @@ -0,0 +1,175 @@ + +#vabila > table, +table.invitations_settings, +#inv_msg_preview table, +#inv_send_mail table{ + border-spacing: 0px; + width: 100%; + + tbody{ + display: flex; + flex-direction: column; + width: 100% !important; + } + + > tbody > tr, + > tbody > tr > td{ + display: flex; + flex-direction: column; + + width: 100% !important; + box-sizing: border-box; + } + + > tbody > tr > td{ + height: auto !important; + margin: 0; + padding: 0 !important; + + > br{ + display: none; + } + + > div, + > fieldset{ + margin: 15px 0; + } + } + + colgroup, + colgroup col{ + width: 100% !important; + } + + p label{ + width: 100%; + + input[type="text"], + input[type="number"], + input[type="password"]{ + width: 100% !important; + box-sizing: border-box; + } + } +} + +#surveyInvitationSetting, +#surveyInvitationSettingServer{ + min-width: 100% !important; + width: 100% !important; + + margin: 10px 0 !important; + box-sizing: border-box !important; +} + +// Navigacija v vabilih +#inv_top_navi{ + display: flex; + flex-direction: column; + + width: 100%; + padding: 0; + margin: 0; + + .inv_space{ + display: none; + } + + > #inv_step_nav{ + width: 100%; + + padding: 0; + margin: 0 0 15px 0; + + .inv_step{ + height: auto; + padding: 0; + margin: 0; + } + span.label{ + padding: 0; + } + } + + > #inv_step_nav.yellow{ + display: flex; + justify-content: space-between; + + + .inv_step{ + + span.circle{ + width: 18px; + height: 18px; + line-height: 18px; + } + + span.label{ + padding: 0 0 0 3px; + } + } + + .inv_step_space{ + display: none; + } + } +} + + +// VABILA podstrani +#inv_recipients_profiles_holder, +#inv_import_list_container, +#inv_messages_profiles_holder, +#inv_msg_preview_hld, +#invitation_profile_notes, +#inv_select_mail_to, +#inv_select_mail_preview{ + width: 100%; + box-sizing: border-box; + + margin: 15px 0 !important; + + textarea{ + width: 100%; + } +} + +#inv_msg_preview table{ + + th{ + height: auto !important; + width: 100% !important; + margin: 0; + padding: 20px 0 0 0 !important; + + text-align: left; + } + + input{ + width: 100%; + box-sizing: border-box; + } +} + +.addthis_toolbox{ + line-height: 24px; + + .at-icon-wrapper{ + height: 24px !important; + width: 24px !important; + + svg{ + height: 24px !important; + width: 24px !important; + } + } + + .addthis_separator{ + font-size: 16px; + } +} + + +#inv_field_container ul li { + width: 45%; +} diff --git a/resources/sass/admin_new/mobile/pages/settings_profile.scss b/resources/sass/admin_new/mobile/pages/settings_profile.scss new file mode 100644 index 000000000..0a10f3f1d --- /dev/null +++ b/resources/sass/admin_new/mobile/pages/settings_profile.scss @@ -0,0 +1,18 @@ +// Zadnjih 25 sprememb tabela - horizontal scroll + #table-tracking-wrapper1 { + display: table; + table-layout: fixed; + width: 100%; + } + + #table-tracking-wrapper2 { + display: table-cell; + overflow-x: auto; + width: 100%; + } + + #table-tracking-wrapper2 table { + width: 100%; + border-collapse: collapse; + white-space: nowrap; + } \ No newline at end of file diff --git a/resources/sass/admin_new/mobile/pages/status.scss b/resources/sass/admin_new/mobile/pages/status.scss new file mode 100644 index 000000000..814032937 --- /dev/null +++ b/resources/sass/admin_new/mobile/pages/status.scss @@ -0,0 +1,16 @@ +table.dashboard{ + border-spacing: 0px; + + > tbody > tr, + > tbody > tr > td{ + display: flex; + flex-direction: column; + + width: 100%; + box-sizing: border-box; + } + + > tbody > tr > td{ + margin: 15px 0; + } +} diff --git a/resources/sass/admin_new/mobile/pages/survey_settings.scss b/resources/sass/admin_new/mobile/pages/survey_settings.scss new file mode 100644 index 000000000..d739bbcb5 --- /dev/null +++ b/resources/sass/admin_new/mobile/pages/survey_settings.scss @@ -0,0 +1,104 @@ + +#main #anketa #globalSetingsList { + max-width: 100% !important; + width: 100% !important; + + fieldset{ + width: 100% !important; + } +} + + +/* NASTAVITVE in ARHIVI */ +#main #anketa #anketa_edit.page_nastavitve, +#main #anketa #anketa_edit.page_osn_pod, +#main #anketa #anketa_edit.page_mobile_settings, +#main #anketa #anketa_edit.page_jezik, +#main #anketa #anketa_edit.page_dostop, +#main #anketa #anketa_edit.page_piskot, +#main #anketa #anketa_edit.page_alert, +#main #anketa #anketa_edit.page_trajanje, +#main #anketa #anketa_edit.page_skupine, +#main #anketa #anketa_edit.page_urejanje, +#main #anketa #anketa_edit.page_prikaz, +#main #anketa #anketa_edit.page_metadata, +#main #anketa #anketa_edit.page_missing, +#main #anketa #anketa_edit.page_export_settings, +#main #anketa #anketa_edit.page_gdpr_settings, +#main #anketa #anketa_edit.page_uporabnost, +#main #anketa #anketa_edit.page_kviz, +#main #anketa #anketa_edit.page_voting, +#main #anketa #anketa_edit.page_social_network, +#main #anketa #anketa_edit.page_slideshow, +#main #anketa #anketa_edit.page_telephone, +#main #anketa #anketa_edit.page_chat, +#main #anketa #anketa_edit.page_panel, +#main #anketa #anketa_edit.page_advanced_paradata, +#main #anketa #anketa_edit.page_json_survey_export, +#main #anketa #anketa_edit.page_fieldwork{ + flex-direction: column-reverse; + + > div{ + width: 100%; + margin: 20px 0; + } +} + + +/* OBLIKA */ +#main #anketa #anketa_edit.page_tema{ + + #div_theme_group_holder{ + width: 100%; + + #div_theme_group div.theme_label{ + width: 100%; + box-sizing: border-box; + margin-left: 0; + margin-right: 0; + + img{ + width: 100%; + height: auto; + } + } + } +} + +#theme-editor{ + width: 100% !important; + float: none !important; +} + +#theme-preview{ + width: 100% !important; + float: none !important; + + margin-top: 80px !important; +} + + + +/* ARHIVI */ +#main #anketa #anketa_edit.page_arhivi{ + flex-direction: column-reverse; + + > div{ + width: 100% !important; + margin: 20px 0; + } + + #div_archive_content fieldset { + width: 100% !important; + + box-sizing: border-box !important; + margin-left: 0 !important; + margin-right: 0 !important; + + input{ + width: 100% !important; + } + } +} + + diff --git a/resources/sass/admin_new/mobile/pages/testing.scss b/resources/sass/admin_new/mobile/pages/testing.scss new file mode 100644 index 000000000..1497a234c --- /dev/null +++ b/resources/sass/admin_new/mobile/pages/testing.scss @@ -0,0 +1,47 @@ + +#srv_diagnostic{ + + br{ + display: none; + } + + #srv_diagnostic_results, + #srv_diagnostic_results_right{ + clear: both; + display: block !important; + width: 100% !important; + + box-sizing: border-box; + margin: 20px 0 !important; + + table{ + width: 100%; + min-width: 100%; + + td + td { + width: auto !important; + } + } + } +} + + +.subpage_testnipodatki{ + line-height: 20px; + + form{ + + input[type="submit"]{ + margin: 10px 0 10px 15px; + padding: 3px; + } + + label{ + padding-top: 20px; + + input{ + vertical-align: bottom; + } + } + } +} diff --git a/resources/sass/admin_new/mobile/popup.scss b/resources/sass/admin_new/mobile/popup.scss new file mode 100644 index 000000000..44da84fec --- /dev/null +++ b/resources/sass/admin_new/mobile/popup.scss @@ -0,0 +1,13 @@ +/* Popup za vprasajcke */ +.qtip{ + position: fixed !important; + z-index: 9999999 !important; + + width: 80% !important; + box-sizing: border-box !important; + + top: 20% !important; + left: 10% !important; + + box-shadow: 0 0 15px 15px rgba(0,0,0,.34) !important; +} \ No newline at end of file diff --git a/resources/sass/admin_new/mobile/responsive_fixes.scss b/resources/sass/admin_new/mobile/responsive_fixes.scss new file mode 100644 index 000000000..2d346c475 --- /dev/null +++ b/resources/sass/admin_new/mobile/responsive_fixes.scss @@ -0,0 +1,42 @@ +#quick_comments_link.newCss { + display:none; +} + +#firstNavigation { + ol.right-side { + display:none; + } +} + +div.status_advanced { + flex-direction: column; +} + +div.status_advanced_box { + width: 100%; + box-sizing: border-box; +} + +a.status_advanced_link { + width: 95%; +} + +.content_div_normalmode { + overflow-x: auto; + + &::-webkit-scrollbar { + background-color: inherit; + height: 5px; + } + + &::-webkit-scrollbar-thumb { + background: #c4c4c4; + border-radius: 5px; + } +} + +@media (prefers-color-scheme: dark) { + .content_div_normalmode::-webkit-scrollbar-thumb{ + background: #c4c4c4; + } + } diff --git a/resources/sass/admin_new/pages/my_surveys/my_surveys.scss b/resources/sass/admin_new/pages/my_surveys/my_surveys.scss new file mode 100644 index 000000000..e69de29bb diff --git a/resources/sass/admin_new/pages/pages.scss b/resources/sass/admin_new/pages/pages.scss new file mode 100644 index 000000000..5d1d97f2e --- /dev/null +++ b/resources/sass/admin_new/pages/pages.scss @@ -0,0 +1,12 @@ +/* + Specific pages scss +*/ + + +// My surveys +@import "my_surveys/my_surveys"; + +// Survey pages +@import "survey_edit/survey_edit"; +@import "survey_data/survey_data"; +@import "survey_analysis/survey_analysis"; \ No newline at end of file diff --git a/resources/sass/admin_new/pages/survey_analysis/survey_analysis.scss b/resources/sass/admin_new/pages/survey_analysis/survey_analysis.scss new file mode 100644 index 000000000..e69de29bb diff --git a/resources/sass/admin_new/pages/survey_data/survey_data.scss b/resources/sass/admin_new/pages/survey_data/survey_data.scss new file mode 100644 index 000000000..e69de29bb diff --git a/resources/sass/admin_new/pages/survey_edit/survey_edit.scss b/resources/sass/admin_new/pages/survey_edit/survey_edit.scss new file mode 100644 index 000000000..e69de29bb diff --git a/resources/sass/admin_new/style.scss b/resources/sass/admin_new/style.scss new file mode 100644 index 000000000..c91af8aa5 --- /dev/null +++ b/resources/sass/admin_new/style.scss @@ -0,0 +1,18 @@ +/* + Main scss with includes +*/ + + +// Basic styles (variables, colors, fonts, layouts) +@import "basic/basic"; + +// Components (inputs, popups...) +@import "components/components"; + +// Page specific styles (survey editing, analysis...) +@import "pages/pages"; + +// Mobile styles +//@import "mobile/mobile"; + +