Skip to content

Commit

Permalink
Merge pull request #34 from Karaka-Management/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@spl1nes
spl1nes authored Apr 24, 2024
2 parents 610e5dc + 0d71204 commit cc009b8
Show file tree
Hide file tree
Showing 14 changed files with 73 additions and 30 deletions.
0 ICAL.txt → ICLA.txt
100755 → 100644
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion accordion.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
}

~ div {
display: block;
display: flex;
}
}
}
Expand Down
8 changes: 8 additions & 0 deletions article.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,19 @@ article {
line-height: 2rem;
white-space: normal;

.mermaid {
text-align: center;
}

del, ins, mark {
padding: 3px;
text-decoration: none;
}

pre {
margin: 1rem 0 1rem 0;
}

.tag {
margin: 0.1rem;
}
Expand Down
2 changes: 1 addition & 1 deletion button.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,4 @@ button.disabled, .button.disabled, input[type="submit"].disabled {
i.favorite {
color: var(--fav-c);
text-shadow: 0 0 1px var(--text-shadow);
}
}
1 change: 0 additions & 1 deletion default.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ code {
}

pre {
margin: 1rem 0 1rem 0;
line-height: 1.2rem;
border: 1px solid var(--bborder);
padding: 1rem;
Expand Down
6 changes: 1 addition & 5 deletions develop.scss
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
// @todo remove content from this file when implemented

thead td label {
thead td label, .portlet-head .inputWrapper, .portlet-head .g-icon {
display: none;
}

.portlet-head .g-icon {
display: none;
}
11 changes: 11 additions & 0 deletions layout.scss
View file
Original file line number Diff line number Diff line change
@@ -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 {
display: table;
vertical-align: top;
Expand All @@ -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 {
display: flex;
flex-direction: row;
Expand Down Expand Up @@ -66,6 +76,7 @@ div.sticky, section.sticky {
flex: 0 0 100%;
display: inline-flex;
align-items: center;
padding-bottom: 5px;

&> i {
margin-right: .5rem;
Expand Down
23 changes: 22 additions & 1 deletion nav.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,25 @@
.nav-trigger:checked ~ main {
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 changes: 1 addition & 1 deletion styles.css
View file

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion table.scss
View file
Original file line number Diff line number Diff line change
@@ -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);
}

Expand Down Expand Up @@ -167,6 +168,7 @@ table {
position: sticky;
top: 0;
z-index: 2;
background: var(--thead-bg);

& > * {
vertical-align : middle;
Expand Down
9 changes: 7 additions & 2 deletions tag.scss
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
span.tag {
cursor: pointer;
border-radius: 4px;
padding: 4px 6px 4px 6px;
padding: 0 6px 0 6px;
height: 24px;
font-size: .8rem;
color: var(--txt-on-bg-c-2);
background: var(--btn-bg);
Expand All @@ -12,10 +13,14 @@ span.tag {
i {
color: var(--txt-on-bg-c-2);
margin-right: .5rem;
font-size: .8em;
}
}

.tag-list {
display: flex;
gap: 5px;
}

.infoIcon {
width: 1rem;
text-align: center;
Expand Down
32 changes: 16 additions & 16 deletions tests/app/forms_table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@

<div class="form-group">
<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 class="form-group">
Expand Down Expand Up @@ -478,15 +478,15 @@
<i class="g-icon order-down">expand_more</i>
<i class="g-icon btn remove-form">close</i>
<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="/text" data-tpl-value="/text" data-value="">Text1</td>
<td data-tpl-text="/date" data-tpl-value="/date" data-value="">2020-10-13</td>
<td data-tpl-text="/text" data-tpl-value="/text">Text1</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>
<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/update" data-tpl-value="/checkbox/update" 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"></span>
</td>
</tr>
<tr data-id="2" draggable="true">
Expand All @@ -504,7 +504,7 @@
<td>
<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/update" data-tpl-value="/checkbox/update" data-value=""></span>
<span data-tpl-text="/checkbox/update" data-tpl-value="/checkbox/update"></span>
</td>
</tr>
<tr data-id="3" draggable="true">
Expand All @@ -514,14 +514,14 @@
<i class="g-icon order-down">expand_more</i>
<i class="g-icon btn remove-form">close</i>
<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="/text" data-tpl-value="/text" data-value="">Text3</td>
<td data-tpl-text="/date" data-tpl-value="/date" data-value="">1989-04-28</td>
<td data-tpl-text="/text" data-tpl-value="/text">Text3</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>
<span data-tpl-text="/checkbox/create" data-tpl-value="/checkbox/create" data-value=""></span>
<span data-tpl-text="/checkbox/read" data-tpl-value="/checkbox/read" 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"></span>
<span data-tpl-text="/checkbox/update" data-tpl-value="/checkbox/update" data-value="MODIFY">Modify</span>
</td>
</tr>
Expand All @@ -532,14 +532,14 @@
<i class="g-icon order-down">expand_more</i>
<i class="g-icon btn remove-form">close</i>
<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="/text" data-tpl-value="/text" data-value="">Text4</td>
<td data-tpl-text="/date" data-tpl-value="/date" data-value="">2025-07-04</td>
<td data-tpl-text="/text" data-tpl-value="/text">Text4</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>
<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>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion tests/app/load.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export class Application {
this.eventManager = new EventManager();
this.responseManager = new ResponseManager();
this.assetManager = new AssetManager();
this.acountManager = new AccountManager();
this.accountManager = new AccountManager();
this.uiManager = new UIManager(this);
this.inputManager = new InputManager(this);
this.moduleManager = new ModuleManager(this);
Expand Down
1 change: 1 addition & 0 deletions tooltip.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
cursor: pointer;
color: var(--box-hl);
font-size: .9rem;
display: inline-flex;

&:hover, &:active, &:focus {
position: relative;
Expand Down

0 comments on commit cc009b8

Please sign in to comment.