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

[Redizajn 1KA] - Uporabniki --> paginacija

Browse Source
This commit is contained in:
tejagerjovic 2022-04-14 19:20:58 +02:00
parent e36590e6c8
commit 7ab1b630a0
7 changed files with 117 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/modules/mod_hierarhija/css/vendor/datatables.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
admin/survey/script/datatables/jquery.dataTables.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
public/css/admin.css
View File

@ -17233,7 +17233,7 @@ table.dataTable tbody td {
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
} }
.dataTables_wrapper .dataTables_paginate .paginate_button.current, /*.dataTables_wrapper .dataTables_paginate .paginate_button.current,
.dataTables_wrapper .dataTables_paginate .paginate_button.current:hover { .dataTables_wrapper .dataTables_paginate .paginate_button.current:hover {
color: #3d5f95 !important; color: #3d5f95 !important;
border: 1px solid #3d5f95 !important; border: 1px solid #3d5f95 !important;
@ -17300,7 +17300,7 @@ button.buttons-columnVisibility {
button.buttons-columnVisibility.active { button.buttons-columnVisibility.active {
background-color: #1e88e5; background-color: #1e88e5;
color: white; color: white;
} }*/
/* /*
To change this license header, choose License Headers in Project Properties. To change this license header, choose License Headers in Project Properties.

65
public/css/admin_new.css
View File

@ -10403,6 +10403,9 @@ table#timinganketa_table td input {
font-size: 14px; font-size: 14px;
} }
div.subpage_uporabniki {
/* datatables popravki */
}
div.subpage_uporabniki .data_table_top_holder { div.subpage_uporabniki .data_table_top_holder {
position: relative; position: relative;
display: flex; display: flex;
@ -10488,21 +10491,45 @@ div.subpage_uporabniki table.dataTable.no-footer {
div.subpage_uporabniki table.dataTable thead th { div.subpage_uporabniki table.dataTable thead th {
border-bottom: none !important; border-bottom: none !important;
} }
div.subpage_uporabniki table.dataTable table.dataTable thead .sorting_asc { div.subpage_uporabniki table.dataTable thead .sorting_asc {
background: url("/admin/survey/modules/mod_hierarhija/img/sort_asc.png") no-repeat center right !important; background: url("/admin/survey/modules/mod_hierarhija/img/sort_asc.png") no-repeat center right !important;
} }
div.subpage_uporabniki table.dataTable table.dataTable thead .sorting_desc { div.subpage_uporabniki table.dataTable thead .sorting_desc {
background: url("/admin/survey/modules/mod_hierarhija/img/sort_desc.png") no-repeat center right !important; background: url("/admin/survey/modules/mod_hierarhija/img/sort_desc.png") no-repeat center right !important;
} }
div.subpage_uporabniki table.dataTable table.dataTable thead .sorting { div.subpage_uporabniki table.dataTable thead .sorting {
background: url("/admin/survey/modules/mod_hierarhija/img/sort_both.png") no-repeat center right !important; background: url("/admin/survey/modules/mod_hierarhija/img/sort_both.png") no-repeat center right !important;
} }
div.subpage_uporabniki table.dataTable table.dataTable thead .sorting_asc_disabled { div.subpage_uporabniki table.dataTable thead .sorting_asc_disabled {
background: url("/admin/survey/modules/mod_hierarhija/img/sort_asc_disabled.png") no-repeat center right !important; background: url("/admin/survey/modules/mod_hierarhija/img/sort_asc_disabled.png") no-repeat center right !important;
} }
div.subpage_uporabniki table.dataTable table.dataTable thead .sorting_desc_disabled { div.subpage_uporabniki table.dataTable thead .sorting_desc_disabled {
background: url("/admin/survey/modules/mod_hierarhija/img/sort_desc_disabled.png") no-repeat center right !important; background: url("/admin/survey/modules/mod_hierarhija/img/sort_desc_disabled.png") no-repeat center right !important;
} }
div.subpage_uporabniki .dataTables_paginate {
border-radius: 2px !important;
background-color: #F8F8F8 !important;
}
div.subpage_uporabniki .paginate_button {
border: 1px solid #FFFFFF !important;
background: #F8F8F8 !important;
}
div.subpage_uporabniki .paginate_button:hover {
background-color: #ebebeb !important;
color: #333333 !important;
}
div.subpage_uporabniki .paginate_button.current {
color: #FFFFFF !important;
border: 1px solid #1E88E5 !important;
background: #1E88E5 !important;
}
div.subpage_uporabniki .paginate_button.current:hover {
background-color: #187bd1 !important;
}
div.subpage_uporabniki .paginate_button.disabled {
border: 1px solid transparent !important;
background: transparent !important;
}
div#user_info_segment_narocila { div#user_info_segment_narocila {
background-color: #F8F8F8; background-color: #F8F8F8;
@ -26132,7 +26159,7 @@ ul.vrednost_sort input[type=text] {
.subpage_analysis_creport #anketa_custom_report #newCReportProfile.warning_popup h2::before { .subpage_analysis_creport #anketa_custom_report #newCReportProfile.warning_popup h2::before {
padding-right: 8px; padding-right: 8px;
font-family: "Font Awesome 5 Free"; font-family: "Font Awesome 5 Free";
content: ""; content: "\f071";
font-size: 14px; font-size: 14px;
color: #FFC700; color: #FFC700;
} }
@ -27708,14 +27735,19 @@ input#endDate {
} }
button.dt-button { button.dt-button {
font-weight: 400;
padding: 5px 32px; padding: 5px 32px;
font-size: 14px; font-size: 14px;
margin-right: 4px; margin-right: 4px;
color: #FFFFFF; background-color: #FFFFFF;
background-color: #1E88E5; border: 1px solid #E5E5E5;
border-radius: 2px;
} }
button.dt-button:hover, button.dt-button .active { button.dt-button:hover {
background-color: #1980da; background-color: #f2f2f2;
}
button.dt-button.active {
border-color: #1E88E5;
} }
.dt-button-collection { .dt-button-collection {
@ -27724,21 +27756,16 @@ button.dt-button:hover, button.dt-button .active {
button.buttons-columnVisibility { button.buttons-columnVisibility {
color: #333333; color: #333333;
background-color: #E5E5E5; background-color: #FFFFFF;
border: 1px solid #333333; border: 1px solid #E5E5E5;
margin-bottom: 8px; margin-bottom: 8px;
margin-right: 4px; margin-right: 4px;
} }
button.buttons-columnVisibility:hover { button.buttons-columnVisibility:hover {
background-color: #d8d8d8; background-color: #f2f2f2;
} }
button.buttons-columnVisibility.active { button.buttons-columnVisibility.active {
color: #1E88E5; border-color: #1E88E5;
background-color: #FFFFFF;
border: 1px solid #1E88E5;
}
button.buttons-columnVisibility.active:hover {
background-color: #f2f2f2;
} }
.dataTables_length { .dataTables_length {

4
resources/sass/admin/users.scss
View File

@ -40,7 +40,7 @@ table.dataTable{
} }
} }
.dataTables_wrapper .dataTables_paginate .paginate_button.current, /*.dataTables_wrapper .dataTables_paginate .paginate_button.current,
.dataTables_wrapper .dataTables_paginate .paginate_button.current:hover{ .dataTables_wrapper .dataTables_paginate .paginate_button.current:hover{
color: #3d5f95 !important; color: #3d5f95 !important;
border: 1px solid #3d5f95 !important; border: 1px solid #3d5f95 !important;
@ -105,4 +105,4 @@ button.buttons-columnVisibility {
background-color: $strong_blue; background-color: $strong_blue;
color: white; color: white;
} }
} }*/

64
resources/sass/admin_new/pages/settings/uporabniki.scss
View File

@ -111,21 +111,55 @@ div.subpage_uporabniki {
thead th { thead th {
border-bottom: none !important; border-bottom: none !important;
} }
}
/* datatables popravki */
table.dataTable thead .sorting_asc {
background: url('/admin/survey/modules/mod_hierarhija/img/sort_asc.png') no-repeat center right !important;
}
table.dataTable thead .sorting_desc {
background: url('/admin/survey/modules/mod_hierarhija/img/sort_desc.png') no-repeat center right !important;
}
table.dataTable thead .sorting {
background: url('/admin/survey/modules/mod_hierarhija/img/sort_both.png') no-repeat center right !important;
}
table.dataTable thead .sorting_asc_disabled {
background: url('/admin/survey/modules/mod_hierarhija/img/sort_asc_disabled.png') no-repeat center right !important;
}
table.dataTable thead .sorting_desc_disabled {
background: url('/admin/survey/modules/mod_hierarhija/img/sort_desc_disabled.png') no-repeat center right !important;
}
.dataTables_paginate {
border-radius: 2px !important;
background-color: $light-gray !important;
}
.paginate_button{
border: 1px solid $white !important;
background: $light-gray !important;
&:hover {
background-color: darken($light-gray, 5%) !important;
color: $black !important;
}
&.current {
color: $white !important;
border: 1px solid $blue !important;
background: $blue !important;
&:hover {
background-color: darken($blue, 5%) !important;
}
}
&.disabled{
border: 1px solid transparent !important;
background: transparent !important;
}
table.dataTable thead .sorting_asc {
background: url('/admin/survey/modules/mod_hierarhija/img/sort_asc.png') no-repeat center right !important;
}
table.dataTable thead .sorting_desc {
background: url('/admin/survey/modules/mod_hierarhija/img/sort_desc.png') no-repeat center right !important;
}
table.dataTable thead .sorting {
background: url('/admin/survey/modules/mod_hierarhija/img/sort_both.png') no-repeat center right !important;
}
table.dataTable thead .sorting_asc_disabled {
background: url('/admin/survey/modules/mod_hierarhija/img/sort_asc_disabled.png') no-repeat center right !important;
}
table.dataTable thead .sorting_desc_disabled {
background: url('/admin/survey/modules/mod_hierarhija/img/sort_desc_disabled.png') no-repeat center right !important;
}
} }
} }

29
resources/sass/admin_new/pages/users/users.scss
View File

@ -5,16 +5,24 @@
button.dt-button { button.dt-button {
font-weight: 400;
padding: 5px 32px; padding: 5px 32px;
font-size: 14px; font-size: 14px;
margin-right: 4px; margin-right: 4px;
color: $white; background-color: $white;
background-color: $blue; border: 1px solid $gray;
&:hover, .active { border-radius: 2px;
background-color: darken($blue, 3%);
&:hover {
background-color: darken($white, 5%);
} }
&.active {
border-color: $blue;
}
} }
//Dodatni gumbi za vidnost stolpcev //Dodatni gumbi za vidnost stolpcev
@ -24,19 +32,14 @@ button.dt-button {
button.buttons-columnVisibility { button.buttons-columnVisibility {
color: $black; color: $black;
background-color: $gray; background-color: $white;
border: 1px solid $black; border: 1px solid $gray;
&:hover { &:hover {
background-color: darken($gray, 5%); background-color: darken($white, 5%);
} }
&.active { &.active {
color: $blue; border-color: $blue;
background-color: $white;
border: 1px solid $blue;
&:hover {
background-color: darken($white, 5%);
}
} }
margin-bottom: 8px; margin-bottom: 8px;