Skip to content

Commit

Permalink
Add CSS file for custom rules
Browse files Browse the repository at this point in the history
  • Loading branch information
meonwax committed May 6, 2024
1 parent 5477b0b commit c918e61
Show file tree
Hide file tree
Showing 5 changed files with 140 additions and 138 deletions.
6 changes: 2 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 4 additions & 2 deletions src/main/java/de/meonwax/predictr/domain/Question.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
package de.meonwax.predictr.domain;

import lombok.Data;
import lombok.Getter;
import lombok.Setter;

import javax.persistence.*;
import javax.validation.constraints.NotNull;
import java.time.Instant;
import java.util.Set;

@Entity
@Data
@Getter
@Setter
public class Question {

@Id
Expand Down
132 changes: 1 addition & 131 deletions src/main/scss/_custom.scss
Original file line number Diff line number Diff line change
@@ -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
131 changes: 131 additions & 0 deletions src/main/scss/_predictr.scss
Original file line number Diff line number Diff line change
@@ -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;
}
3 changes: 2 additions & 1 deletion src/main/scss/style.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import "bootstrap";
@import "angular";
@import "animate";
@import "custom";
@import "predictr";
@import "flag-icons";
@import "custom";

0 comments on commit c918e61

Please sign in to comment.