Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions Themes/default/css/attachments.css
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ div#post_attachments_area.roundframe {
box-shadow: none;
}
#post_attachments_area #postAttachment .attached {
border-right: 1px dotted #ddd;
border-top: 1px dotted #ddd;
border-right: 1px dotted var(--attachment-item-border-color);
border-top: 1px dotted var(--attachment-item-border-color);
padding-top: 9px;
width: 200px;
position: relative;
Expand Down Expand Up @@ -173,7 +173,7 @@ div#post_attachments_area.roundframe {
min-height: initial;
}
#post_attachments_area #attachment_upload.dz-drag-hover {
border-color: #557ea0;
border-color: var(--attachment-dropzone-border-color_hover);
}
#post_attachments_area .dz-clickable {
cursor: pointer;
Expand Down
8 changes: 4 additions & 4 deletions Themes/default/css/calendar.rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
margin: 0 0 0 1%;
}
#main_grid table.weeklist td.windowbg {
border-left: 2px solid #fff;
border-bottom: 2px solid #fff;
border-left: 2px solid var(--calendar-weeklist-border-color);
border-bottom: 2px solid var(--calendar-weeklist-border-color);
}
#main_grid img.calendar_icon {
float: right;
Expand All @@ -18,6 +18,6 @@
#main_grid table.weeklist td.weekdays {
text-align: left;
vertical-align: middle;
border-right: 2px solid #fff;
border-bottom: 2px solid #fff;
border-right: 2px solid var(--calendar-weeklist-border-color);
border-bottom: 2px solid var(--calendar-weeklist-border-color);
}
23 changes: 23 additions & 0 deletions Themes/default/css/dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,29 @@
/** Theme Picker **/
--picktheme-selected-bg: hsl(var(--primary-color-hue), 28%, 24%);

/** Mentions **/
--mentions-bg: var(--dark-bg-3);
--mentions-border-color: var(--dark-line-strong);
--mentions-box-shadow: 0 0 5px rgba(0, 0, 0, 0.5);
--mentions-item-bg: var(--dark-bg-2);
--mentions-item-bg_current: hsl(225, 55%, 42%);
--mentions-item-border-color: var(--dark-line);
--mentions-item-color: var(--dark-ink);

/** Shorthand Borders **/
--attachment-dropzone-border-color_hover: hsl(var(--primary-color-hue), 45%, 55%);
--attachment-item-border-color: var(--dark-line);
--buttonrow-border-color: var(--dark-line);
--calendar-weeklist-border-color: var(--dark-bg-1);
--detailedinfo-border-color: var(--dark-line);
--draftoptions-border-color_left: var(--dark-line-strong);
--draftoptions-item-border-color: var(--dark-line);
--errorfile-current-border-color: rgba(255, 255, 255, 0.2);
--innerwrap-border-color: var(--dark-line);
--listposts-border-color: var(--dark-line);
--mobileaction-item-border-color: var(--dark-line);
--upcontain-lastpost-border-color: var(--dark-line);

/** Admin **/
/* The permission grid is the one place a background alone carries the
/* meaning - deny, allow, custom, unchanged - so those six keep their hues
Expand Down
14 changes: 7 additions & 7 deletions Themes/default/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -1292,7 +1292,7 @@ h1.forumtitle {
}
h1.forumtitle a {
color: var(--forumtitle-link-color);
text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
text-shadow: var(--forumtitle-link-text-shadow);
}
/* Float these items to the right */
#siteslogan, img#smflogo {
Expand All @@ -1316,7 +1316,7 @@ img#smflogo {
display: flex;
justify-content: space-between;
align-items: center;
border-bottom: 1px solid #bbb;
border-bottom: 1px solid var(--innerwrap-border-color);
margin-bottom: 12px;
padding: 12px 10px 2px 10px;
}
Expand Down Expand Up @@ -1959,8 +1959,8 @@ tr.windowbg td, tr.bg td, .table_grid tr td {
}
.errorfile_table td.current {
font-weight: bold;
border-top: 1px solid rgba(0, 0, 0, 0.2);
border-bottom: 1px solid rgba(0, 0, 0, 0.2);
border-top: 1px solid var(--errorfile-current-border-color);
border-bottom: 1px solid var(--errorfile-current-border-color);
border-width: 1px 0 1px 1px;
background: var(--errorfile-bg_current);
}
Expand Down Expand Up @@ -2513,7 +2513,7 @@ dl {
margin-left: 25px;
}
.list_posts {
border-top: 1px solid #ddd;
border-top: 1px solid var(--listposts-border-color);
box-shadow: var(--listposts-box-shadow);
padding-top: 1em;
margin-top: 1em;
Expand Down Expand Up @@ -3673,13 +3673,13 @@ form#postmodify .roundframe {
#post_draft_options {
background: var(--draftoptions-bg);
border: 1px solid var(--draftoptions-border-color);
border-left: 1px solid #bbb;
border-left: 1px solid var(--draftoptions-border-color_left);
border-top: none;
border-radius: 0 0 4px 4px;
}
#post_draft_options .settings dd, #post_draft_options .settings dt {
width: 50%;
border-top: 1px solid #e4e4e4;
border-top: 1px solid var(--draftoptions-item-border-color);
padding: 5px 10px;
margin: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion Themes/default/css/profile.css
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
overflow: auto;
margin: 0 0 18px 0;
padding: 0 0 15px 0;
border-bottom: 1px #ccc solid;
border-bottom: 1px var(--detailedinfo-border-color) solid;
}

#detailedinfo dt, #tracking dt {
Expand Down
4 changes: 2 additions & 2 deletions Themes/default/css/responsive.css
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
margin: 0 auto;
}
#mobile_action .notify_dropdown a {
border-bottom: 1px solid #999;
border-bottom: 1px solid var(--mobileaction-item-border-color);
}
#mobile_action .notify_dropdown a:last-of-type {
border-bottom: none;
Expand Down Expand Up @@ -194,7 +194,7 @@
min-height: 2em;
}
.up_contain .lastpost {
border-top: 1px solid #ddd;
border-top: 1px solid var(--upcontain-lastpost-border-color);
min-height: initial;
}
.lastpost p {
Expand Down
2 changes: 1 addition & 1 deletion Themes/default/css/rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ ul.quickbuttons li {
}
.buttonrow .button:first-child {
border-radius: 0;
border-right: 1px solid #ccc;
border-right: 1px solid var(--buttonrow-border-color);
}

.post_verification #verification_control {
Expand Down
42 changes: 42 additions & 0 deletions Themes/default/css/variables.css
Original file line number Diff line number Diff line change
Expand Up @@ -792,4 +792,46 @@
--editor-popup-container-bg: #f5f5f5;
--editor-tablegrid-bg_active: #85a1b7;
--editor-tablegrid-border-color: #85a1b7;

/* Borders written as a shorthand rather than as a -color property, so
/* the sweep that tokenised the rest of the theme did not see them. */
/** Shorthand Borders **/
--attachment-dropzone-border-color_hover: #557ea0;
--attachment-item-border-color: #ddd;
--buttonrow-border-color: #ccc;
--calendar-weeklist-border-color: #fff;
--detailedinfo-border-color: #ccc;
--draftoptions-border-color_left: #bbb;
--draftoptions-item-border-color: #e4e4e4;
--errorfile-current-border-color: rgba(0, 0, 0, 0.2);
--forumtitle-link-text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
--innerwrap-border-color: #bbb;
--listposts-border-color: #ddd;
--mobileaction-item-border-color: #999;
--upcontain-lastpost-border-color: #ddd;

/* atwho.css already gives each of these a fallback, so the mentions list
/* has never looked wrong. But a token that is never declared cannot be
/* overridden either, which is what kept the list light in dark mode. Each
/* value here is the fallback it is declared from. */
/** Mentions **/
--mentions-bg: #fff;
--mentions-border-color: hsl(0, 0%, 85%);
--mentions-border-radius: 1px;
--mentions-border-style: solid;
--mentions-border-width: 1px;
--mentions-box-shadow: 0 0 5px rgba(0, 0, 0, 0.1);
--mentions-item-bg: #f2f2f2;
--mentions-item-bg_current: hsl(225, 100%, 60%);
--mentions-item-border-color: hsl(0, 0%, 85%);
--mentions-item-border-style: solid;
--mentions-item-border-width: 0 0 1px;
--mentions-item-color: hsl(0, 0%, 20%);
--mentions-item-color_current: #fff;
--mentions-item-cursor: pointer;
--mentions-item-font-size: .95em;
--mentions-item-font-size_current: .95em;
--mentions-item-font-weight: normal;
--mentions-item-font-weight_current: normal;
--mentions-width: 120px;
}