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-02-25 11:11:52 +01:00
commit 4e5fdf0ac2
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/css/admin_new.css
View File

@ -15677,7 +15677,7 @@ div.appendmerge_indent div.setting_holder input[type=number]:focus {
width: 22%; width: 22%;
min-width: 200px; min-width: 200px;
box-sizing: border-box; box-sizing: border-box;
padding: 12px 16px; padding: 12px 0px 12px 16px;
margin: 4px; margin: 4px;
text-align: left; text-align: left;
vertical-align: middle; vertical-align: middle;
@ -15688,7 +15688,8 @@ div.appendmerge_indent div.setting_holder input[type=number]:focus {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
padding: 0; padding: 0;
line-height: 30px; line-height: 40px;
margin: 0;
} }
ul#merge { ul#merge {

5
resources/sass/admin_new/pages/survey_data/append_merge.scss
View File

@ -78,7 +78,7 @@ div.appendmerge_indent{
min-width: 200px; min-width: 200px;
box-sizing: border-box; box-sizing: border-box;
padding: 12px 16px; padding: 12px 0px 12px 16px;
margin: 4px; margin: 4px;
text-align: left; text-align: left;
@ -93,7 +93,8 @@ div.appendmerge_indent{
box-sizing: border-box; box-sizing: border-box;
padding: 0; padding: 0;
line-height: 30px; line-height: 40px;
margin: 0
} }
} }
} }