Skip to content

GitLab

Commit 1e1f8cba authored by Jelle Besseling's avatar Jelle Besseling
Browse files

Merge branch 'revert-86edba4e' into 'master' 

Revert "Merge branch 'add-dark-color-scheme' into 'master'"

See merge request !1478
parents 86edba4e 35ebb456
Hide whitespace changes
Inline Side-by-side
website/announcements/static/announcements/css/style.scss
View file @ 1e1f8cba
#announcements-alerts {
.announcement {
background: $preset;
color: $preset-contrast;
color: $white;
text-align: center;
padding: 0.5rem 1rem;
position: relative;
.close {
color: $preset-contrast;
color: $white;
}
p {
display: inline;
margin-left: 0.5rem;
color: $preset-contrast;
color: $white;
font-size: 0.9rem;
font-weight: $bold;
}
a {
color: $preset-contrast;
color: $white;
text-decoration: underline;
}
a:hover {
color: $preset-contrast-hover;
color: $light-grey;
}
button {
......
website/events/static/events/css/admin.scss
View file @ 1e1f8cba
......@@ -49,11 +49,11 @@
}
select[name=payment] {
background: $red;
background: $danger;
color: white;
&.paid {
background: $green;
background: $success;
}
@media(max-width: 767px) {
......
website/events/static/events/css/style.scss
View file @ 1e1f8cba
......@@ -9,7 +9,7 @@
height: calc(100% - 15px);
&:hover {
background-color: $card-background-hover;
background-color: $grey;
}
.card-date {
......@@ -30,7 +30,7 @@
}
.no-registration {
background-color: $card-background-hover;
background-color: $dark-grey;
}
.has-registration {
......@@ -42,11 +42,11 @@
#events-index {
.fc-bootstrap .fc-today {
background: $background-shade;
background: #fff9fc;
}
.fc-now-indicator {
border-color: $preset;
border-color: $dark-grey;
&.fc-now-indicator-arrow {
border-top-color: transparent;
......
website/partners/static/partners/css/style.scss
View file @ 1e1f8cba
#partner-banners {
background-color: $banner-background;
background-color: $grey;
height: 140px;
overflow: hidden;
......@@ -95,7 +95,7 @@
flex-direction: column;
justify-content: center;
background-color: $banner-background;
background-color: $grey;
img {
width: auto;
......
website/payments/static/payments/css/style.scss
View file @ 1e1f8cba
......@@ -9,7 +9,6 @@
#id_signature_canvas {
height: 10rem;
background-color: #ffffff;
}
#canvas-container {
......@@ -20,7 +19,7 @@
height: 2rem;
width: 2rem;
top: 0.25rem;
color: #000000;
color: $black;
display: inline-block;
font-weight: 400;
......
website/pizzas/static/pizzas/css/admin.scss
View file @ 1e1f8cba
......@@ -63,11 +63,11 @@
}
select[name=payment] {
background: $red;
background: $danger;
color: white;
&.paid {
background: $green;
background: $success;
}
@media(max-width: 767px) {
......
website/pizzas/static/pizzas/css/style.scss
View file @ 1e1f8cba
......@@ -7,19 +7,19 @@
h1 {
font-size: 2rem;
text-align: center;
color: $white;
}
h2 {
text-align: center;
color: $white;
}
&.paid {
background-color: $success;
color: $success-contrast;
}
&.unpaid {
background-color: $danger;
color: $danger-contrast;
}
}
website/registrations/static/registrations/css/style.scss
View file @ 1e1f8cba
......@@ -3,7 +3,7 @@
label::after {
content: '*';
margin-left: 2px;
color: $text-color;
color: $dark-grey;
}
}
}
website/thaliawebsite/static/css/_alerts.scss
View file @ 1e1f8cba
......@@ -4,7 +4,7 @@
}
.alert-success {
color: $success-contrast;
color: $white;
background-color: $success;
border-color: $success-hover;
}
......@@ -14,7 +14,7 @@
}
.alert-info {
color: $info-contrast;
color: $white;
background-color: $info;
border-color: $info-hover;
}
......@@ -24,7 +24,7 @@
}
.alert-warning {
color: $warning-contrast;
color: $white;
background-color: $warning;
border-color: $warning-hover;
}
......@@ -34,7 +34,7 @@
}
.alert-danger, .alert-error {
color: $danger-contrast;
color: $white;
background-color: $danger;
border-color: $danger-hover;
}
......
website/thaliawebsite/static/css/_buttons.scss
View file @ 1e1f8cba
......@@ -39,7 +39,7 @@
.btn-primary, .btn-primary:active, .btn-primary:focus {
background: $preset !important;
border-color: $preset !important;
color: $preset-contrast !important;
color: $white !important;
&:hover, &.active {
background: $preset-hover !important;
......@@ -50,7 +50,7 @@
.btn-secondary, .btn-secondary:active, .btn-secondary:focus {
background: $secondary !important;
border-color: $secondary !important;
color: $secondary-contrast !important;
color: $white !important;
&:hover {
background: $secondary-hover !important;
......@@ -61,7 +61,7 @@
.btn-success, .btn-success:active, .btn-success:focus {
background: $success !important;
border-color: $success !important;
color: $success-contrast !important;
color: $white !important;
&:hover {
background: $success-hover !important;
......@@ -72,7 +72,7 @@
.btn-info, .btn-info:active, .btn-info:focus {
background: $info !important;
border-color: $info !important;
color: $info-contrast !important;
color: $white !important;
&:hover {
background: $info-hover !important;
......@@ -83,7 +83,7 @@
.btn-warning, .btn-warning:active, .btn-warning:focus {
background: $warning !important;
border-color: $warning !important;
color: $warning-contrast !important;
color: $white !important;
&:hover {
background: $warning-hover !important;
......@@ -94,7 +94,7 @@
.btn-danger, .btn-danger:active, .btn-danger:focus {
background: $danger !important;
border-color: $danger !important;
color: $danger-contrast !important;
color: $white !important;
&:hover {
background: $danger-hover !important;
......
website/thaliawebsite/static/css/_cards.scss
View file @ 1e1f8cba
......@@ -2,7 +2,7 @@
position: relative;
display: block;
margin-bottom: 15px;
background-color: $card-background;
background-color: $light-grey;
border-radius: 0;
border: 0;
width: 100%;
......@@ -33,7 +33,7 @@
.card-text {
font-size: .9rem;
color: $card-background-contrast;
color: #444;
}
.card-btn {
......@@ -49,8 +49,8 @@
font-weight: 700;
text-transform: uppercase;
padding: 1.25rem;
color: $card-background-hover-contrast;
background-color: $card-background-hover;
color: $preset;
background-color: $grey;
border-radius: 0;
transition: all 300ms ease-in-out 0s;
......@@ -59,23 +59,23 @@
-o-transition: all 300ms ease-in-out 0s;
a {
color: $card-background-hover-contrast;
color: $preset;
}
&.collapsed {
color: $card-background-contrast;
background-color: $card-background;
color: $black;
background-color: $light-grey;
a {
color: $card-background-contrast;
color: $black;
}
&:hover {
color: $card-background-hover-contrast;
background-color: $card-background-hover;
color: $preset;
background-color: $grey;
a {
color: $card-background-hover-contrast;
color: $preset;
}
}
}
......
website/thaliawebsite/static/css/_forms.scss
View file @ 1e1f8cba
.form-control {
color: $form-text;
background: $form-background;
color: $text-color;
background: $white;
font-weight: $regular;
font-size: 14px;
font-family: $primary-font;
letter-spacing: $letter-spacing;
border: 2px solid $form-border;
border: 2px solid $black;
border-radius: 0;
padding: 3px 10px;
min-height: 50px;
......
website/thaliawebsite/static/css/_navs.scss
View file @ 1e1f8cba
......@@ -10,7 +10,7 @@
}
.nav-link {
color: $nav-link-color;
color: $black;
font-family: $header-font;
font-size: 16px;
line-height: 18px;
......@@ -28,13 +28,13 @@
}
&.mixitup-control-active {
color: $preset;
color: #E62272;
border-color: #dee2e6 #dee2e6 #fff;
}
}
.nav-select {
color: $secondary;
color: $black;
font-family: $header-font;
font-size: 16px;
line-height: 18px;
......@@ -45,7 +45,7 @@
border: 1px solid transparent;
&.active {
color: $preset;
color: #E62272;
}
}
}
......@@ -59,11 +59,8 @@
border-radius: 0;
.page-item {
.page-link {
color: $preset;
background-color: $background-color;
border-color: $background-shade;
border-radius: 0;
&:focus {
......
website/thaliawebsite/static/css/_progress.scss
View file @ 1e1f8cba
......@@ -2,7 +2,7 @@
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
background-color: $card-background-hover;
background-color: $grey;
.progress-bar {
-webkit-border-radius: 0;
......
website/thaliawebsite/static/css/_typography.scss
View file @ 1e1f8cba
......@@ -64,31 +64,31 @@ p {
}
.bg-primary {
color: $preset-contrast;
color: $white;
background: $preset;
padding: 3px 4px;
}
.bg-success {
color: $success-contrast;
color: $white;
background: $success;
padding: 3px 4px;
}
.bg-info {
color: $info-contrast;
color: $white;
background: $info;
padding: 3px 4px;
}
.bg-warning {
color: $warning-contrast;
color: $white;
background: $warning;
padding: 3px 4px;
}
.bg-danger {
color: $danger-contrast;
color: $white;
background: $danger;
padding: 3px 4px;
}
website/thaliawebsite/static/css/_variable-usage-dark.scss deleted 100644 → 0
View file @ 86edba4e
$background-color: $darkdark-grey;
$background-shade: $dark-grey;
$navbar-background-color: $black;
$card-background: $dark-grey;
$card-background-contrast: $white;
$card-background-hover: $grey;
$card-background-hover-contrast: $white;
$banner-background: $dark-grey;
$form-background: $dark-grey;
$form-background-disabled: $black;
$form-border: $white;
$form-text: $light-grey;
$title-color: $white;
$sub-title-color: $lightlight-grey;
$text-color: $light-grey;
$nav-link-color: $white;
$footer-text-color: $white;
$footer-text-color-hover: $lightlight-grey;
$preset: $magenta;
$preset-hover: $magenta-shade;
$preset-contrast: $white;
$preset-contrast-hover: $light-grey;
$secondary: $white;
$secondary-hover: $lightlight-grey;
$secondary-contrast: $black;
$success: $green;
$success-hover: $green-shade;
$success-contrast: $white;
$info: $blue;
$info-hover: $blue-shade;
$info-contrast: $white;
$warning: $yellow;
$warning-hover: $yellow-shade;
$warning-contrast: $white;
$danger: $red;
$danger-hover: $red-shade;
$danger-contrast: $white;
website/thaliawebsite/static/css/_variable-usage.scss deleted 100644 → 0
View file @ 86edba4e
$background-color: $white;
$background-shade: $light-grey;
$navbar-background-color: $white;
$card-background: $lightlight-grey;
$card-background-contrast: $black;
$card-background-hover: $light-grey;
$card-background-hover-contrast: $magenta;
$banner-background: $light-grey;
$form-background: $white;
$form-background-disabled: $light-grey;
$form-border: $black;
$form-text: $dark-grey;
$title-color: $black;
$sub-title-color: $dark-grey;
$text-color: $dark-grey;
$nav-link-color: $black;
$footer-text-color: $white;
$footer-text-color-hover: $lightlight-grey;
$preset: $magenta;
$preset-hover: $magenta-shade;
$preset-contrast: $white;
$preset-contrast-hover: $light-grey;
$secondary: $black;
$secondary-hover: $darkdark-grey;
$secondary-contrast: $white;
$success: $green;
$success-hover: $green-shade;
$success-contrast: $white;
$info: $blue;
$info-hover: $blue-shade;
$info-contrast: $white;
$warning: $yellow;
$warning-hover: $yellow-shade;
$warning-contrast: $white;
$danger: $red;
$danger-hover: $red-shade;
$danger-contrast: $white;
website/thaliawebsite/static/css/_variables.scss
View file @ 1e1f8cba
......@@ -8,22 +8,27 @@ $letter-spacing: 0px;
$fa-font-path: "../fonts";
// Theme Colors
$magenta: #E62272;
$magenta-shade: #CF1760;
$black: #000000;
$darkdark-grey: #1d1d1d;
$dark-grey: #444444;
$grey: #616161;
$light-grey: #dddddd;
$lightlight-grey: #f7f7f7;
$white: #ffffff;
$preset-transparent: RGBA(235, 88, 111, 0.7);
$preset: #E62272;
$preset-hover: #CF1760;
$green: #55c025;
$green-shade: #52a425;
$blue: #1e9ae6;
$blue-shade: #1e83cf;
$yellow: #ffc107;
$yellow-shade: #e0a800;
$red: #e62a17;
$red-shade: #ce2816;
$primary: $preset;
$primary-hover: $preset-hover;
$secondary: #000000;
$secondary-hover: #1d1d1d;
$success: #55c025;
$success-hover: #52a425;
$info: #1e9ae6;
$info-hover: #1e83cf;
$warning: #ffc107;
$warning-hover: #e0a800;
$danger: #e62a17;
$danger-hover: #ce2816;
$title-color: #000;
$sub-title-color: #333;
$text-color: #444;
$white: #fff;
$light-grey: #f7f7f7;
$grey: #ddd;
$dark-grey: #616161;
$black: #000;
$preset-transparent: RGBA(235, 88, 111, 0.7);
website/thaliawebsite/static/css/base.scss
View file @ 1e1f8cba
......@@ -5,12 +5,6 @@ html {
body {
margin-bottom: 80px;
background-color: $background-color;
color: $text-color;
}
.form-control:disabled, .form-control[readonly] {
background-color: $form-background-disabled;
}
#accentbar {
......@@ -26,8 +20,8 @@ body {
position: -webkit-sticky;
position: sticky;
font-size: 16px;
background-color: $navbar-background-color;
border-bottom: 1px solid $background-shade;
background-color: $white;
border-bottom: 1px solid $grey;
top: 5px;
z-index: 1020;
......@@ -45,14 +39,10 @@ body {
}
}
.navbar-toggler {
color: $nav-link-color;
}
.navbar-nav {
.nav-item {
.nav-link {
color: $nav-link-color;
color: $black;
font-family: $header-font;
text-transform: uppercase;
}
......@@ -91,25 +81,12 @@ body {
}
}
.table {
color: $text-color;
}
.table-bordered {
border-color: $background-shade;
}
.table-bordered td, .table-bordered th {
border-color: $background-shade;
}
.table-clickable {
tbody tr {
&:hover {
cursor: pointer;