From c918e61ae867de4aca4ad427f8a5e724507b3eb8 Mon Sep 17 00:00:00 2001 From: meonwax Date: Mon, 6 May 2024 21:15:43 +0200 Subject: [PATCH] Add CSS file for custom rules --- .gitignore | 6 +- .../de/meonwax/predictr/domain/Question.java | 6 +- src/main/scss/_custom.scss | 132 +----------------- src/main/scss/_predictr.scss | 131 +++++++++++++++++ src/main/scss/style.scss | 3 +- 5 files changed, 140 insertions(+), 138 deletions(-) create mode 100644 src/main/scss/_predictr.scss diff --git a/.gitignore b/.gitignore index f959f20..60b223f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,14 +12,12 @@ # Third party libraries node_modules/ src/main/webapp/lib/ +package-lock.json # Build target/ .sass-cache/ .tmp/ +*.tmp src/main/webapp/dist/ src/main/webapp/css/ - -# Others -TODO.md -package-lock.json diff --git a/src/main/java/de/meonwax/predictr/domain/Question.java b/src/main/java/de/meonwax/predictr/domain/Question.java index fa2da39..8a09bad 100644 --- a/src/main/java/de/meonwax/predictr/domain/Question.java +++ b/src/main/java/de/meonwax/predictr/domain/Question.java @@ -1,6 +1,7 @@ package de.meonwax.predictr.domain; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import javax.persistence.*; import javax.validation.constraints.NotNull; @@ -8,7 +9,8 @@ import java.util.Set; @Entity -@Data +@Getter +@Setter public class Question { @Id diff --git a/src/main/scss/_custom.scss b/src/main/scss/_custom.scss index 21af495..83a90ae 100644 --- a/src/main/scss/_custom.scss +++ b/src/main/scss/_custom.scss @@ -1,131 +1 @@ -@import url("https://fonts.googleapis.com/css?family=Lato:400,700"); - -body { - background-color: #f5f5f5; -} -a { - cursor: pointer; -} -// Smaller fonts on headings for small screens -@media (max-width: $screen-xs) { - h2 { - font-size: 1.4em; - } - h3 { - font-size: 1.25em; - } -} - -.nowrap { - white-space: nowrap; -} -.bold { - font-weight: bold; -} -.table tbody > tr > td.vert-align { - vertical-align: middle; -} -.icon { - display: inline-block; -} - -.forkme { - position: absolute; - top: 0; - right: 0; - border: 0; -} -.loading { - z-index: 10; - position: fixed; - font-size: 1em; - top: 0.7em; - left: 50%; - width: 200px; - margin-left: -100px; -} -.logo { - background-image: url('../images/logo-ball.png'); - background-repeat: no-repeat; - background-size: contain; - height: 1.7em; - padding-left: 2em; - line-height: 1.7em; -} -.title, .title:hover, .title:focus { - color: $text-color; - text-decoration: none; - display: inline-block; -} -.title-mobile { - font-size: 1.4em; - padding-top: 0.5em; - padding-bottom: 0.5em; - line-height: 2em; -} -.dropdown-menu > li > a.text-danger { - color: $state-danger-text; -} -.playtime { - color: #0a0; -} - -/* -* Avatars -*/ -$ladder-avatar-height: 2.3em; -.ladder-rank { - line-height: $ladder-avatar-height; - padding: 4px 15px; -} -.ladder-rank > div > div > img { - height: $ladder-avatar-height; -} -.shoutbox-avatar { - max-height: 3em; -} - -/* -* Input fields -*/ -.ng-invalid { - border-color: $state-danger-text; - outline-color: $state-danger-text; -} -#bets input { - min-width: 3.5em; - max-width: 4em; - text-align: center; -} - -.content { - background-color: #fff; - padding-top: 2rem; - padding-bottom: 2rem; - border-top: 1px solid #eee; - border-bottom: 1px solid #eee; -} - -.footer { - padding-top: 2rem; - padding-bottom: 2rem; - font-size: 0.875em; - color: $gray-light; -} -.copyright { - margin-top: 2rem; -} - -/* Tabs navigation */ -.nav-tabs { - border-bottom: 0; -} -.nav-tabs > li.active > a, .nav-tabs > li.active > a:focus, .nav-tabs > li.active > a:hover { - border-color: #d26911 #e5e5e5 transparent; - border-width: 3px 1px 1px; -} - -/* Ladda */ -.ladda-spinner > div > div > div { - background: $gray-dark !important; -} +// Custom CSS rules go here diff --git a/src/main/scss/_predictr.scss b/src/main/scss/_predictr.scss new file mode 100644 index 0000000..21af495 --- /dev/null +++ b/src/main/scss/_predictr.scss @@ -0,0 +1,131 @@ +@import url("https://fonts.googleapis.com/css?family=Lato:400,700"); + +body { + background-color: #f5f5f5; +} +a { + cursor: pointer; +} +// Smaller fonts on headings for small screens +@media (max-width: $screen-xs) { + h2 { + font-size: 1.4em; + } + h3 { + font-size: 1.25em; + } +} + +.nowrap { + white-space: nowrap; +} +.bold { + font-weight: bold; +} +.table tbody > tr > td.vert-align { + vertical-align: middle; +} +.icon { + display: inline-block; +} + +.forkme { + position: absolute; + top: 0; + right: 0; + border: 0; +} +.loading { + z-index: 10; + position: fixed; + font-size: 1em; + top: 0.7em; + left: 50%; + width: 200px; + margin-left: -100px; +} +.logo { + background-image: url('../images/logo-ball.png'); + background-repeat: no-repeat; + background-size: contain; + height: 1.7em; + padding-left: 2em; + line-height: 1.7em; +} +.title, .title:hover, .title:focus { + color: $text-color; + text-decoration: none; + display: inline-block; +} +.title-mobile { + font-size: 1.4em; + padding-top: 0.5em; + padding-bottom: 0.5em; + line-height: 2em; +} +.dropdown-menu > li > a.text-danger { + color: $state-danger-text; +} +.playtime { + color: #0a0; +} + +/* +* Avatars +*/ +$ladder-avatar-height: 2.3em; +.ladder-rank { + line-height: $ladder-avatar-height; + padding: 4px 15px; +} +.ladder-rank > div > div > img { + height: $ladder-avatar-height; +} +.shoutbox-avatar { + max-height: 3em; +} + +/* +* Input fields +*/ +.ng-invalid { + border-color: $state-danger-text; + outline-color: $state-danger-text; +} +#bets input { + min-width: 3.5em; + max-width: 4em; + text-align: center; +} + +.content { + background-color: #fff; + padding-top: 2rem; + padding-bottom: 2rem; + border-top: 1px solid #eee; + border-bottom: 1px solid #eee; +} + +.footer { + padding-top: 2rem; + padding-bottom: 2rem; + font-size: 0.875em; + color: $gray-light; +} +.copyright { + margin-top: 2rem; +} + +/* Tabs navigation */ +.nav-tabs { + border-bottom: 0; +} +.nav-tabs > li.active > a, .nav-tabs > li.active > a:focus, .nav-tabs > li.active > a:hover { + border-color: #d26911 #e5e5e5 transparent; + border-width: 3px 1px 1px; +} + +/* Ladda */ +.ladda-spinner > div > div > div { + background: $gray-dark !important; +} diff --git a/src/main/scss/style.scss b/src/main/scss/style.scss index 7448b88..e2b310c 100644 --- a/src/main/scss/style.scss +++ b/src/main/scss/style.scss @@ -1,5 +1,6 @@ @import "bootstrap"; @import "angular"; @import "animate"; -@import "custom"; +@import "predictr"; @import "flag-icons"; +@import "custom";