diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index d4fa83bab..33924f7fd 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -378,7 +378,7 @@ class SurveyAdmin // Prikaze podatke o anketi in navigacijo - na vrhu (top bar) $this->displayAnketaTop(); - echo '
'; + echo '
'; $this->displayAnketa(); echo '
'; diff --git a/public/css/admin.css b/public/css/admin.css index 956a600a6..a079c4436 100644 --- a/public/css/admin.css +++ b/public/css/admin.css @@ -14010,77 +14010,6 @@ and open the template in the editor. Created on : 03-Aug-2018, 11:04:39 Author : podkrizniku */ -#glas_settings { - float: left; - width: 330px; - margin: 57px 0 10px 15px; - padding: 0; - line-height: 18px; - background-color: white; - border: 1px solid #c8e3f8; -} -#glas_settings .more { - float: right; - margin: 5px 20px 10px 0; - font-weight: 500; -} -#glas_settings .less { - float: right; - margin: 5px 20px 10px 0; - font-weight: 500; -} -#glas_settings .header_holder { - height: 35px; - font-size: 16px; - font-weight: 500; - background-color: #c8e3f8; - width: 100%; -} -#glas_settings .header_content { - padding: 8px 0px 7px 0px; -} -#glas_settings .header_content .header_left { - color: #1e88e5; - font-size: 16px; - font-weight: 500; - width: auto; - float: left; - padding-left: 10px; -} -#glas_settings fieldset { - margin: 11px 10px; - padding: 3px 5px; - border: 0; - border-top: 1px solid #1e88e5; -} -#glas_settings legend { - margin: 0; - padding: 0 10px 0 5px; - background-color: rgba(0, 0, 0, 0); - color: #1e88e5; - font-weight: 500; -} - -#branching.branching_glasovanje { - position: absolute; - left: 377px !important; - right: 322px !important; - padding: 3px; - min-height: 400px; - max-width: 848px; -} -#branching.branching_glasovanje ul.first { - margin: 1px 0 0 0 !important; -} -#branching.branching_glasovanje ul li { - margin-left: 0px !important; -} - -#quick_settings_holder.glas_quick_settings { - margin-top: 35px; - top: 190px !important; -} - .nastavitveSpan4 { display: table-cell; float: left; @@ -14107,39 +14036,113 @@ select#skin { margin: 4px 0 2px 0; } -#quick_settings { - float: right; - padding: 0 10px 0 10px; - width: 290px; - background-color: #f5fafe; +#anketa_edit.glasovanje .anketa_edit_main { + display: flex; + /* Leve nastavitve */ + /* Srednji del */ + /* Desne nastavitve */ +} +#anketa_edit.glasovanje .anketa_edit_main #glas_settings { + width: 330px; + margin: 20px 0 0 0; + padding: 0; + line-height: 18px; + background-color: white; border: 1px solid #c8e3f8; } -#quick_settings fieldset { - border: 1px #606060 solid; +#anketa_edit.glasovanje .anketa_edit_main #glas_settings .more { + float: right; + margin: 5px 20px 10px 0; + font-weight: 500; } -#quick_settings .form_bottom_settings { - margin: 0 8px 10px 8px; - padding: 0 0 5px 10px; - background-color: inherit; +#anketa_edit.glasovanje .anketa_edit_main #glas_settings .less { + float: right; + margin: 5px 20px 10px 0; + font-weight: 500; } -#quick_settings #form_settings_obvescanje { - padding: 1px 0 10px 10px; +#anketa_edit.glasovanje .anketa_edit_main #glas_settings .header_holder { + height: 35px; + font-size: 16px; + font-weight: 500; + background-color: #c8e3f8; + width: 100%; } -#quick_settings #form_settings_obvescanje textarea#alert_finish_other_emails:focus { - padding: 2px; +#anketa_edit.glasovanje .anketa_edit_main #glas_settings .header_content { + padding: 8px 0px 7px 0px; +} +#anketa_edit.glasovanje .anketa_edit_main #glas_settings .header_content .header_left { + color: #1e88e5; + font-size: 16px; + font-weight: 500; + width: auto; + float: left; + padding-left: 10px; +} +#anketa_edit.glasovanje .anketa_edit_main #glas_settings fieldset { + margin: 11px 10px; + padding: 3px 5px; border: 0; - background-color: #ffdda1; + border-top: 1px solid #1e88e5; } - -#quick_settings_holder { +#anketa_edit.glasovanje .anketa_edit_main #glas_settings legend { + margin: 0; + padding: 0 10px 0 5px; + background-color: rgba(0, 0, 0, 0); + color: #1e88e5; + font-weight: 500; +} +#anketa_edit.glasovanje .anketa_edit_main #placeholder { + margin: 85px 0 0 20px; + max-width: 1100px; +} +#anketa_edit.glasovanje .anketa_edit_main #placeholder #branching.branching_glasovanje { + padding: 3px; + min-height: 400px; + width: calc(96% - 315px); +} +#anketa_edit.glasovanje .anketa_edit_main #placeholder #branching.branching_glasovanje ul.first { + margin: 1px 0 0 0 !important; +} +#anketa_edit.glasovanje .anketa_edit_main #placeholder #branching.branching_glasovanje ul li { + margin-left: 0px !important; +} +#anketa_edit.glasovanje .anketa_edit_main #placeholder #vprasanje_float_editing { + margin-top: 45px !important; +} +#anketa_edit.glasovanje .anketa_edit_main #quick_settings_holder { position: absolute; - right: 15px; - top: 235px; + right: calc(3% + 5px); + margin-left: -5px; + top: 222px; height: auto; width: 310px; border: 0; background-color: transparent; } +#anketa_edit.glasovanje .anketa_edit_main #quick_settings_holder #quick_settings { + padding: 5px 15px; + width: 315px; + box-sizing: border-box; + float: right; + background-color: #f5fafe; + border: 1px solid #c8e3f8; +} +#anketa_edit.glasovanje .anketa_edit_main #quick_settings_holder #quick_settings fieldset { + border: 1px #606060 solid; +} +#anketa_edit.glasovanje .anketa_edit_main #quick_settings_holder #quick_settings .form_bottom_settings { + margin: 0 8px 10px 8px; + padding: 0 0 5px 10px; + background-color: inherit; +} +#anketa_edit.glasovanje .anketa_edit_main #quick_settings_holder #quick_settings #form_settings_obvescanje { + padding: 1px 0 10px 10px; +} +#anketa_edit.glasovanje .anketa_edit_main #quick_settings_holder #quick_settings #form_settings_obvescanje textarea#alert_finish_other_emails:focus { + padding: 2px; + border: 0; + background-color: #ffdda1; +} /* To change this license header, choose License Headers in Project Properties. @@ -14161,6 +14164,40 @@ and open the template in the editor. margin-top: 66px !important; } +#anketa_edit.forma #quick_settings_holder { + position: absolute; + right: 5%; + top: 235px; + height: auto; + width: 310px; + border: 0; + background-color: transparent; +} +#anketa_edit.forma #quick_settings_holder #quick_settings { + padding: 5px 15px; + width: 315px; + box-sizing: border-box; + float: right; + background-color: #f5fafe; + border: 1px solid #c8e3f8; +} +#anketa_edit.forma #quick_settings_holder #quick_settings fieldset { + border: 1px #606060 solid; +} +#anketa_edit.forma #quick_settings_holder #quick_settings .form_bottom_settings { + margin: 0 8px 10px 8px; + padding: 0 0 5px 10px; + background-color: inherit; +} +#anketa_edit.forma #quick_settings_holder #quick_settings #form_settings_obvescanje { + padding: 1px 0 10px 10px; +} +#anketa_edit.forma #quick_settings_holder #quick_settings #form_settings_obvescanje textarea#alert_finish_other_emails:focus { + padding: 2px; + border: 0; + background-color: #ffdda1; +} + /* To change this license header, choose License Headers in Project Properties. To change this template file, choose Tools | Templates @@ -14424,7 +14461,7 @@ and open the template in the editor. display: flex; width: 98%; max-width: 1450px; - margin: 5px 0 0 50px; + margin: 5px 0 0 30px; } #branching { @@ -14891,6 +14928,7 @@ and open the template in the editor. */ #branching.collapsed { min-height: 317px; + margin-top: 10px; } #branching.collapsed li.spr { line-height: 28px; @@ -28128,77 +28166,85 @@ and open the template in the editor. margin: 0px 40px 40px -30px; } - #branching.branching_glasovanje { - max-width: 810px; + /*#branching.branching_glasovanje { + max-width: 810px; } #toolbox_library { - right: 30px; + right: 30px; } #quick_settings_holder { - right: 30px; + right: 30px; } - #quick_settings_holder.glas_quick_settings { - right: 30px; - } + right: 30px; + }*/ } @media screen and (-webkit-min-device-pixel-ratio: 0) { .tabnavigation1 { margin: 0px 0px 0px 1px; } } +@media all and (min-width: 1550px) { + #toolbox_library { + left: 1200px; + } + + #quick_settings_holder { + left: 1162px; + } +} +/* @media all and (min-width: 1500px) { - #branching.branching_glasovanje { - max-width: 800px; - } + #branching.branching_glasovanje { + max-width: 800px; + } + #toolbox_library { + right: 30px; + } - #toolbox_library { - right: 30px; - } - - #quick_settings_holder { - right: 30px; - } - - #quick_settings_holder.glas_quick_settings { - right: 30px; - } + #quick_settings_holder { + right: 30px; + } + #quick_settings_holder.glas_quick_settings { + right: 30px; + } } + @media all and (min-width: 1580px) { - #toolbox_library { - right: 30px; - } + #toolbox_library { + right: 30px; + } - #quick_settings_holder { - right: 30px; - } - - #quick_settings_holder.glas_quick_settings { - right: 30px; - } + #quick_settings_holder { + right: auto; + left: 1180px; + } + #quick_settings_holder.glas_quick_settings { + right: 30px; + } } + @media all and (min-width: 1618px) { - #branching.branching_glasovanje { - max-width: 815px; - } + #branching.branching_glasovanje { + max-width: 815px; + } - #toolbox_library { - right: auto; - left: 1180px; - } + #toolbox_library { + right: auto; + left: 1180px; + } - #quick_settings_holder { - right: auto; - left: 1180px; - } - - #quick_settings_holder.glas_quick_settings { - right: auto; - left: 1180px; - } -} + #quick_settings_holder { + right: auto; + left: 1182px; + } + #quick_settings_holder.glas_quick_settings { + right: auto; + left: 1182px; + } +}*/ @media print { .no-print { display: none !important; diff --git a/resources/sass/admin/branching/branching_collapsed.scss b/resources/sass/admin/branching/branching_collapsed.scss index f606f6e69..656eeae7d 100644 --- a/resources/sass/admin/branching/branching_collapsed.scss +++ b/resources/sass/admin/branching/branching_collapsed.scss @@ -9,7 +9,9 @@ and open the template in the editor. */ #branching.collapsed { - min-height: 317px; + min-height: 317px; + margin-top: 10px; + li.spr { line-height: 28px; &:hover { diff --git a/resources/sass/admin/branching/branching_expanded.scss b/resources/sass/admin/branching/branching_expanded.scss index 59b3f96cf..d52bc2baa 100644 --- a/resources/sass/admin/branching/branching_expanded.scss +++ b/resources/sass/admin/branching/branching_expanded.scss @@ -18,7 +18,7 @@ $if_background: $soft_blue_lighten; width: 98%; max-width: 1450px; - margin: 5px 0 0 50px; + margin: 5px 0 0 30px; } #branching { diff --git a/resources/sass/admin/branching/form.scss b/resources/sass/admin/branching/form.scss index 9fe66a011..453ee980a 100644 --- a/resources/sass/admin/branching/form.scss +++ b/resources/sass/admin/branching/form.scss @@ -20,4 +20,50 @@ and open the template in the editor. ul.first { margin-top: 66px !important; } -} \ No newline at end of file +} + + +#anketa_edit.forma { + + #quick_settings_holder{ + position: absolute; + right: 5%; + top: 235px; + height: auto; + width: 310px; + border: 0; + background-color: transparent; + + #quick_settings{ + padding: 5px 15px; + width: 315px; + box-sizing: border-box; + float: right; + + background-color: $soft_blue_very_lighten; + border: 1px solid $soft_blue; + + fieldset { + border: 1px $grey_dark solid; + } + + .form_bottom_settings { + margin: 0 8px 10px 8px; + padding: 0 0 5px 10px; + background-color: inherit; + } + + #form_settings_obvescanje { + padding: 1px 0 10px 10px; + textarea#alert_finish_other_emails { + &:focus { + padding: 2px; + border: 0; + background-color: $orange_very_lighten; + } + } + } + } + } + +} diff --git a/resources/sass/admin/branching/voting.scss b/resources/sass/admin/branching/voting.scss index 24ffbaa0a..58abb5e0b 100644 --- a/resources/sass/admin/branching/voting.scss +++ b/resources/sass/admin/branching/voting.scss @@ -8,85 +8,9 @@ and open the template in the editor. Author : podkrizniku */ -#glas_settings { - float: left; - width: 330px; - margin: 57px 0 10px 15px; - padding: 0; - line-height: 18px; - - background-color: white; - border: 1px solid $soft_blue; - - .more { - float: right; - margin: 5px 20px 10px 0; - font-weight: 500; - } - .less { - float: right; - margin: 5px 20px 10px 0; - font-weight: 500; - } - - .header_holder { - height: 35px; - font-size: 16px; - font-weight: 500; - background-color: $soft_blue; - width: 100%; - //border-bottom: #d2d5d5; - } - .header_content { - padding: 8px 0px 7px 0px; - - .header_left { - color: $strong_blue; - font-size: 16px; - font-weight: 500; - width: auto; - float: left; - padding-left: 10px; - } - } - fieldset { - margin: 11px 10px; - padding: 3px 5px; - border: 0; - border-top: 1px solid $strong_blue; - } - legend { - margin: 0; - padding: 0 10px 0 5px; - background-color: rgba(0, 0, 0, 0); - color: $strong_blue; - font-weight: 500; - } -} -#branching.branching_glasovanje { - position: absolute; - left: 377px !important; - right: 322px !important; - - padding: 3px; - min-height: 400px; - max-width: 848px; - - ul.first { - margin: 1px 0 0 0 !important; - } - ul { - li { - margin-left: 0px !important; - } - } -} -#quick_settings_holder.glas_quick_settings { - margin-top: 35px; - top: 190px !important; -} + .nastavitveSpan4 { display: table-cell; @@ -111,36 +35,141 @@ select#skin { margin: 4px 0 2px 0; } #quick_settings { - fieldset { - border: 1px $grey_dark solid; - } - float: right; - padding: 0 10px 0 10px; - width: 290px; - background-color: $soft_blue_very_lighten; - border: 1px solid $soft_blue; - .form_bottom_settings { - margin: 0 8px 10px 8px; - padding: 0 0 5px 10px; - background-color: inherit; - } - #form_settings_obvescanje { - padding: 1px 0 10px 10px; - textarea#alert_finish_other_emails { - &:focus { - padding: 2px; - border: 0; - background-color: $orange_very_lighten; - } - } - } + } -#quick_settings_holder { - position: absolute; - right: 15px; - top: 235px; - height: auto; - width: 310px; - border: 0; - background-color: transparent; + + +#anketa_edit.glasovanje { + + .anketa_edit_main{ + display: flex; + + /* Leve nastavitve */ + #glas_settings { + width: 330px; + margin: 20px 0 0 0; + padding: 0; + line-height: 18px; + + background-color: white; + border: 1px solid $soft_blue; + + .more { + float: right; + margin: 5px 20px 10px 0; + font-weight: 500; + } + .less { + float: right; + margin: 5px 20px 10px 0; + font-weight: 500; + } + + .header_holder { + height: 35px; + font-size: 16px; + font-weight: 500; + background-color: $soft_blue; + width: 100%; + //border-bottom: #d2d5d5; + } + .header_content { + padding: 8px 0px 7px 0px; + + .header_left { + color: $strong_blue; + font-size: 16px; + font-weight: 500; + width: auto; + float: left; + padding-left: 10px; + } + } + fieldset { + margin: 11px 10px; + padding: 3px 5px; + border: 0; + border-top: 1px solid $strong_blue; + } + legend { + margin: 0; + padding: 0 10px 0 5px; + background-color: rgba(0, 0, 0, 0); + color: $strong_blue; + font-weight: 500; + } + } + + /* Srednji del */ + #placeholder{ + margin: 85px 0 0 20px; + max-width: 1100px; + + #branching.branching_glasovanje { + padding: 3px; + min-height: 400px; + width: calc(96% - 315px); + + ul.first { + margin: 1px 0 0 0 !important; + } + ul { + li { + margin-left: 0px !important; + } + } + } + + #vprasanje_float_editing{ + margin-top: 45px !important; + } + } + + + /* Desne nastavitve */ + #quick_settings_holder{ + position: absolute; + right: calc(3% + 5px); + margin-left: -5px; + top: 222px; + height: auto; + width: 310px; + border: 0; + background-color: transparent; + + #quick_settings{ + padding: 5px 15px; + width: 315px; + box-sizing: border-box; + float: right; + + background-color: $soft_blue_very_lighten; + border: 1px solid $soft_blue; + + fieldset { + border: 1px $grey_dark solid; + } + + .form_bottom_settings { + margin: 0 8px 10px 8px; + padding: 0 0 5px 10px; + background-color: inherit; + } + + #form_settings_obvescanje { + padding: 1px 0 10px 10px; + textarea#alert_finish_other_emails { + &:focus { + padding: 2px; + border: 0; + background-color: $orange_very_lighten; + } + } + } + } + } + } + + + } \ No newline at end of file diff --git a/resources/sass/admin/media.scss b/resources/sass/admin/media.scss index 62cb7c7a1..e85372eff 100644 --- a/resources/sass/admin/media.scss +++ b/resources/sass/admin/media.scss @@ -16,20 +16,6 @@ and open the template in the editor. margin: 0px 40px 40px -30px; } } - #branching.branching_glasovanje { - max-width: 810px; - } - - #toolbox_library { - right: 30px; - } - - #quick_settings_holder { - right: 30px; - } - #quick_settings_holder.glas_quick_settings { - right: 30px; - } } @media screen and (-webkit-min-device-pixel-ratio:0) { @@ -38,55 +24,18 @@ and open the template in the editor. } } -@media all and (min-width: 1500px) { - #branching.branching_glasovanje { - max-width: 800px; + +@media all and (min-width: 1550px) { + + #toolbox_library{ + left: 1200px; } - #toolbox_library { - right: 30px; - } - - #quick_settings_holder { - right: 30px; - } - #quick_settings_holder.glas_quick_settings { - right: 30px; - } -} - -@media all and (min-width: 1580px) { - #toolbox_library { - right: 30px; - } - - #quick_settings_holder { - right: 30px; - } - #quick_settings_holder.glas_quick_settings { - right: 30px; - } -} - -@media all and (min-width: 1618px) { - #branching.branching_glasovanje { - max-width: 815px; + #quick_settings_holder { + left: 1162px; } - - #toolbox_library { - right: auto; - left: 1180px; - } - - #quick_settings_holder { - right: auto; - left: 1180px; - } - #quick_settings_holder.glas_quick_settings { - right: auto; - left: 1180px; - } } + @media print { .no-print { display: none !important;