Skip to content

Commit 009d41d

Browse files
author
Alexander Agasiev
committed
DokuAlex merge with main
2 parents 06eca17 + b235894 commit 009d41d

File tree

201 files changed

+3743
-3466
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

201 files changed

+3743
-3466
lines changed

‎structr-app/src/main/resources/structr/css/dashboard.css‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,3 +272,34 @@
272272
margin: 0 0 1rem 0;
273273
cursor: pointer;
274274
}
275+
276+
/**
277+
statistics tab
278+
*/
279+
.http-statistics-GET {
280+
fill: #61affe;
281+
}
282+
283+
.http-statistics-PUT {
284+
fill: #fca130;
285+
}
286+
287+
.http-statistics-PATCH {
288+
fill: #fca130;
289+
}
290+
291+
.http-statistics-POST {
292+
fill: #49cc40;
293+
}
294+
295+
.http-statistics-DELETE {
296+
fill: #f93e3e;
297+
}
298+
299+
.http-statistics-OPTIONS {
300+
fill: #999999;
301+
}
302+
303+
.http-statistics-HEAD {
304+
fill: #94c9fe;
305+
}

‎structr-app/src/main/resources/structr/css/main.css‎

Lines changed: 30 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ button:hover:not(.disabled), button:focus:not(.disabled) {
285285
fill: none;
286286
}
287287
.fill-green {
288-
color: var(--icon-color-dark-green);
288+
fill: var(--structr-green);
289289
}
290290
.fill-grey {
291291
fill: var(--icon-stroke);
@@ -942,7 +942,7 @@ img.disabled {
942942
#tabs li:not(.active):hover,
943943
.data-tabs li:not(.active):hover,
944944
.files-tabs li:not(.active):hover,
945-
.code-tabs li:not(.active):hover,
945+
.code-tabs > ul > li:not(.active):hover,
946946
.favs-tabs li:not(.active):hover,
947947
.widgets-tabs > li:not(.active):hover,
948948
.tabs-menu li:not(.active):hover {
@@ -3642,28 +3642,18 @@ ul.combined-input-select-field li:hover {
36423642
z-index: 12000;
36433643
}
36443644

3645+
/* disabled because the resize sashes are not automatically adjusted correctly. they remain at their default initial positions */
3646+
/*.monaco-editor .suggest-details {*/
3647+
/* min-width: 600px;*/
3648+
/*}*/
3649+
36453650
.form-input.input-invalid {
36463651
border: 1px solid var(--input-invalid-border-color);
36473652
background-color: var(--input-invalid-bg-color);
36483653
}
36493654

36503655
/**
3651-
* Active Elements
3652-
**/
3653-
.active-elements-container svg {
3654-
margin-bottom: -5px;
3655-
}
3656-
.active-elements-container svg > * {
3657-
filter: drop-shadow(0 0 .625rem rgba(0, 0, 0, .1));
3658-
}
3659-
3660-
.active-elements-container svg *:hover,
3661-
.active-elements-container svg * text:hover {
3662-
stroke: #bbbbbb;
3663-
}
3664-
3665-
/**
3666-
* Tailwind classes
3656+
* BEGIN Tailwind classes
36673657
*/
36683658
.box-border {
36693659
box-sizing: border-box;
@@ -4028,6 +4018,9 @@ ul.combined-input-select-field li:hover {
40284018
.h-1\/2 {
40294019
height: 50%;
40304020
}
4021+
.m-auto {
4022+
margin: auto;
4023+
}
40314024
.m-0 {
40324025
margin: 0;
40334026
}
@@ -4784,45 +4777,31 @@ ul.combined-input-select-field li:hover {
47844777
.-rotate-180 {
47854778
transform: rotate(-180deg);
47864779
}
4787-
47884780
/**
4789-
statistics tab
4781+
* END Tailwind classes
47904782
*/
4791-
.http-statistics-GET {
4792-
fill: #61affe;
4793-
}
47944783

4795-
.http-statistics-PUT {
4796-
fill: #fca130;
4797-
}
4798-
4799-
.http-statistics-PATCH {
4800-
fill: #fca130;
4801-
}
48024784

4803-
.http-statistics-POST {
4804-
fill: #49cc40;
4785+
/* BEGIN special tailwind-style classes */
4786+
/* conditionally show spinner if group has class show-spinner */
4787+
.group-\[\.show-spinner\]\:block {
4788+
&:is(:where(.group):is(.show-spinner) *) {
4789+
display: block;
4790+
}
48054791
}
4792+
/* END special tailwind-style classes */
48064793

4807-
.http-statistics-DELETE {
4808-
fill: #f93e3e;
4809-
}
4810-
4811-
.http-statistics-OPTIONS {
4812-
fill: #999999;
4813-
}
4814-
4815-
.http-statistics-HEAD {
4816-
fill: #94c9fe;
4817-
}
4818-
4819-
/**
4820-
Active Elements
4821-
*/
4822-
svg g.diagram-element[data-type="ActionMapping"] rect {
4823-
fill: #ff8800;
4794+
/* BEGIN shake animation for notification bell */
4795+
.shake {
4796+
animation: shake 1s ease-in-out 0s 2 alternate forwards;
48244797
}
48254798

4826-
svg *[data-type="ListDataSource"] {
4827-
fill: #2222aa;
4799+
@keyframes shake {
4800+
0%, 100% { transform: rotate(0deg); transform-origin: 50% 0; }
4801+
10% { transform: rotate(3deg); }
4802+
20%, 40%, 60% { transform: rotate(-6deg); }
4803+
30%, 50%, 70% { transform: rotate(6deg); }
4804+
80% { transform: rotate(-3deg); }
4805+
90% { transform: rotate(3deg); }
48284806
}
4807+
/* END shake animation for notification bell */

‎structr-app/src/main/resources/structr/css/pages.css‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,4 +419,26 @@
419419

420420
.widget input.new-name {
421421
width: 90%;
422+
}
423+
424+
/**
425+
Active Elements
426+
*/
427+
.active-elements-container svg {
428+
margin-bottom: -5px;
429+
}
430+
.active-elements-container svg > * {
431+
filter: drop-shadow(0 0 .625rem rgba(0, 0, 0, .1));
432+
}
433+
434+
.active-elements-container svg *:hover,
435+
.active-elements-container svg * text:hover {
436+
stroke: #bbbbbb;
437+
}
438+
svg g.diagram-element[data-type="ActionMapping"] rect {
439+
fill: #ff8800;
440+
}
441+
442+
svg *[data-type="ListDataSource"] {
443+
fill: #2222aa;
422444
}

‎structr-app/src/main/resources/structr/icon/sprites.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎structr-app/src/main/resources/structr/js/code.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1974,7 +1974,7 @@ let _Code = {
19741974
});
19751975
});
19761976
});
1977-
});
1977+
}, 'schema');
19781978
},
19791979
showSwaggerUI: (data) => {
19801980

@@ -2851,7 +2851,7 @@ let _Code = {
28512851
<h2>FunctionProperty ${config.property.schemaNode.name}.${config.property.name}</h2>
28522852
<div id="property-buttons"></div>
28532853
2854-
<div id="function-property-container" class="data-tabs level-two flex flex-col flex-grow">
2854+
<div id="function-property-container" class="code-tabs level-two flex flex-col flex-grow">
28552855
<ul>
28562856
<li data-name="source">Code</li>
28572857
<li data-name="api">API</li>
@@ -2903,7 +2903,7 @@ let _Code = {
29032903
${_Schema.methods.templates.methodFlags(config)}
29042904
</div>
29052905
</div>
2906-
<div id="method-code-container" class="data-tabs level-two flex flex-col flex-grow">
2906+
<div id="method-code-container" class="code-tabs level-two flex flex-col flex-grow">
29072907
<ul>
29082908
<li data-name="source">Code</li>
29092909
<li data-name="api">API</li>

‎structr-app/src/main/resources/structr/js/crud.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ let _Crud = {
698698
if (!isRetry) {
699699
_Crud.objectList.list(type, url, true);
700700
} else {
701-
_Crud.helpers.delayedMessage.showMessageAfterDelay(_Icons.getSvgIcon(_Icons.iconWaitingSpinner, 24, 24, 'mr-2') + ' View is too large - please select different view', 1);
701+
_Crud.helpers.delayedMessage.showMessageAfterDelay(_Icons.getSvgIcon(_Icons.iconWaitingSpinner, 24, 24, ['mr-2', 'fill-green']) + ' View is too large - please select different view', 1);
702702
}
703703

704704
} else {
@@ -2510,7 +2510,7 @@ let _Crud = {
25102510

25112511
let resultsContainer = _Helpers.createSingleDOMElementFromHTML(`
25122512
<div id="results-for-${type}" class="searchResultGroup resourceBox">
2513-
<span class="flex items-center">${_Icons.getSvgIcon(_Icons.iconWaitingSpinner, 24, 24, 'mr-2')} Searching for "${searchString}" in ${type}</span>
2513+
<span class="flex items-center">${_Icons.getSvgIcon(_Icons.iconWaitingSpinner, 24, 24, ['mr-2', 'fill-green'])} Searching for "${searchString}" in ${type}</span>
25142514
</div>
25152515
`);
25162516

@@ -2961,7 +2961,7 @@ let _Crud = {
29612961
messageTimeout: undefined,
29622962
showLoadingMessageAfterDelay: (message, delay) => {
29632963

2964-
_Crud.helpers.delayedMessage.showMessageAfterDelay(`${_Icons.getSvgIcon(_Icons.iconWaitingSpinner, 24, 24, 'mr-2')}<span>${message} - please stand by</span>`, delay);
2964+
_Crud.helpers.delayedMessage.showMessageAfterDelay(`${_Icons.getSvgIcon(_Icons.iconWaitingSpinner, 24, 24, ['mr-2', 'fill-green'])}<span>${message} - please stand by</span>`, delay);
29652965
},
29662966
showMessageAfterDelay: (message, delay) => {
29672967

0 commit comments

Comments
 (0)