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

[Redizajn 1KA] - Uporabniki - v3

Browse Source
This commit is contained in:
tejagerjovic 2022-04-22 03:31:31 +02:00
parent 14439337be
commit 1af2492d12
6 changed files with 217 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/survey/classes/tracking/CrossRoad.php
View File

@ -518,7 +518,10 @@ class CrossRoad {
// Uporabniki
if($_GET['t'] == 'uporabniki'){
$layout_width = 'fullwidth';
$layout_width = 'narrow';
if($_GET['m'] == 'all'){
$layout_width = 'fullwidth';
}
}
// Ativnost
else{

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

169
public/css/admin_new.css
View File

@ -10414,9 +10414,6 @@ table#timinganketa_table td input {
font-size: 14px;
}
div.subpage_uporabniki {
/* datatables popravki */
}
div.subpage_uporabniki .data_table_top_holder {
position: relative;
display: flex;
@ -10477,70 +10474,6 @@ div.subpage_uporabniki .data_table_top_holder #end {
display: flex;
justify-content: flex-end;
}
div.subpage_uporabniki table.usersTable {
margin-left: 14px;
margin-right: 14px;
width: calc(100% - 28px);
white-space: nowrap;
}
div.subpage_uporabniki table.usersTable thead th,
div.subpage_uporabniki table.usersTable tbody th {
font-weight: 600;
background-color: #F8F8F8;
}
div.subpage_uporabniki table.usersTable thead td,
div.subpage_uporabniki table.usersTable thead th,
div.subpage_uporabniki table.usersTable tbody td,
div.subpage_uporabniki table.usersTable tbody th {
padding: 8px 16px;
border-top: 1px solid #E5E5E5;
vertical-align: middle;
}
div.subpage_uporabniki table.dataTable.no-footer {
border-bottom: none !important;
}
div.subpage_uporabniki table.dataTable thead th {
border-bottom: none !important;
}
div.subpage_uporabniki table.dataTable thead .sorting_asc {
background: url("/admin/survey/modules/mod_hierarhija/img/sort_asc.png") no-repeat center right !important;
}
div.subpage_uporabniki table.dataTable thead .sorting_desc {
background: url("/admin/survey/modules/mod_hierarhija/img/sort_desc.png") no-repeat center right !important;
}
div.subpage_uporabniki table.dataTable thead .sorting {
background: url("/admin/survey/modules/mod_hierarhija/img/sort_both.png") no-repeat center right !important;
}
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;
}
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;
}
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 {
background-color: #F8F8F8;
@ -28543,8 +28476,8 @@ input#endDate {
button.dt-button {
font-weight: 400;
padding: 5px 32px;
font-size: 14px;
padding: 0 16px;
height: 28px;
margin-right: 4px;
background-color: #FFFFFF;
border: 1px solid #E5E5E5;
@ -28556,6 +28489,9 @@ button.dt-button:hover {
button.dt-button.active {
border-color: #1E88E5;
}
button.dt-button span {
font-size: 14px !important;
}
.dt-button-collection {
padding-top: 48px;
@ -28585,23 +28521,116 @@ button.buttons-columnVisibility.active {
cursor: pointer;
font-size: 16px;
padding: 3px 7px;
height: 28px;
}
.dataTables_length select option {
font-size: 16px;
line-height: 18px;
}
.dataTables_filter {
margin-bottom: 16px;
}
.dataTables_filter input {
border: 1px solid #C4C4C4;
box-sizing: border-box;
border-radius: 2px;
height: 40px;
height: 28px;
font-size: 16px;
padding: 9px 7px;
}
.dataTables_info {
margin-left: 12px;
margin-top: 30px;
}
table.usersTable {
margin-left: 14px;
margin-right: 14px;
width: calc(100% - 28px);
white-space: nowrap;
border-collapse: collapse !important;
}
table.usersTable thead th,
table.usersTable tbody th {
font-weight: 600;
background-color: #F8F8F8;
}
table.usersTable thead td,
table.usersTable thead th,
table.usersTable tbody td,
table.usersTable tbody th {
padding: 8px 16px;
border: 1px solid #E5E5E5;
vertical-align: middle;
border-collapse: collapse !important;
}
table.usersTable thead td,
table.usersTable tbody td {
font-size: 14px !important;
}
table.dataTable.no-footer {
border-bottom: none !important;
}
table.dataTable thead th {
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: #F8F8F8 !important;
padding: 0 !important;
margin-top: 30px;
}
.paginate_button {
border: 1px solid #F8F8F8 !important;
background: #F8F8F8 !important;
padding: 0 !important;
height: 24px;
margin-right: 4px;
}
.paginate_button:last-of-type {
margin-right: 0;
}
.paginate_button:hover {
background-color: #ebebeb !important;
color: #333333 !important;
}
.paginate_button.current {
color: #FFFFFF !important;
border: 1px solid #1E88E5 !important;
background: #1E88E5 !important;
}
.paginate_button.current:hover {
background-color: #187bd1 !important;
}
.paginate_button.disabled {
border: 1px solid transparent !important;
background: transparent !important;
}
@media (max-width: 1100px) {

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

@ -77,89 +77,4 @@ div.subpage_uporabniki {
justify-content: flex-end;
}
}
table.usersTable {
margin-left: 14px;
margin-right: 14px;
width: calc(100% - 2*14px);
white-space: nowrap;
thead,
tbody {
th {
font-weight: $semi-bold;
background-color: $light-gray;
}
td,
th {
padding: 8px 16px;
border-top: 1px solid $gray;
vertical-align: middle;
}
}
}
table.dataTable{
&.no-footer {
border-bottom: none !important;
}
thead th {
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;
}
}
}

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

@ -7,8 +7,8 @@ button.dt-button {
font-weight: 400;
padding: 5px 32px;
font-size: 14px;
padding: 0 16px;
height: 28px;
margin-right: 4px;
@ -23,6 +23,10 @@ button.dt-button {
&.active {
border-color: $blue;
}
span {
font-size: 14px !important;
}
}
//Dodatni gumbi za vidnost stolpcev
@ -59,6 +63,8 @@ button.buttons-columnVisibility {
font-size: 16px;
padding: 3px 7px;
height: 28px;
option {
font-size: 16px;
line-height: 18px;
@ -73,12 +79,115 @@ button.buttons-columnVisibility {
box-sizing: border-box;
border-radius: 2px;
height: 40px;
height: 28px;
font-size: 16px;
padding: 9px 7px;
}
margin-bottom: 16px;
}
.dataTables_info {
margin-left: 12px;
margin-top: 30px;
}
table.usersTable {
margin-left: 14px;
margin-right: 14px;
width: calc(100% - 2*14px);
white-space: nowrap;
border-collapse: collapse !important;
thead,
tbody {
th {
font-weight: $semi-bold;
background-color: $light-gray;
}
td,
th {
padding: 8px 16px;
border: 1px solid $gray;
vertical-align: middle;
border-collapse: collapse !important;
}
td {
font-size: 14px !important;
}
}
}
table.dataTable{
&.no-footer {
border-bottom: none !important;
}
thead th {
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;
padding: 0 !important;
margin-top: 30px;
}
.paginate_button{
border: 1px solid $light-gray !important;
background: $light-gray !important;
padding: 0 !important;
height: 24px;
margin-right: 4px;
&:last-of-type {
margin-right: 0;
}
&: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;
}
}