Skip to content

DEV: Update linting #70

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

Merged
merged 1 commit into from
Mar 19, 2025
Merged

DEV: Update linting #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
92 changes: 53 additions & 39 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (7.2.1.1)
activesupport (8.0.2)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
Expand All @@ -12,68 +13,81 @@ GEM
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
ast (2.4.2)
base64 (0.2.0)
bigdecimal (3.1.8)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
benchmark (0.4.0)
bigdecimal (3.1.9)
concurrent-ruby (1.3.5)
connection_pool (2.5.0)
drb (2.2.1)
i18n (1.14.6)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
json (2.7.2)
language_server-protocol (3.17.0.3)
logger (1.6.1)
minitest (5.25.1)
json (2.10.2)
language_server-protocol (3.17.0.4)
lint_roller (1.1.0)
logger (1.6.6)
minitest (5.25.5)
parallel (1.26.3)
parser (3.3.5.0)
parser (3.3.7.1)
ast (~> 2.4.1)
racc
prettier_print (1.2.1)
racc (1.8.1)
rack (3.1.10)
rack (3.1.12)
rainbow (3.1.1)
regexp_parser (2.9.2)
rubocop (1.67.0)
regexp_parser (2.10.0)
rubocop (1.74.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
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.4, < 3.0)
rubocop-ast (>= 1.32.2, < 2.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.38.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.32.3)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.39.0)
parser (>= 3.3.1.0)
rubocop-capybara (2.21.0)
rubocop (~> 1.41)
rubocop-discourse (3.8.2)
rubocop-capybara (2.22.1)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
rubocop-discourse (3.12.1)
activesupport (>= 6.1)
rubocop (>= 1.59.0)
rubocop-capybara (>= 2.0.0)
rubocop-factory_bot (>= 2.0.0)
rubocop-rails (>= 2.25.0)
lint_roller (>= 1.1.0)
rubocop (>= 1.73.2)
rubocop-capybara (>= 2.22.0)
rubocop-factory_bot (>= 2.27.0)
rubocop-rails (>= 2.30.3)
rubocop-rspec (>= 3.0.1)
rubocop-rspec_rails (>= 2.30.0)
rubocop-factory_bot (2.26.1)
rubocop (~> 1.61)
rubocop-rails (2.26.2)
rubocop-rspec_rails (>= 2.31.0)
rubocop-factory_bot (2.27.1)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
rubocop-rails (2.30.3)
activesupport (>= 4.2.0)
lint_roller (~> 1.1)
rack (>= 1.1)
rubocop (>= 1.52.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rspec (3.1.0)
rubocop (~> 1.61)
rubocop-rspec_rails (2.30.0)
rubocop (~> 1.61)
rubocop-rspec (~> 3, >= 3.0.1)
rubocop (>= 1.72.1, < 2.0)
rubocop-ast (>= 1.38.0, < 2.0)
rubocop-rspec (3.5.0)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
rubocop-rspec_rails (2.31.0)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
rubocop-rspec (~> 3.5)
ruby-progressbar (1.13.0)
securerandom (0.3.1)
securerandom (0.4.1)
syntax_tree (6.2.0)
prettier_print (>= 1.2.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.6.0)
unicode-display_width (3.1.4)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
uri (1.0.3)

PLATFORMS
arm64-darwin-23
Expand All @@ -84,4 +98,4 @@ DEPENDENCIES
syntax_tree

BUNDLED WITH
2.5.21
2.6.6
45 changes: 25 additions & 20 deletions common/common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
.background-thumbnail {
display: none;
}

.main-thumbnail {
object-fit: cover;
}
Expand All @@ -32,7 +33,6 @@
object-fit: cover;

$blur_size: 4px;

filter: blur(#{$blur_size});
width: calc(100% + 4 * #{$blur_size});
height: calc(100% + 4 * #{$blur_size});
Expand All @@ -41,7 +41,7 @@
}

// Tint background to blend with $secondary
&:after {
&::after {
z-index: 1;
content: "";
display: block;
Expand Down Expand Up @@ -71,6 +71,7 @@
display: flex;
align-items: center;
justify-content: center;

.d-icon {
width: 60%;
height: 60%;
Expand All @@ -93,7 +94,6 @@
grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
grid-column-gap: 5px;
grid-row-gap: 5px;

border: 0;
}

Expand All @@ -102,15 +102,12 @@
position: relative;
min-width: 0;
height: 250px;

grid-template-areas:
" image image "
" title activity"
" title posters";

grid-template-rows: 1fr auto;
grid-template-columns: 1fr auto;

background-color: var(--primary-low);
border: 1px solid var(--primary-low);

Expand All @@ -122,12 +119,14 @@

.topic-list-thumbnail {
z-index: 0;

// position: absolute;
width: 100%;
height: 100%;
top: 0;
left: 0;
grid-area: image;

.background-thumbnail {
height: calc(150%);
}
Expand All @@ -144,9 +143,7 @@

&.topic-list .posters {
height: auto;
padding-top: 0;
grid-area: posters;

padding: 0 10px 10px 10px;
display: flex;
justify-content: flex-end;
Expand All @@ -160,6 +157,7 @@
&:first-of-type {
display: block;
}

&:not(:first-of-type) {
display: none;
}
Expand All @@ -183,10 +181,8 @@

.num.activity {
grid-area: activity;

display: flex;
justify-content: flex-end;

width: auto;
padding: 10px;

Expand Down Expand Up @@ -225,8 +221,10 @@
grid-template-rows: 1fr 45px;
grid-template-columns: 70% minmax(0, 15%) minmax(0, 15%);
border-bottom: none;

&.visited {
background-color: transparent !important;

.link-top-line {
color: var(--primary-medium);
}
Expand Down Expand Up @@ -263,10 +261,12 @@
align-items: center;
color: var(--primary-low-mid);
overflow: hidden;

.number {
font-size: 13px;
font-weight: bold;
}

.d-icon {
font-size: 13px;
margin-right: 0.5em;
Expand All @@ -276,28 +276,28 @@
.posts-map {
padding: 0;
grid-area: posts;
width: auto;
display: flex;
justify-content: center;
align-items: center;
overflow: hidden;
width: auto !important; // overrides very specific core style

.badge-posts {
padding: 0;
}

span.number {
color: var(--primary-low-mid);
display: flex;
justify-content: flex-end;
align-items: center;
font-size: 13px;
&:before {

&::before {
content: "";
background-color: var(--primary-low-mid);
mask-repeat: no-repeat;
-webkit-mask-repeat: no-repeat;
mask-image: url('data:image/svg+xml; utf8, <svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="comment" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" class="svg-inline--fa fa-comment fa-w-16 fa-2x"><path fill="gray" d="M256 32C114.6 32 0 125.1 0 240c0 49.6 21.4 95 57 130.7C44.5 421.1 2.7 466 2.2 466.5c-2.2 2.3-2.8 5.7-1.5 8.7S4.8 480 8 480c66.3 0 116-31.8 140.6-51.4 32.7 12.3 69 19.4 107.4 19.4 141.4 0 256-93.1 256-208S397.4 32 256 32z" class=""></path></svg>');
-webkit-mask-image: url('data:image/svg+xml; utf8, <svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="comment" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" class="svg-inline--fa fa-comment fa-w-16 fa-2x"><path fill="gray" d="M256 32C114.6 32 0 125.1 0 240c0 49.6 21.4 95 57 130.7C44.5 421.1 2.7 466 2.2 466.5c-2.2 2.3-2.8 5.7-1.5 8.7S4.8 480 8 480c66.3 0 116-31.8 140.6-51.4 32.7 12.3 69 19.4 107.4 19.4 141.4 0 256-93.1 256-208S397.4 32 256 32z" class=""></path></svg>');
display: block;
height: 13px;
width: 13px;
Expand All @@ -314,11 +314,13 @@
justify-content: center;
font-weight: 600;
width: 100%;

.link-top-line {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: var(--primary);

a.title {
color: var(--primary);
padding: 0 !important;
Expand Down Expand Up @@ -356,15 +358,19 @@

.main-link {
grid-area: content;

.docs-topic-link {
display: unset;
}

.link-top-line {
color: var(--tertiary);
}
}

.link-bottom-line {
display: block;

.badge-wrapper {
display: none;
}
Expand Down Expand Up @@ -400,14 +406,17 @@
align-items: center;
color: var(--primary-low-mid);
width: auto;

.number {
font-size: var(--font-down-1);
font-weight: bold;
}

.d-icon {
font-size: var(--font-down-1);
margin-right: 0.5em;
}

a {
color: var(--primary-low-mid);
font-size: var(--font-down-1);
Expand All @@ -424,23 +433,19 @@
--masonry-grid-spacing
--masonry-column-width
*/

position: relative;
height: var(--masonry-tallest-column);

.topic-list-item {
/*
Variables set by javascript:
--masonry-height
--masonry-height-above
--masonry-height
--masonry-height-above
--masonry-column-index
*/

position: absolute;

height: var(--masonry-height);
width: var(--masonry-column-width);

left: calc(
(var(--masonry-column-width) + var(--masonry-grid-spacing)) *
var(--masonry-column-index)
Expand Down
4 changes: 3 additions & 1 deletion javascripts/discourse/connectors/before-topic-list-body/topic-list-masonry-styles.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ export default class TopicListMasonryStyles extends Component {
<template>
{{#if this.topicThumbnails.displayMasonry}}
{{! template-lint-disable no-forbidden-elements }}
<style {{this.attachResizeObserver}}>
<style
{{this.attachResizeObserver}}
>
{{this.masonryStyle}}
</style>
{{/if}}
Expand Down
1 change: 1 addition & 0 deletions javascripts/discourse/initializers/topic-thumbnails-init-legacy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { service } from "@ember/service";
import { withSilencedDeprecations } from "discourse/lib/deprecated";
import { withPluginApi } from "discourse/lib/plugin-api";
import { getResolverOption, setResolverOption } from "discourse/resolver";

export default {
name: "topic-thumbnails-init",
initialize() {
Expand Down
Loading
Loading