diff --git a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php b/admin/survey/classes/surveyData/class.SurveyDataDisplay.php index 3979f1788..0a4506dfb 100644 --- a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php +++ b/admin/survey/classes/surveyData/class.SurveyDataDisplay.php @@ -1429,7 +1429,7 @@ class SurveyDataDisplay{ echo ''; // Nastavimo colgroup, da na njega vezemo vse sirine v tabeli, zaradi resizinga stolpcev - echo ''; + /*echo ''; # colspan za ikonce if ($stolpci > 0) { echo '1 ? (' span="'.$stolpci.'"') : '').'>'; @@ -1464,7 +1464,7 @@ class SurveyDataDisplay{ } } - echo ''; + echo '';*/ echo ''; echo ''; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index d0d26b312..7c540a2a7 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -15507,13 +15507,25 @@ dl.arch_email dd { margin-top: 8px; } -#div_vnosi_data table#dataTable { +#div_vnosi_data #tableContainer { + overflow-x: auto; +} +#div_vnosi_data #tableContainer table#dataTable { table-layout: fixed; - width: 0px; padding: 0px; margin: 0px; border-collapse: collapse; border-spacing: 0px; + /*colgroup{ + + col { + width: 100px; + + &.data_edit { + width: 23px; + } + } + }*/ /*.dataCell { position: relative; white-space: nowrap; @@ -15624,13 +15636,7 @@ dl.arch_email dd { } }*/ } -#div_vnosi_data table#dataTable colgroup col { - width: 100px; -} -#div_vnosi_data table#dataTable colgroup col.data_edit { - width: 23px; -} -#div_vnosi_data table#dataTable thead tr th { +#div_vnosi_data #tableContainer table#dataTable thead tr th { padding: 16px; overflow: hidden; white-space: nowrap; @@ -15639,7 +15645,7 @@ dl.arch_email dd { background: #F8F8F8; border: 1px solid #E5E5E5; } -#div_vnosi_data table#dataTable tbody tr td { +#div_vnosi_data #tableContainer table#dataTable tbody tr td { box-sizing: border-box; height: 40px; padding: 0 16px; diff --git a/resources/sass/admin_new/pages/survey_data/data_table.scss b/resources/sass/admin_new/pages/survey_data/data_table.scss index b22d2388c..f9fa29a5e 100644 --- a/resources/sass/admin_new/pages/survey_data/data_table.scss +++ b/resources/sass/admin_new/pages/survey_data/data_table.scss @@ -2,173 +2,175 @@ //width: 100%; //overflow-y: auto; - table#dataTable { - table-layout: fixed; - width: 0px; - - padding: 0px; - margin: 0px; - - border-collapse: collapse; - border-spacing: 0px; - + #tableContainer{ + overflow-x: auto; + + table#dataTable { + table-layout: fixed; + + padding: 0px; + margin: 0px; + + border-collapse: collapse; + border-spacing: 0px; + + /*colgroup{ - colgroup{ + col { + width: 100px; + &.data_edit { + width: 23px; + } + } + }*/ + + thead{ + + tr{ + + th{ + padding: 16px; + + overflow: hidden; + white-space: nowrap; + font-size: 16px; + font-weight: 600; + + background: $light-gray; + border: 1px solid $gray; + } + } + + } + + tbody{ + + tr{ + + td{ + box-sizing: border-box; + height: 40px; + padding: 0 16px; + + font-size: 14px; + + border: 1px solid $gray; + } + } + } + + + + /*.dataCell { + position: relative; + white-space: nowrap; + overflow: hidden; + + width: 100%; + min-width: 20px; + max-height: 1.1em; + + padding: 3px 0; + text-indent: 3px; + + &:hover { + .tableResize { + background-color: $blue; + } + } + } + + .headerCell { + white-space: nowrap; + padding: 3px; + } + + th { + font-weight: normal; + text-align: left; + cursor: pointer; + } col { width: 100px; - - &.data_edit { - width: 23px; - } } - } - - thead{ - - tr{ - - th{ - padding: 16px; - - overflow: hidden; - white-space: nowrap; - font-size: 16px; - font-weight: 600; - - background: $light-gray; - border: 1px solid $gray; - } + col.data_edit { + width: 23px; } - - } - - tbody{ - - tr{ - - td{ - box-sizing: border-box; - height: 40px; - padding: 0 16px; - - font-size: 14px; - - border: 1px solid $gray; - } - } - } - - - - /*.dataCell { - position: relative; - white-space: nowrap; - overflow: hidden; - - width: 100%; - min-width: 20px; - max-height: 1.1em; - - padding: 3px 0; - text-indent: 3px; - - &:hover { - .tableResize { - background-color: $blue; - } - } - } - - .headerCell { - white-space: nowrap; - padding: 3px; - } - - th { - font-weight: normal; - text-align: left; - cursor: pointer; - } - col { - width: 100px; - } - col.data_edit { - width: 23px; - } - td { - padding: 3px; - font-weight: normal; - text-align: left; - max-width: 200px; - overflow: hidden; - line-height: 18px; - .highlighted { - font-weight: bold; - color: red; - background-color: yellow; - } - } - td.data_edit { - .pdf { - cursor: pointer; - } - .rtf { - cursor: pointer; - } - .evoli { - cursor: pointer; - } - .evoli2 { - cursor: pointer; - } - .evoli3 { - cursor: pointer; - } - .mfdps { - cursor: pointer; - } - } - select { - font-size: 11px !important; - width: 100%; - } - th.hover { - background-color: $gray; - } - tbody { - .active { - background-color: $gray !important; - } - tr { - &:nth-child(odd) { - } - &:nth-child(even) { - background-color: $gray; - } - } - } - .delete_data_row { - margin: 0; - } - .scrollContent.coding { td { - &:hover { - background-color: $gray; + padding: 3px; + font-weight: normal; + text-align: left; + max-width: 200px; + overflow: hidden; + line-height: 18px; + .highlighted { + font-weight: bold; + color: red; + background-color: yellow; + } + } + td.data_edit { + .pdf { + cursor: pointer; + } + .rtf { + cursor: pointer; + } + .evoli { + cursor: pointer; + } + .evoli2 { + cursor: pointer; + } + .evoli3 { + cursor: pointer; + } + .mfdps { cursor: pointer; } } - td.enkaIcon { - &:hover { - background-color: white; + select { + font-size: 11px !important; + width: 100%; + } + th.hover { + background-color: $gray; + } + tbody { + .active { + background-color: $gray !important; + } + tr { + &:nth-child(odd) { + } + &:nth-child(even) { + background-color: $gray; + } } } - td.cellGreen { - &:hover { - background-color: #E6FFCC; - cursor: auto; - } + .delete_data_row { + margin: 0; } - }*/ + .scrollContent.coding { + td { + &:hover { + background-color: $gray; + cursor: pointer; + } + } + td.enkaIcon { + &:hover { + background-color: white; + } + } + td.cellGreen { + &:hover { + background-color: #E6FFCC; + cursor: auto; + } + } + }*/ + } } }