Skip to content

Commit

Permalink
Fix z-index for vue-slider
Browse files Browse the repository at this point in the history
  • Loading branch information
PrinsINT committed Jun 28, 2024
1 parent f7a97f5 commit 62080c0
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 81 deletions.
3 changes: 2 additions & 1 deletion client/src/views/annotate/subviews/JobsView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
–
<b v-if="eraRange[1] >= d.item.tagger.eraTo">{{ d.item.tagger.eraTo }}</b><span v-else>{{
d.item.tagger.eraTo
}}</span>
}}</span>
</div>
</template>
Expand Down Expand Up @@ -296,6 +296,7 @@ table button {
:deep(.vue-slider) .vue-slider-dot {
width: 25px !important;
height: 25px !important;
z-index: 1;
}
:deep(.vue-slider) .vue-slider-dot-handle {
Expand Down
153 changes: 76 additions & 77 deletions server/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,78 +1,77 @@
import org.jetbrains.dokka.DokkaConfiguration.Visibility
import org.jetbrains.dokka.gradle.DokkaTask
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id("org.springframework.boot") version "3.2.3"
id("io.spring.dependency-management") version "1.1.4"
id("org.jetbrains.dokka") version "1.9.10"
kotlin("jvm") version "1.9.22"
kotlin("plugin.spring") version "1.9.22"
kotlin("plugin.serialization") version "1.9.22"
}

group = "org.ivdnt"
version = "0.0.2-ALPHA-SNAPSHOT"
java.sourceCompatibility = JavaVersion.VERSION_17
java.targetCompatibility = JavaVersion.VERSION_17

repositories {
mavenCentral()
gradlePluginPortal()
}

dependencies {
// Spring
implementation("org.springframework.boot:spring-boot-starter-web:3.2.4")
// https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-devtools
implementation("org.springframework.boot:spring-boot-devtools:3.2.3")

// kotlin
implementation("org.jetbrains.kotlin:kotlin-reflect:1.9.22")
// https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.22")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3") // JVM dependency

// swagger
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0")


implementation("com.beust:klaxon:5.6")
implementation("org.apache.logging.log4j:log4j-api-kotlin:1.2.0")

// yaml
// https://mvnrepository.com/artifact/org.yaml/snakeyaml
implementation("org.yaml:snakeyaml:2.2")

// Tests
testImplementation ("org.springframework.boot:spring-boot-starter-test:3.2.3")
}

tasks.test {
environment(mapOf("profile" to "dev"))
useJUnitPlatform()
}

tasks.withType<Test> {
useJUnitPlatform()
// https://stackoverflow.com/questions/52733942/increase-heap-memory-for-gradle-test
// minHeapSize = "4096m"
// maxHeapSize = "4096m"
// jvmArgs = listOf("-XX:MaxPermSize=1024m") // fails on some IDEs
}

tasks.withType<KotlinCompile> {
kotlinOptions {
freeCompilerArgs = listOf("-Xjsr305=strict")
jvmTarget = "17"
}
}

tasks.withType<DokkaTask>().configureEach {
dokkaSourceSets {
configureEach {
documentedVisibilities.set(setOf(Visibility.PUBLIC, Visibility.PROTECTED, Visibility.PRIVATE, Visibility.INTERNAL))
}
}
import org.jetbrains.dokka.DokkaConfiguration.Visibility
import org.jetbrains.dokka.gradle.DokkaTask
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id("org.springframework.boot") version "3.2.3"
id("io.spring.dependency-management") version "1.1.4"
id("org.jetbrains.dokka") version "1.9.10"
kotlin("jvm") version "1.9.22"
kotlin("plugin.spring") version "1.9.22"
kotlin("plugin.serialization") version "1.9.22"
}

group = "org.ivdnt"
java.sourceCompatibility = JavaVersion.VERSION_17
java.targetCompatibility = JavaVersion.VERSION_17

repositories {
mavenCentral()
gradlePluginPortal()
}

dependencies {
// Spring
implementation("org.springframework.boot:spring-boot-starter-web:3.2.4")
// https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-devtools
implementation("org.springframework.boot:spring-boot-devtools:3.2.3")

// kotlin
implementation("org.jetbrains.kotlin:kotlin-reflect:1.9.22")
// https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.22")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3") // JVM dependency

// swagger
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0")


implementation("com.beust:klaxon:5.6")
implementation("org.apache.logging.log4j:log4j-api-kotlin:1.2.0")

// yaml
// https://mvnrepository.com/artifact/org.yaml/snakeyaml
implementation("org.yaml:snakeyaml:2.2")

// Tests
testImplementation ("org.springframework.boot:spring-boot-starter-test:3.2.3")
}

tasks.test {
environment(mapOf("profile" to "dev"))
useJUnitPlatform()
}

tasks.withType<Test> {
useJUnitPlatform()
// https://stackoverflow.com/questions/52733942/increase-heap-memory-for-gradle-test
// minHeapSize = "4096m"
// maxHeapSize = "4096m"
// jvmArgs = listOf("-XX:MaxPermSize=1024m") // fails on some IDEs
}

tasks.withType<KotlinCompile> {
kotlinOptions {
freeCompilerArgs = listOf("-Xjsr305=strict")
jvmTarget = "17"
}
}

tasks.withType<DokkaTask>().configureEach {
dokkaSourceSets {
configureEach {
documentedVisibilities.set(setOf(Visibility.PUBLIC, Visibility.PROTECTED, Visibility.PRIVATE, Visibility.INTERNAL))
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ class Documents(
override fun delete(key: String): Document? {
val fullyDeleted: Boolean = workDirectory.resolve(key).deleteRecursively()
if (!fullyDeleted) println("Partial deletion of $key")
// TODO remember we also need to delete in associated jobs
return readOrNull(key)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ class FoliaTextMerger(
if (node.nodeType == Node.TEXT_NODE) {
child.textContent = text
}
// TODO reparseText overwrites embedded t-styles

// never set the offset of more than one space.
if (endsWithSpace && text.startsWith(" ")) {
offset -= 1
Expand Down

0 comments on commit 62080c0

Please sign in to comment.