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:
urospodkriznik 2022-10-04 12:46:44 +02:00
commit 36cbb8fd03
4 changed files with 2115 additions and 1948 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1082
admin/survey/classes/class.SurveyListFolders.php
View File

File diff suppressed because it is too large Load Diff

2918
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

23
resources/sass/admin_new/pages/my_surveys/survey_list_folders.scss
View File

@ -13,7 +13,7 @@
// Meni na levi // Meni na levi
.left_menu{ .left_content{
flex-shrink: 0; flex-shrink: 0;
width: 320px; width: 320px;
@ -31,13 +31,17 @@
text-transform: uppercase; text-transform: uppercase;
} }
.folder-item{ .folder_list{
box-sizing: border-box;
height: 40px;
margin-bottom: 8px;
border: 1px solid $light-gray;
border-radius: 2px; .folder_item{
box-sizing: border-box;
height: 40px;
margin-bottom: 8px;
border: 1px solid $light-gray;
border-radius: 2px;
}
} }
} }
@ -46,14 +50,17 @@
width: auto; width: auto;
padding: 32px 16px; padding: 32px 16px;
.title{ .folder_title{
margin-bottom: 24px; margin-bottom: 24px;
font-weight: 600; font-weight: 600;
font-size: 16px; font-size: 16px;
} }
/*.second_line{
display: flex;
} */
} }
} }
} }

4
sql/update2.sql
View File

@ -9660,3 +9660,7 @@ UPDATE misc SET value='22.08.05' WHERE what="version";
INSERT INTO srv_misc (what, value) VALUES ('pc_tables', '0'); INSERT INTO srv_misc (what, value) VALUES ('pc_tables', '0');
UPDATE misc SET value='22.08.25' WHERE what="version"; UPDATE misc SET value='22.08.25' WHERE what="version";
ALTER TABLE srv_mysurvey_folder ADD active enum('0','1') NOT NULL DEFAULT '0';
UPDATE misc SET value='22.10.04' WHERE what="version";