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
1 change: 1 addition & 0 deletions .discourse-compatibility
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
< 3.5.0.beta5-dev: afb7f74d62bac2a222ac77494c405c78e78b1c1e
< 3.5.0.beta1-dev: e3cf69de1ca1fcd9b05f03baa428b11da49e0f76
< 3.4.0.beta1-dev: fb007475e0446ff778945e02fc75f95b5f381087
< 3.3.0.beta1-dev: 85dc471b42495e1897c4fc07348b2b221dfaa149
Expand Down
36 changes: 18 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15,41 +15,41 @@ GEM
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
ast (2.4.3)
base64 (0.2.0)
benchmark (0.4.0)
bigdecimal (3.1.9)
base64 (0.3.0)
benchmark (0.4.1)
bigdecimal (3.2.2)
concurrent-ruby (1.3.5)
connection_pool (2.5.0)
drb (2.2.1)
connection_pool (2.5.3)
drb (2.2.3)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
json (2.10.2)
language_server-protocol (3.17.0.4)
json (2.12.2)
language_server-protocol (3.17.0.5)
lint_roller (1.1.0)
logger (1.7.0)
minitest (5.25.5)
parallel (1.26.3)
parser (3.3.7.3)
parallel (1.27.0)
parser (3.3.8.0)
ast (~> 2.4.1)
racc
prettier_print (1.2.1)
prism (1.4.0)
racc (1.8.1)
rack (3.1.12)
rack (3.1.16)
rainbow (3.1.1)
regexp_parser (2.10.0)
rubocop (1.75.1)
rubocop (1.76.0)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.43.0, < 2.0)
rubocop-ast (>= 1.45.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.43.0)
rubocop-ast (1.45.0)
parser (>= 3.3.7.2)
prism (~> 1.4)
rubocop-capybara (2.22.1)
Expand All @@ -67,13 +67,13 @@ GEM
rubocop-factory_bot (2.27.1)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
rubocop-rails (2.30.3)
rubocop-rails (2.32.0)
activesupport (>= 4.2.0)
lint_roller (~> 1.1)
rack (>= 1.1)
rubocop (>= 1.72.1, < 2.0)
rubocop-ast (>= 1.38.0, < 2.0)
rubocop-rspec (3.5.0)
rubocop (>= 1.75.0, < 2.0)
rubocop-ast (>= 1.44.0, < 2.0)
rubocop-rspec (3.6.0)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
rubocop-rspec_rails (2.31.0)
Expand All @@ -100,4 +100,4 @@ DEPENDENCIES
syntax_tree

BUNDLED WITH
2.6.6
2.6.9
20 changes: 10 additions & 10 deletions common/common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ body textarea {
@mixin boxShadow {
// Matched from https://material.io/components/cards/
box-shadow:
0 2px 1px -1px rgba(0, 0, 0, 0.2),
0 1px 1px 0 rgba(0, 0, 0, 0.14),
0 1px 3px 0 rgba(0, 0, 0, 0.12);
0 2px 1px -1px rgb(0, 0, 0, 0.2),
0 1px 1px 0 rgb(0, 0, 0, 0.14),
0 1px 3px 0 rgb(0, 0, 0, 0.12);
}

@mixin buttonShadow {
// Matched from https://material.io/components/buttons/
box-shadow:
0 3px 1px -2px rgba(0, 0, 0, 0.2),
0 2px 2px 0 rgba(0, 0, 0, 0.14),
0 1px 5px 0 rgba(0, 0, 0, 0.12);
0 3px 1px -2px rgb(0, 0, 0, 0.2),
0 2px 2px 0 rgb(0, 0, 0, 0.14),
0 1px 5px 0 rgb(0, 0, 0, 0.12);
}

@import "sidebar";
Expand Down Expand Up @@ -86,8 +86,8 @@ body textarea {
border: none;
border-radius: 4px;
box-shadow:
0 2px 5px 0 rgba(0, 0, 0, 0.16),
0 0 0 0 rgba(0, 0, 0, 0.12);
0 2px 5px 0 rgb(0, 0, 0, 0.16),
0 0 0 0 rgb(0, 0, 0, 0.12);
max-width: 754px;
padding-left: 20px;

Expand Down Expand Up @@ -172,8 +172,8 @@ body.has-sidebar-page.has-full-page-chat #main-outlet-wrapper {
border: none;
border-radius: 4px;
box-shadow:
0 2px 5px 0 rgba(0, 0, 0, 0.16),
0 0 0 0 rgba(0, 0, 0, 0.12);
0 2px 5px 0 rgb(0, 0, 0, 0.16),
0 0 0 0 rgb(0, 0, 0, 0.12);

.desktop-view & {
padding: 15px 30px;
Expand Down
22 changes: 11 additions & 11 deletions desktop/desktop.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@

@mixin boxShadow {
box-shadow:
0 2px 5px 0 rgba(0, 0, 0, 0.16),
0 0 0 0 rgba(0, 0, 0, 0.12);
0 2px 5px 0 rgb(0, 0, 0, 0.16),
0 0 0 0 rgb(0, 0, 0, 0.12);
}

@mixin buttonShadow {
box-shadow:
0 0 4px rgba(0, 0, 0, 0.14),
0 4px 8px rgba(0, 0, 0, 0.28);
0 0 4px rgb(0, 0, 0, 0.14),
0 4px 8px rgb(0, 0, 0, 0.28);
}

@mixin buttonTransition {
Expand Down Expand Up @@ -113,7 +113,7 @@

// darken color, remove shadow and border when pressed
.btn:active {
background-color: rgba(0, 0, 0, 0.4);
background-color: rgb(0, 0, 0, 0.4);
box-shadow: none;
}

Expand Down Expand Up @@ -144,7 +144,7 @@
bottom: 60px;
}

@media screen and (max-width: 1520px) {
@media screen and (width <= 1520px) {
body:has(#reply-control.draft.show-preview) & {
bottom: 60px;
}
Expand Down Expand Up @@ -216,7 +216,7 @@
}

// Proper spacing for iPad portrait
@media only screen and (min-width: 768px) and (max-width: 1250px) {
@media only screen and (width >= 768px) and (width <= 1250px) {
.timeline-container {
margin-left: 820px;
}
Expand Down Expand Up @@ -298,7 +298,7 @@
}

// RTL Overrides
@media only screen and (min-width: 768px) and (max-width: 1250px) {
@media only screen and (width >= 768px) and (width <= 1250px) {
.rtl {
.timeline-container {
margin-left: initial;
Expand Down Expand Up @@ -331,7 +331,7 @@
#main-chat-outlet {
margin-top: 1.5em;
box-shadow:
0 2px 1px -1px rgba(0, 0, 0, 0.2),
0 1px 1px 0 rgba(0, 0, 0, 0.14),
0 1px 3px 0 rgba(0, 0, 0, 0.12);
0 2px 1px -1px rgb(0, 0, 0, 0.2),
0 1px 1px 0 rgb(0, 0, 0, 0.14),
0 1px 3px 0 rgb(0, 0, 0, 0.12);
}
4 changes: 2 additions & 2 deletions mobile/mobile.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@mixin boxShadow {
box-shadow:
0 2px 5px 0 rgba(0, 0, 0, 0.16),
0 0 0 0 rgba(0, 0, 0, 0.12);
0 2px 5px 0 rgb(0, 0, 0, 0.16),
0 0 0 0 rgb(0, 0, 0, 0.12);
}

.list-controls .container {
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"private": true,
"devDependencies": {
"@discourse/lint-configs": "2.11.1",
"ember-template-lint": "7.0.1",
"eslint": "9.22.0",
"@discourse/lint-configs": "2.25.0",
"ember-template-lint": "7.8.1",
"eslint": "9.28.0",
"prettier": "3.5.3",
"stylelint": "16.16.0"
"stylelint": "16.20.0"
},
"engines": {
"node": ">= 22",
Expand Down
Loading