may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source
This commit is contained in:
pero1203 2022-08-22 10:15:14 +02:00
commit 73752b1a98
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/survey/SurveyAdminSettings.php
View File

@ -8849,7 +8849,9 @@ class SurveyAdminSettings {
echo '</fieldset>'; echo '</fieldset>';
} }
echo '<fieldset class="page_num_fieldset"><legend class="page_num">'.$row['pagename'].'</legend>'; echo '<fieldset class="page_num_fieldset">';
echo '<legend class="page_num">'.$row['pagename'].'</legend>';
// echo '<span class="dotted_line"> - </span>';
echo '<table class="avt_vnosi_table">'; echo '<table class="avt_vnosi_table">';
$prevpage = $row['gru_id']; $prevpage = $row['gru_id'];
@ -8925,7 +8927,7 @@ class SurveyAdminSettings {
echo '<td class="graph_cell">'; echo '<td class="graph_cell">';
echo '<div class="graph_cell">'; echo '<div class="graph_cell">';
echo ' <div class="graph_full" style="width: '.($p*0.7).'%"></div>'; echo ' <div class="graph_full" style="width: '.($p*0.9).'%"></div>';
echo ' <span>'.$p.'% ('.($total_rows-$rowc['count']).')</span>'; echo ' <span>'.$p.'% ('.($total_rows-$rowc['count']).')</span>';
echo '</div>'; echo '</div>';
echo '</td>'; echo '</td>';

6
public/css/admin_new.css
View File

@ -10164,6 +10164,11 @@ div .table-horizontal-scroll-wrapper2 table {
margin-bottom: 0; margin-bottom: 0;
} }
#anketa_edit .page_num_fieldset {
border: unset;
border-top: 1px dashed #E5E5E5;
}
.page_num_fieldset { .page_num_fieldset {
padding-top: 0px; padding-top: 0px;
padding-bottom: 0px; padding-bottom: 0px;
@ -10173,6 +10178,7 @@ div .table-horizontal-scroll-wrapper2 table {
.page_num { .page_num {
margin-left: 39%; margin-left: 39%;
color: #333333; color: #333333;
position: relative;
} }
.table_header { .table_header {

10
resources/sass/admin_new/components/table/table.scss
View File

@ -39,13 +39,13 @@ table {
} }
tr { tr {
height: 40px; height: 40px;
&:last-of-type, &:last-of-type,
&.show_as_last_row{ &.show_as_last_row{
td, th { td, th {
border-bottom: 1px solid $gray; border-bottom: 1px solid $gray;
} }
} }
@ -107,6 +107,11 @@ div {
//testiranje --> avtomatski vnosi //testiranje --> avtomatski vnosi
#anketa_edit .page_num_fieldset{
border: unset;
border-top: 1px dashed #E5E5E5;
}
.page_num_fieldset{ .page_num_fieldset{
padding-top: 0px; padding-top: 0px;
padding-bottom: 0px; padding-bottom: 0px;
@ -117,6 +122,7 @@ div {
.page_num{ .page_num{
margin-left: 39%; margin-left: 39%;
color: #333333; color: #333333;
position: relative;
} }