From d97c729dae83eb29c158308d0ba1685278d62fde Mon Sep 17 00:00:00 2001 From: markusfluer Date: Mon, 3 Jul 2017 19:29:16 +0200 Subject: [PATCH] Dev: further recreating lost commits --- .../views/admin/survey/surveySummary_view.php | 413 ++++++++++-------- .../packages/adminpanel/build/lsadminpanel.js | 2 +- assets/packages/adminpanel/scss/lsflex.scss | 2 +- 3 files changed, 225 insertions(+), 192 deletions(-) diff --git a/application/views/admin/survey/surveySummary_view.php b/application/views/admin/survey/surveySummary_view.php index 739a7250378..9be76983f05 100644 --- a/application/views/admin/survey/surveySummary_view.php +++ b/application/views/admin/survey/surveySummary_view.php @@ -328,176 +328,190 @@ - - -

-
-
- - - +
+
+ +
+
+ +
+
+ +
+ +
+ + +
+
+ : +
+
+
+
+
+
+
+ : +
+
+
+
+
+ +
+
+ : +
+
+ % +
+
+
+ +
+
+
+
diff --git a/assets/packages/adminpanel/build/lsadminpanel.js b/assets/packages/adminpanel/build/lsadminpanel.js index 6976efaa6b1..e6734f9e400 100644 --- a/assets/packages/adminpanel/build/lsadminpanel.js +++ b/assets/packages/adminpanel/build/lsadminpanel.js @@ -30360,7 +30360,7 @@ exports = module.exports = __webpack_require__(3)(undefined); // module -exports.push([module.i, ".ls-flex, .ls-flex-row, .ls-flex-column {\n display: -moz-flex;\n display: -webkit-flex;\n display: flex; }\n .ls-flex.align-item-center, .align-item-center.ls-flex-row, .align-item-center.ls-flex-column {\n -ms-align-items: center;\n -webkit-align-items: center;\n -moz-align-items: center;\n align-items: center; }\n .ls-flex.align-item-flex-start, .align-item-flex-start.ls-flex-row, .align-item-flex-start.ls-flex-column {\n -ms-align-items: flex-start;\n -webkit-align-items: flex-start;\n -moz-align-items: flex-start;\n align-items: flex-start; }\n .ls-flex.align-item-flex-end, .align-item-flex-end.ls-flex-row, .align-item-flex-end.ls-flex-column {\n -ms-align-items: flex-end;\n -webkit-align-items: flex-end;\n -moz-align-items: flex-end;\n align-items: flex-end; }\n .ls-flex.align-item-baseline, .align-item-baseline.ls-flex-row, .align-item-baseline.ls-flex-column {\n -ms-align-items: baseline;\n -webkit-align-items: baseline;\n -moz-align-items: baseline;\n align-items: baseline; }\n .ls-flex.align-item-stretch, .align-item-stretch.ls-flex-row, .align-item-stretch.ls-flex-column {\n -ms-align-items: stretch;\n -webkit-align-items: stretch;\n -moz-align-items: stretch;\n align-items: stretch; }\n .ls-flex.align-content-center, .align-content-center.ls-flex-row, .align-content-center.ls-flex-column {\n -ms-justify-content: center;\n -webkit-justify-content: center;\n -moz-justify-content: center;\n justify-content: center; }\n .ls-flex.align-content-flex-start, .align-content-flex-start.ls-flex-row, .align-content-flex-start.ls-flex-column {\n -ms-justify-content: flex-start;\n -webkit-justify-content: flex-start;\n -moz-justify-content: flex-start;\n justify-content: flex-start; }\n .ls-flex.align-content-flex-end, .align-content-flex-end.ls-flex-row, .align-content-flex-end.ls-flex-column {\n -ms-justify-content: flex-end;\n -webkit-justify-content: flex-end;\n -moz-justify-content: flex-end;\n justify-content: flex-end; }\n .ls-flex.align-content-space-between, .align-content-space-between.ls-flex-row, .align-content-space-between.ls-flex-column {\n -ms-justify-content: space-between;\n -webkit-justify-content: space-between;\n -moz-justify-content: space-between;\n justify-content: space-between; }\n .ls-flex.align-content-space-around, .align-content-space-around.ls-flex-row, .align-content-space-around.ls-flex-column {\n -ms-justify-content: space-around;\n -webkit-justify-content: space-around;\n -moz-justify-content: space-around;\n justify-content: space-around; }\n .ls-flex.wrap, .wrap.ls-flex-row, .wrap.ls-flex-column {\n -ms-flex-wrap: wrap;\n -webkit-flex-wrap: wrap;\n -moz-flex-wrap: wrap;\n flex-wrap: wrap; }\n .ls-flex .col-1, .ls-flex-row .col-1, .ls-flex-column .col-1 {\n width: 8.33333; }\n .ls-flex .col-2, .ls-flex-row .col-2, .ls-flex-column .col-2 {\n width: 16.66667; }\n .ls-flex .col-3, .ls-flex-row .col-3, .ls-flex-column .col-3 {\n width: 25; }\n .ls-flex .col-4, .ls-flex-row .col-4, .ls-flex-column .col-4 {\n width: 33.33333; }\n .ls-flex .col-5, .ls-flex-row .col-5, .ls-flex-column .col-5 {\n width: 41.66667; }\n .ls-flex .col-6, .ls-flex-row .col-6, .ls-flex-column .col-6 {\n width: 50; }\n .ls-flex .col-7, .ls-flex-row .col-7, .ls-flex-column .col-7 {\n width: 58.33333; }\n .ls-flex .col-8, .ls-flex-row .col-8, .ls-flex-column .col-8 {\n width: 66.66667; }\n .ls-flex .col-9, .ls-flex-row .col-9, .ls-flex-column .col-9 {\n width: 75; }\n .ls-flex .col-10, .ls-flex-row .col-10, .ls-flex-column .col-10 {\n width: 83.33333; }\n .ls-flex .col-11, .ls-flex-row .col-11, .ls-flex-column .col-11 {\n width: 91.66667; }\n .ls-flex .col-12, .ls-flex-row .col-12, .ls-flex-column .col-12 {\n width: 100; }\n\n.ls-flex-row {\n -ms-flex-direction: row;\n -webkit-flex-direction: row;\n -moz-flex-direction: row;\n flex-direction: row;\n width: 100%; }\n\n.ls-flex-column {\n -ms-flex-direction: column;\n -webkit-flex-direction: column;\n -moz-flex-direction: column;\n flex-direction: column; }\n\n.background-muted {\n background: #cdcdcd; }\n .background-muted > li {\n background: #cdcdcd; }\n\n.ls-ba .list-group > .list-group-item {\n padding: 10px 0;\n border: 0;\n border-radius: 0;\n border-bottom: 1px solid #323232;\n margin-bottom: 1px; }\n .ls-ba .list-group > .list-group-item .list-group {\n margin-bottom: 0; }\n .ls-ba .list-group > .list-group-item .list-group .list-group-item {\n padding-left: 15px; }\n .ls-ba .list-group > .list-group-item .list-group .list-group-item:last-of-type {\n border-bottom: 0; }\n .ls-ba .list-group > .list-group-item .list-group:first-of-type {\n border-top: 1px solid #323232; }\n\n#sidebar {\n padding-top: 15px; }\n\n.menubar.surveybar {\n position: absolute;\n top: 105px;\n left: 305px;\n width: 85%; }\n\n#in_survey_common {\n padding-top: 65px; }\n", ""]); +exports.push([module.i, ".ls-flex, .ls-flex-row, .ls-flex-column {\n display: -moz-flex;\n display: -webkit-flex;\n display: flex; }\n .ls-flex.align-item-center, .align-item-center.ls-flex-row, .align-item-center.ls-flex-column {\n -ms-align-items: center;\n -webkit-align-items: center;\n -moz-align-items: center;\n align-items: center; }\n .ls-flex.align-item-flex-start, .align-item-flex-start.ls-flex-row, .align-item-flex-start.ls-flex-column {\n -ms-align-items: flex-start;\n -webkit-align-items: flex-start;\n -moz-align-items: flex-start;\n align-items: flex-start; }\n .ls-flex.align-item-flex-end, .align-item-flex-end.ls-flex-row, .align-item-flex-end.ls-flex-column {\n -ms-align-items: flex-end;\n -webkit-align-items: flex-end;\n -moz-align-items: flex-end;\n align-items: flex-end; }\n .ls-flex.align-item-baseline, .align-item-baseline.ls-flex-row, .align-item-baseline.ls-flex-column {\n -ms-align-items: baseline;\n -webkit-align-items: baseline;\n -moz-align-items: baseline;\n align-items: baseline; }\n .ls-flex.align-item-stretch, .align-item-stretch.ls-flex-row, .align-item-stretch.ls-flex-column {\n -ms-align-items: stretch;\n -webkit-align-items: stretch;\n -moz-align-items: stretch;\n align-items: stretch; }\n .ls-flex.align-content-center, .align-content-center.ls-flex-row, .align-content-center.ls-flex-column {\n -ms-justify-content: center;\n -webkit-justify-content: center;\n -moz-justify-content: center;\n justify-content: center; }\n .ls-flex.align-content-flex-start, .align-content-flex-start.ls-flex-row, .align-content-flex-start.ls-flex-column {\n -ms-justify-content: flex-start;\n -webkit-justify-content: flex-start;\n -moz-justify-content: flex-start;\n justify-content: flex-start; }\n .ls-flex.align-content-flex-end, .align-content-flex-end.ls-flex-row, .align-content-flex-end.ls-flex-column {\n -ms-justify-content: flex-end;\n -webkit-justify-content: flex-end;\n -moz-justify-content: flex-end;\n justify-content: flex-end; }\n .ls-flex.align-content-space-between, .align-content-space-between.ls-flex-row, .align-content-space-between.ls-flex-column {\n -ms-justify-content: space-between;\n -webkit-justify-content: space-between;\n -moz-justify-content: space-between;\n justify-content: space-between; }\n .ls-flex.align-content-space-around, .align-content-space-around.ls-flex-row, .align-content-space-around.ls-flex-column {\n -ms-justify-content: space-around;\n -webkit-justify-content: space-around;\n -moz-justify-content: space-around;\n justify-content: space-around; }\n .ls-flex.wrap, .wrap.ls-flex-row, .wrap.ls-flex-column {\n -ms-flex-wrap: wrap;\n -webkit-flex-wrap: wrap;\n -moz-flex-wrap: wrap;\n flex-wrap: wrap; }\n .ls-flex .col-1, .ls-flex-row .col-1, .ls-flex-column .col-1 {\n width: 8.33333%; }\n .ls-flex .col-2, .ls-flex-row .col-2, .ls-flex-column .col-2 {\n width: 16.66667%; }\n .ls-flex .col-3, .ls-flex-row .col-3, .ls-flex-column .col-3 {\n width: 25%; }\n .ls-flex .col-4, .ls-flex-row .col-4, .ls-flex-column .col-4 {\n width: 33.33333%; }\n .ls-flex .col-5, .ls-flex-row .col-5, .ls-flex-column .col-5 {\n width: 41.66667%; }\n .ls-flex .col-6, .ls-flex-row .col-6, .ls-flex-column .col-6 {\n width: 50%; }\n .ls-flex .col-7, .ls-flex-row .col-7, .ls-flex-column .col-7 {\n width: 58.33333%; }\n .ls-flex .col-8, .ls-flex-row .col-8, .ls-flex-column .col-8 {\n width: 66.66667%; }\n .ls-flex .col-9, .ls-flex-row .col-9, .ls-flex-column .col-9 {\n width: 75%; }\n .ls-flex .col-10, .ls-flex-row .col-10, .ls-flex-column .col-10 {\n width: 83.33333%; }\n .ls-flex .col-11, .ls-flex-row .col-11, .ls-flex-column .col-11 {\n width: 91.66667%; }\n .ls-flex .col-12, .ls-flex-row .col-12, .ls-flex-column .col-12 {\n width: 100%; }\n\n.ls-flex-row {\n -ms-flex-direction: row;\n -webkit-flex-direction: row;\n -moz-flex-direction: row;\n flex-direction: row;\n width: 100%; }\n\n.ls-flex-column {\n -ms-flex-direction: column;\n -webkit-flex-direction: column;\n -moz-flex-direction: column;\n flex-direction: column; }\n\n.background-muted {\n background: #cdcdcd; }\n .background-muted > li {\n background: #cdcdcd; }\n\n.ls-ba .list-group > .list-group-item {\n padding: 10px 0;\n border: 0;\n border-radius: 0;\n border-bottom: 1px solid #323232;\n margin-bottom: 1px; }\n .ls-ba .list-group > .list-group-item .list-group {\n margin-bottom: 0; }\n .ls-ba .list-group > .list-group-item .list-group .list-group-item {\n padding-left: 15px; }\n .ls-ba .list-group > .list-group-item .list-group .list-group-item:last-of-type {\n border-bottom: 0; }\n .ls-ba .list-group > .list-group-item .list-group:first-of-type {\n border-top: 1px solid #323232; }\n\n#sidebar {\n padding-top: 15px; }\n\n.menubar.surveybar {\n position: absolute;\n top: 105px;\n left: 305px;\n width: 85%; }\n\n#in_survey_common {\n padding-top: 65px; }\n", ""]); // exports diff --git a/assets/packages/adminpanel/scss/lsflex.scss b/assets/packages/adminpanel/scss/lsflex.scss index f27adc3429f..d6595ef51d9 100644 --- a/assets/packages/adminpanel/scss/lsflex.scss +++ b/assets/packages/adminpanel/scss/lsflex.scss @@ -43,7 +43,7 @@ $x-directions: center flex-start flex-end space-between space-around; } @for $i from 1 through 12 { - .col-#{$i} { width: 100*( $i/12); } + .col-#{$i} { width: 100*( $i/12)*1%; } } }