Jingga/cssOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/cssOMS.git synced 2026-02-11 07:18:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #34 from Karaka-Management/develop

Browse Source 
Develop
This commit is contained in:
Dennis Eichhorn 2024-04-24 20:02:14 +02:00 committed by GitHub
commit cc009b8449
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 73 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
ICAL.txt → ICLA.txt Executable file → Normal file
View File

2
accordion.scss
View File

@ -91,7 +91,7 @@
} }
~ div { ~ div {
display: block; display: flex;
} }
} }
} }

8
article.scss
View File

@ -11,11 +11,19 @@ article {
line-height: 2rem; line-height: 2rem;
white-space: normal; white-space: normal;
.mermaid {
text-align: center;
}
del, ins, mark { del, ins, mark {
padding: 3px; padding: 3px;
text-decoration: none; text-decoration: none;
} }
pre {
margin: 1rem 0 1rem 0;
}
.tag { .tag {
margin: 0.1rem; margin: 0.1rem;
} }

2
button.scss
View File

@ -93,4 +93,4 @@ button.disabled, .button.disabled, input[type="submit"].disabled {
i.favorite { i.favorite {
color: var(--fav-c); color: var(--fav-c);
text-shadow: 0 0 1px var(--text-shadow); text-shadow: 0 0 1px var(--text-shadow);
} }

1
default.scss
View File

@ -51,7 +51,6 @@ code {
} }
pre { pre {
margin: 1rem 0 1rem 0;
line-height: 1.2rem; line-height: 1.2rem;
border: 1px solid var(--bborder); border: 1px solid var(--bborder);
padding: 1rem; padding: 1rem;

6
develop.scss
View File

@ -1,9 +1,5 @@
// @todo remove content from this file when implemented // @todo remove content from this file when implemented
thead td label { thead td label, .portlet-head .inputWrapper, .portlet-head .g-icon {
display: none; display: none;
} }
.portlet-head .g-icon {
display: none;
}

11
layout.scss
View File

@ -1,3 +1,5 @@
// @questions it seems stupid to have ipt-wrap, flex-line, simple-flex and input-control
// I have the feeling we maybe only need 1 or 2 of these (input-control has nice behavior)
.ipt-wrap { .ipt-wrap {
display: table; display: table;
vertical-align: top; vertical-align: top;
@ -17,6 +19,14 @@
} }
} }
.simple-flex {
display: flex;
flex-direction: row;
align-content: center;
align-items: center;
}
// @question consider to replace with input-control which has better behavior
.flex-line { .flex-line {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -66,6 +76,7 @@ div.sticky, section.sticky {
flex: 0 0 100%; flex: 0 0 100%;
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
padding-bottom: 5px;
&> i { &> i {
margin-right: .5rem; margin-right: .5rem;

23
nav.scss
View File

@ -85,4 +85,25 @@
.nav-trigger:checked ~ main { .nav-trigger:checked ~ main {
display: none !important; display: none !important;
} }
} }
.content-side-nav {
h1, h2, a {
font-size: .9rem;
}
h1, h2 {
padding: .5rem 1rem .5rem 1rem;
background: var(--thead-bg);
color: var(--thead-c);
}
a {
padding: .5rem 1rem .5rem 2rem;
display: block;
&:hover {
color: var(--link-c);
}
}
}

2
styles.css
View File

File diff suppressed because one or more lines are too long

4
table.scss
View File

@ -1,4 +1,5 @@
.order-up, .order-down, .remove-form, .update-form, .save-form, .form-action { .btn.order-up, .btn.order-down,
.btn.cancel-form, .btn.remove-form, .btn.update-form, .btn.save-form, .btn.form-action {
color: var(--btn-bg); color: var(--btn-bg);
} }
@ -167,6 +168,7 @@ table {
position: sticky; position: sticky;
top: 0; top: 0;
z-index: 2; z-index: 2;
background: var(--thead-bg);
& > * { & > * {
vertical-align : middle; vertical-align : middle;

9
tag.scss
View File

@ -1,7 +1,8 @@
span.tag { span.tag {
cursor: pointer; cursor: pointer;
border-radius: 4px; border-radius: 4px;
padding: 4px 6px 4px 6px; padding: 0 6px 0 6px;
height: 24px;
font-size: .8rem; font-size: .8rem;
color: var(--txt-on-bg-c-2); color: var(--txt-on-bg-c-2);
background: var(--btn-bg); background: var(--btn-bg);
@ -12,10 +13,14 @@ span.tag {
i { i {
color: var(--txt-on-bg-c-2); color: var(--txt-on-bg-c-2);
margin-right: .5rem; margin-right: .5rem;
font-size: .8em;
} }
} }
.tag-list {
display: flex;
gap: 5px;
}
.infoIcon { .infoIcon {
width: 1rem; width: 1rem;
text-align: center; text-align: center;

32
tests/app/forms_table.php
View File

@ -268,7 +268,7 @@
<div class="form-group"> <div class="form-group">
<label for="iText">Text</label> <label for="iText">Text</label>
<textarea id="iText" name="text" type="text" data-tpl-text="/text" data-tpl-value="/text"></textarea> <textarea id="iText" name="text" type="text" data-tpl-text="/text" data-tpl-value="/text" data-value=""></textarea>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -478,15 +478,15 @@
<i class="g-icon order-down">expand_more</i> <i class="g-icon order-down">expand_more</i>
<i class="g-icon btn remove-form">close</i> <i class="g-icon btn remove-form">close</i>
<td><?php include __DIR__ . '/helper/checkbox.tpl.php'; ?> <td><?php include __DIR__ . '/helper/checkbox.tpl.php'; ?>
<td data-tpl-text="/input" data-tpl-value="/input" data-value="">Input1</td> <td data-tpl-text="/input" data-tpl-value="/input">Input1</td>
<td data-tpl-text="/select" data-tpl-value="/select" data-value="o1">Option1</td> <td data-tpl-text="/select" data-tpl-value="/select" data-value="o1">Option1</td>
<td data-tpl-text="/text" data-tpl-value="/text" data-value="">Text1</td> <td data-tpl-text="/text" data-tpl-value="/text">Text1</td>
<td data-tpl-text="/date" data-tpl-value="/date" data-value="">2020-10-13</td> <td data-tpl-text="/date" data-tpl-value="/date">2020-10-13</td>
<td data-tpl-text="/radio" data-tpl-value="/radio" data-value="r1">Radio1</td> <td data-tpl-text="/radio" data-tpl-value="/radio" data-value="r1">Radio1</td>
<td> <td>
<span data-tpl-text="/checkbox/create" data-tpl-value="/checkbox/create" data-value="CREATE">Create</span> <span data-tpl-text="/checkbox/create" data-tpl-value="/checkbox/create" data-value="CREATE">Create</span>
<span data-tpl-text="/checkbox/read" data-tpl-value="/checkbox/read" data-value=""></span> <span data-tpl-text="/checkbox/read" data-tpl-value="/checkbox/read"></span>
<span data-tpl-text="/checkbox/update" data-tpl-value="/checkbox/update" data-value=""></span> <span data-tpl-text="/checkbox/update" data-tpl-value="/checkbox/update"></span>
</td> </td>
</tr> </tr>
<tr data-id="2" draggable="true"> <tr data-id="2" draggable="true">
@ -504,7 +504,7 @@
<td> <td>
<span data-tpl-text="/checkbox/create" data-tpl-value="/checkbox/create" data-value="CREATE">Create</span> <span data-tpl-text="/checkbox/create" data-tpl-value="/checkbox/create" data-value="CREATE">Create</span>
<span data-tpl-text="/checkbox/read" data-tpl-value="/checkbox/read" data-value="READ">Read</span> <span data-tpl-text="/checkbox/read" data-tpl-value="/checkbox/read" data-value="READ">Read</span>
<span data-tpl-text="/checkbox/update" data-tpl-value="/checkbox/update" data-value=""></span> <span data-tpl-text="/checkbox/update" data-tpl-value="/checkbox/update"></span>
</td> </td>
</tr> </tr>
<tr data-id="3" draggable="true"> <tr data-id="3" draggable="true">
@ -514,14 +514,14 @@
<i class="g-icon order-down">expand_more</i> <i class="g-icon order-down">expand_more</i>
<i class="g-icon btn remove-form">close</i> <i class="g-icon btn remove-form">close</i>
<td><?php include __DIR__ . '/helper/checkbox.tpl.php'; ?> <td><?php include __DIR__ . '/helper/checkbox.tpl.php'; ?>
<td data-tpl-text="/input" data-tpl-value="/input" data-value="">Input3</td> <td data-tpl-text="/input" data-tpl-value="/input">Input3</td>
<td data-tpl-text="/select" data-tpl-value="/select" data-value="o3">Option3</td> <td data-tpl-text="/select" data-tpl-value="/select" data-value="o3">Option3</td>
<td data-tpl-text="/text" data-tpl-value="/text" data-value="">Text3</td> <td data-tpl-text="/text" data-tpl-value="/text">Text3</td>
<td data-tpl-text="/date" data-tpl-value="/date" data-value="">1989-04-28</td> <td data-tpl-text="/date" data-tpl-value="/date">1989-04-28</td>
<td data-tpl-text="/radio" data-tpl-value="/radio" data-value="r3">Radio3</td> <td data-tpl-text="/radio" data-tpl-value="/radio" data-value="r3">Radio3</td>
<td> <td>
<span data-tpl-text="/checkbox/create" data-tpl-value="/checkbox/create" data-value=""></span> <span data-tpl-text="/checkbox/create" data-tpl-value="/checkbox/create"></span>
<span data-tpl-text="/checkbox/read" data-tpl-value="/checkbox/read" data-value=""></span> <span data-tpl-text="/checkbox/read" data-tpl-value="/checkbox/read"></span>
<span data-tpl-text="/checkbox/update" data-tpl-value="/checkbox/update" data-value="MODIFY">Modify</span> <span data-tpl-text="/checkbox/update" data-tpl-value="/checkbox/update" data-value="MODIFY">Modify</span>
</td> </td>
</tr> </tr>
@ -532,14 +532,14 @@
<i class="g-icon order-down">expand_more</i> <i class="g-icon order-down">expand_more</i>
<i class="g-icon btn remove-form">close</i> <i class="g-icon btn remove-form">close</i>
<td><?php include __DIR__ . '/helper/checkbox.tpl.php'; ?> <td><?php include __DIR__ . '/helper/checkbox.tpl.php'; ?>
<td data-tpl-text="/input" data-tpl-value="/input" data-value="">Input4</td> <td data-tpl-text="/input" data-tpl-value="/input">Input4</td>
<td data-tpl-text="/select" data-tpl-value="/select" data-value="o2">Option2</td> <td data-tpl-text="/select" data-tpl-value="/select" data-value="o2">Option2</td>
<td data-tpl-text="/text" data-tpl-value="/text" data-value="">Text4</td> <td data-tpl-text="/text" data-tpl-value="/text">Text4</td>
<td data-tpl-text="/date" data-tpl-value="/date" data-value="">2025-07-04</td> <td data-tpl-text="/date" data-tpl-value="/date">2025-07-04</td>
<td data-tpl-text="/radio" data-tpl-value="/radio" data-value="r2">Radio2</td> <td data-tpl-text="/radio" data-tpl-value="/radio" data-value="r2">Radio2</td>
<td> <td>
<span data-tpl-text="/checkbox/create" data-tpl-value="/checkbox/create" data-value="CREATE">Create</span> <span data-tpl-text="/checkbox/create" data-tpl-value="/checkbox/create" data-value="CREATE">Create</span>
<span data-tpl-text="/checkbox/read" data-tpl-value="/checkbox/read" data-value=""></span> <span data-tpl-text="/checkbox/read" data-tpl-value="/checkbox/read"></span>
<span data-tpl-text="/checkbox/update" data-tpl-value="/checkbox/update" data-value="MODIFY">Modify</span> <span data-tpl-text="/checkbox/update" data-tpl-value="/checkbox/update" data-value="MODIFY">Modify</span>
</td> </td>
</tr> </tr>

2
tests/app/load.js
View File

@ -32,7 +32,7 @@ export class Application {
this.eventManager = new EventManager(); this.eventManager = new EventManager();
this.responseManager = new ResponseManager(); this.responseManager = new ResponseManager();
this.assetManager = new AssetManager(); this.assetManager = new AssetManager();
this.acountManager = new AccountManager(); this.accountManager = new AccountManager();
this.uiManager = new UIManager(this); this.uiManager = new UIManager(this);
this.inputManager = new InputManager(this); this.inputManager = new InputManager(this);
this.moduleManager = new ModuleManager(this); this.moduleManager = new ModuleManager(this);

1
tooltip.scss
View File

@ -2,6 +2,7 @@
cursor: pointer; cursor: pointer;
color: var(--box-hl); color: var(--box-hl);
font-size: .9rem; font-size: .9rem;
display: inline-flex;
&:hover, &:active, &:focus { &:hover, &:active, &:focus {
position: relative; position: relative;