Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dark mode calendar issues #113

Merged
merged 2 commits into from
Feb 2, 2023
Merged

Dark mode calendar issues #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f0bd2c
Add dark mode support
angusmcleod Feb 2, 2023
d7a4232
Bump version.
angusmcleod Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions assets/stylesheets/common/event-form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,63 +1,63 @@
.event-form {
width: 585px;
max-width: 80vw;

.control {
display: inline-flex;
align-items: flex-start;
min-height: 30px;
margin-right: 20px;

> input:first-child {
margin-top: 10px !important;
}

> span:first-child {
margin-top: 5px !important;
}

> input + span {
margin-top: 5px;
}

&:last-of-type {
margin-right: 0;
}

input[type="checkbox"] {
margin: 0 10px 0 0;
}

input[type="number"] {
width: 50px;
margin: 0;
}

&.full-width {
flex: 1;
}

.select-kit, .ac-wrap {
width: 100% !important;
max-width: 330px;
}

.select-kit-body {
width: 100% !important;
max-width: 330px;
}
}

.event-controls {
margin-bottom: 20px;
display: flex;
align-items: flex-start;
}

.datetime-controls {
display: flex;
margin-bottom: 5px;

.date-time-card {
width: 270px;
display: inline-block;
Expand All @@ -72,19 +72,19 @@
.end-card {
border-left: 1px solid #eee;
padding-left: 20px;

&.disabled {
span, label, .pika-label, .pika-table th, .pika-button, .pika-prev, .pika-next, input, .pika-lendar, .is-selected .pika-button {
color: $primary-low;
color: var(--primary-low);
background-image: initial;
background: initial;
box-shadow: initial;
cursor: default;
pointer-events: none;
}

input, .pika-lendar {
border: 1px solid $primary-low !important;
border: 1px solid var(--primary-low) !important;
}
}
}
Expand Down Expand Up @@ -118,19 +118,19 @@
width: 127px;
}
}

input {
padding: 4px 10px;
font-size: 1em;
line-height: 1;
color: $primary;
border: 1px solid $primary-medium;
color: var(--primary);
border: 1px solid var(--primary-medium);
min-height: 30px;
width: 130px;
margin: 10px 0;
}
}

#date-container-start,
#date-container-end {
height: 250px;
Expand All @@ -147,7 +147,7 @@
z-index: 100;

.pika-lendar {
border: 1px solid $primary-medium;
border: 1px solid var(--primary-medium);
padding: 14px;
margin: 0;
float: none;
Expand All @@ -157,16 +157,16 @@
}

.rsvp-controls {

.rsvp-container {
display: flex;
flex-flow: wrap;
margin-top: 10px;

.control span {
margin-right: 10px;
}

.full-width {
align-items: flex-start;
}
Expand Down
46 changes: 23 additions & 23 deletions assets/stylesheets/common/events.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
}

.add-event, .add-event + button {
border: 1px solid $primary-medium;
border: 1px solid var(--primary-medium);
}

.form-element + span {
Expand Down Expand Up @@ -87,10 +87,10 @@
width: 190px;
position: absolute;
display: none;
background-color: $secondary;
background-color: var(--secondary);
z-index: 100;
box-shadow: shadow('dropdown');
border-top: 1px solid $primary-very-low;
border-top: 1px solid var(--primary-very-low);

&.show {
display: block;
Expand All @@ -105,7 +105,7 @@
cursor: pointer;

&:hover {
background-color: $primary-low;
background-color: var(--primary-low);
}
}
}
Expand Down Expand Up @@ -272,14 +272,14 @@
flex-wrap: wrap;
width: 100%;
margin-top: 15px;
border-bottom: 1px solid $primary-medium;
border-left: 1px solid $primary-medium;
border-bottom: 1px solid var(--primary-medium);
border-left: 1px solid var(--primary-medium);
box-sizing: border-box;

.day, .weekday {
width: calc(99.9999%/7);
border-top: 1px solid $primary-medium;
border-right: 1px solid $primary-medium;
border-top: 1px solid var(--primary-medium);
border-right: 1px solid var(--primary-medium);
box-sizing: border-box;
}

Expand All @@ -298,23 +298,23 @@
position: relative;

.container {
background-color: $secondary;
background-color: var(--primary-secondary);
}

&.today .container {
background-color: $highlight-low;
background-color: var(--highlight-low);
height: 100%;
}

&.different-month .container {
background-color: rgba($primary-low, .5);
color: rgba($primary, .5);
background-color: rgba(var(--primary-low), .5);
color: rgba(var(--primary), .5);
height: 100%;
}

&.selected .date label {
background-color: $tertiary;
color: $secondary;
background-color: var(--tertiary);
color: var(--secondary);
border-radius: 50%;
}

Expand All @@ -325,7 +325,7 @@
width: auto;
min-width: 100%;
overflow: visible;
border: 1px solid $primary-low;
border: 1px solid var(--primary-low);
box-shadow: 0 2px 2px rgba(0,0,0,0.4);

.events {
Expand Down Expand Up @@ -403,10 +403,10 @@ ul.events-calendar-events {
}

&.all-day {
background-color: $tertiary;
color: $secondary;
border-top: 1px solid $primary-low;
border-bottom: 1px solid $primary-low;
background-color: var(--primary-tertiary);
color: var(--secondary);
border-top: 1px solid var(--primary-low);
border-bottom: 1px solid var(--primary-low);

&:not(.full-width) {
&.start {
Expand Down Expand Up @@ -447,9 +447,9 @@ ul.events-calendar-events {
left: -390px;
width: 350px;
z-index: 997;
background-color: $secondary;
background-color: var(--secondary);
box-shadow: shadow('card');
border: 1px solid $primary-low;
border: 1px solid var(--primary-low);
padding: 15px;
border-radius: 4px;

Expand Down Expand Up @@ -565,7 +565,7 @@ ul.events-calendar-events {
.filter {
align-self: flex-start;
padding-bottom: 15px;
border-bottom: 1px solid $primary-low;
border-bottom: 1px solid var(--primary-low);

input {
width: 150px;
Expand All @@ -591,7 +591,7 @@ ul.events-calendar-events {

li {
padding: 10px 15px;
border-bottom: 1px solid $primary-low;
border-bottom: 1px solid var(--primary-low);

.user-info {
margin-bottom: 0;
Expand Down
20 changes: 1 addition & 19 deletions assets/stylesheets/desktop/events.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,8 @@

.composer-controls-event .event-label {
display: flex;

button {
padding: 5px 10px;
min-height: 30px;
min-width: 35px;
text-align: left;
margin-right: 5px;
margin-bottom: 5px;

&.no-text {
max-height: 29px;
text-align: center;

.fa {
margin-right: 0;
}
}
}
}

.composer-controls-event .btn:not(:hover) {
background: $secondary;
background: var(--secondary);
}
2 changes: 1 addition & 1 deletion assets/stylesheets/mobile/events.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
padding: 5px 10px;

&:not(.btn-primary) {
background: $secondary;
background: var(--secondary);
}

.fa {
Expand Down
2 changes: 1 addition & 1 deletion plugin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true
# name: discourse-events
# about: Allows you to manage events in Discourse
# version: 0.1.6
# version: 0.1.7
# authors: Angus McLeod
# contact_emails: development@pavilion.tech
# url: https://github.com/paviliondev/discourse-events
Expand Down