kif/portal
10
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Increase timeout for js loading

Browse source
This commit is contained in:
Lars Westermann 2019-06-14 19:38:23 +02:00
parent 91175653c6
commit 619b7340bb
Signed by: lars.westermann
GPG key ID: 9D417FA5BB9D5E1D
7 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/jsMain/kotlin/de/kif/frontend/views/calendar/Calendar.kt
View file

@ -259,25 +259,29 @@ class Calendar(calendar: HTMLElement) : View(calendar) {
private fun scrollAllVerticalBy(pixel: Double, scrollBehavior: ScrollBehavior = ScrollBehavior.SMOOTH) { private fun scrollAllVerticalBy(pixel: Double, scrollBehavior: ScrollBehavior = ScrollBehavior.SMOOTH) {
for (calendarTable in scroll) { for (calendarTable in scroll) {
calendarTable.scrollBy(ScrollToOptions(0.0, pixel, scrollBehavior)) calendarTable.scrollTop = calendarTable.scrollTop + pixel
//calendarTable.scrollBy(ScrollToOptions(0.0, pixel, scrollBehavior))
} }
} }
private fun scrollAllHorizontalBy(pixel: Double, scrollBehavior: ScrollBehavior = ScrollBehavior.SMOOTH) { private fun scrollAllHorizontalBy(pixel: Double, scrollBehavior: ScrollBehavior = ScrollBehavior.SMOOTH) {
for (calendarTable in scroll) { for (calendarTable in scroll) {
calendarTable.scrollBy(ScrollToOptions(pixel, 0.0, scrollBehavior)) calendarTable.scrollLeft = calendarTable.scrollLeft + pixel
//calendarTable.scrollBy(ScrollToOptions(pixel, 0.0, scrollBehavior))
} }
} }
private fun scrollAllVerticalTo(pixel: Double, scrollBehavior: ScrollBehavior = ScrollBehavior.SMOOTH) { private fun scrollAllVerticalTo(pixel: Double, scrollBehavior: ScrollBehavior = ScrollBehavior.SMOOTH) {
for (calendarTable in scroll) { for (calendarTable in scroll) {
calendarTable.scrollTo(ScrollToOptions(0.0, pixel, scrollBehavior)) calendarTable.scrollTop = pixel
//calendarTable.scrollTo(ScrollToOptions(0.0, pixel, scrollBehavior))
} }
} }
private fun scrollAllHorizontalTo(pixel: Double, scrollBehavior: ScrollBehavior = ScrollBehavior.SMOOTH) { private fun scrollAllHorizontalTo(pixel: Double, scrollBehavior: ScrollBehavior = ScrollBehavior.SMOOTH) {
for (calendarTable in scroll) { for (calendarTable in scroll) {
calendarTable.scrollTo(ScrollToOptions(pixel, 0.0, scrollBehavior)) calendarTable.scrollLeft = pixel
//calendarTable.scrollTo(ScrollToOptions(pixel, 0.0, scrollBehavior))
} }
} }
} }

6
src/jsMain/resources/style/components/_calendar.scss
View file

@ -205,7 +205,7 @@
} }
&:hover { &:hover {
background: var(--table-header-color); background-color: var(--table-header-color);
} }
&.disabled { &.disabled {
@ -455,7 +455,7 @@
content: ''; content: '';
display: block; display: block;
position: absolute; position: absolute;
left: 6rem; left: 4rem;
right: 0; right: 0;
height: 1px; height: 1px;
border-bottom: solid 1px var(--primary-color); border-bottom: solid 1px var(--primary-color);
@ -465,7 +465,7 @@
content: ''; content: '';
display: block; display: block;
position: absolute; position: absolute;
left: 6rem; left: 4rem;
transform: scale(1, 0.5) rotate(-45deg); transform: scale(1, 0.5) rotate(-45deg);
transform-origin: bottom; transform-origin: bottom;
border-bottom: solid 0.4rem var(--primary-color); border-bottom: solid 0.4rem var(--primary-color);

6
src/jsMain/resources/style/components/_menu.scss
View file

@ -30,19 +30,19 @@
bottom: 1.8em; bottom: 1.8em;
height: 0.25rem; height: 0.25rem;
background: transparent; background-color: transparent;
transition: background-color $transitionTime; transition: background-color $transitionTime;
} }
&.active::after { &.active::after {
background: var(--text-primary-color); background-color: var(--text-primary-color);
} }
&:hover { &:hover {
background-color: var(--table-border-color); background-color: var(--table-border-color);
&::after { &::after {
background: var(--primary-color); background-color: var(--primary-color);
} }
} }
} }

2
src/jsMain/resources/style/components/_overview.scss
View file

@ -177,7 +177,7 @@
height: 1px; height: 1px;
left: 0; left: 0;
right: 0; right: 0;
background: var(--table-border-color); background-color: var(--table-border-color);
} }
} }

8
src/jsMain/resources/style/components/_table-layout.scss
View file

@ -66,7 +66,7 @@
.table-select-box { .table-select-box {
position: absolute; position: absolute;
z-index: 1; z-index: 1;
background: var(--background-primary-color); background-color: var(--background-primary-color);
width: 10rem; width: 10rem;
border: solid 1px var(--input-border-color); border: solid 1px var(--input-border-color);
border-radius: $border-radius; border-radius: $border-radius;
@ -110,7 +110,7 @@
font-weight: bold; font-weight: bold;
color: var(--primary-text-color); color: var(--primary-text-color);
background: var(--primary-color); background-color: var(--primary-color);
} }
} }
@ -134,7 +134,7 @@
display: none; display: none;
padding: 0.5rem 0; padding: 0.5rem 0;
background: var(--background-primary-color); background-color: var(--background-primary-color);
border: solid 1px var(--input-border-color); border: solid 1px var(--input-border-color);
border-radius: $border-radius; border-radius: $border-radius;
@ -190,7 +190,7 @@
font-weight: bold; font-weight: bold;
color: var(--primary-text-color); color: var(--primary-text-color);
background: var(--primary-color); background-color: var(--primary-color);
} }
} }

6
src/jsMain/resources/style/style.scss
View file

@ -13,7 +13,7 @@
body, html { body, html {
color: var(--text-primary-color); color: var(--text-primary-color);
background: var(--background-secondary-color); background-color: var(--background-secondary-color);
font-family: $mainFont; font-family: $mainFont;
font-weight: 500; font-weight: 500;
@ -24,10 +24,6 @@ body, html {
padding: 0; padding: 0;
overflow-x: hidden; overflow-x: hidden;
& > *:last-child {
//margin-bottom: 1rem;
}
} }
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {

2
src/jvmMain/kotlin/de/kif/backend/view/MainTemplate.kt
View file

@ -69,7 +69,7 @@ class MainTemplate(
script { script {
unsafe { unsafe {
+"let prefix = '$prefix';\n" +"let prefix = '$prefix';\n"
+"require.config({baseUrl: '$prefix/static'});\n" +"require.config({waitSeconds: 60, baseUrl: '$prefix/static'});\n"
+"require([${Resources.jsModules}]);\n" +"require([${Resources.jsModules}]);\n"
} }
} }