Compare commits

..

33 Commits

Author SHA1 Message Date
a682d432f7 Fix padding on become and editor button 2024-04-18 07:25:50 -07:00
17068549dc Update housing footer links. 2024-04-14 09:07:03 -07:00
7f49e7100c Hide date controls in user directory 2024-03-23 21:02:59 -07:00
d805722968 Hide metadata on user cards 2024-03-21 09:35:37 -07:00
e87eccf710 Fix box shadow and background color 2024-03-05 11:29:29 -08:00
06fc2eaedf Change highlighted header to 2nd last element 2024-03-03 18:56:04 -08:00
41b1e5558f Add margin to lists on published pages 2024-03-03 09:21:33 -08:00
9199314437 Hide site logo on error page 2024-03-03 08:32:31 -08:00
cdf00a5026 Link to become an editor on published pages 2024-03-02 20:43:29 -08:00
e361a8d018 Add footer links 2024-03-02 18:59:37 -08:00
8309e88885 Make published page look more like OrcasHub 2024-03-02 16:16:50 -08:00
a301036014 NFC: Formatting 2024-03-02 16:13:01 -08:00
f753820fbb Switch to forked version of User Card Directory 2024-02-28 08:02:59 -08:00
d8c4a16ad8 Hide OrcasHub in sidebar on desktop 2024-02-27 13:14:34 -08:00
8fdf327454 Add additional theme components 2024-02-27 13:14:34 -08:00
6054df2aea Hide lock icon globally 2024-02-27 13:14:34 -08:00
85b841a525 Add login CTA 2024-02-27 13:14:14 -08:00
c863a3c9a1 Start cleaning up unnecessary elements on Community Resources category 2024-02-26 21:05:31 -08:00
f18c70d867 Hide category description headings 2024-02-24 15:18:12 -08:00
b2cc4a2ae9 Add user card directory component 2024-02-21 09:02:58 -08:00
50b9a0ca14 Hide badges from user card 2024-02-21 09:01:24 -08:00
1c17f3b507 Resize category logos 2024-02-19 17:39:56 -08:00
f75fbd72e5 Hide side banner on create account screen 2024-02-18 20:49:05 -08:00
c8fd61c67b Add custom header links 2024-02-17 09:29:17 -08:00
0b9ae900e3 Add custom footer and styles 2024-02-17 08:58:22 -08:00
d39e74ca58 Adjust border radius on category list page 2024-02-17 08:08:15 -08:00
e347ce42e4 Hide default logo 2024-02-17 08:08:15 -08:00
47b081d2a9 Add OrcasHub header image 2024-02-17 08:08:15 -08:00
f715c54b8b Adjust border radius to match OrcasHub 2024-02-17 07:47:28 -08:00
910f435080 Remove background-container 2024-02-16 20:35:44 -08:00
ce2e975d10 Start updating colors to OrcasHub colors 2024-02-16 20:35:40 -08:00
a8bb351e2f Rename theme 2024-02-16 20:35:17 -08:00
98be4851e7 Change background to plain secondary color 2024-02-16 17:53:06 -08:00
30 changed files with 2705 additions and 4686 deletions

View File

@ -1,5 +1,2 @@
< 3.5.0.beta1-dev: 83e2797ceb40d9832a40ee8c4bc32c7127e9dcda
< 3.4.0.beta4-dev: a5ff3374335f17b46654c4ae1e5be7b539c2da1a
< 3.4.0.beta1-dev: 93551f55d6e9f8d688f1f9dc0b6a2f14eb08b603
< 3.3.0.beta1-dev: 85dc24d6b58d1b16e6d225ae710633dc20c34d08
3.1.999: 1e5882a1541b932f9512f6a7d667b333c1708f53 3.1.999: 1e5882a1541b932f9512f6a7d667b333c1708f53

8
.eslintrc Normal file
View File

@ -0,0 +1,8 @@
{
"extends": "eslint-config-discourse",
"ignorePatterns": ["javascripts/vendor/*"],
"globals": {
"settings": "readonly",
"themePrefix": "readonly"
}
}

48
.github/workflows/component-linting.yml vendored Normal file
View File

@ -0,0 +1,48 @@
name: Linting
on:
push:
branches:
- main
pull_request:
concurrency:
group: plugin-linting-${{ format('{0}-{1}', github.head_ref || github.run_number, github.job) }}
cancel-in-progress: true
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: 16
cache: yarn
- name: Yarn install
run: yarn install
- name: ESLint
if: ${{ always() }}
run: yarn eslint --ext .js,.js.es6 --no-error-on-unmatched-pattern {test,javascripts}
- name: Prettier
if: ${{ always() }}
shell: bash
run: |
yarn prettier -v
files=$(find javascripts desktop mobile common scss -type f \( -name "*.scss" -or -name "*.js" -or -name "*.es6" \) 2> /dev/null) || true
if [ -n "$files" ]; then
yarn prettier --list-different $files
fi
if [ 0 -lt $(find test -type f \( -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
yarn prettier --list-different "test/**/*.{js,es6}"
fi
- name: Ember template lint
if: ${{ always() }}
run: yarn ember-template-lint --no-error-on-unmatched-pattern javascripts

147
.github/workflows/component-tests.yml vendored Normal file
View File

@ -0,0 +1,147 @@
name: Tests
on:
push:
branches:
- main
pull_request:
concurrency:
group: plugin-tests-${{ format('{0}-{1}', github.head_ref || github.run_number, github.job) }}
cancel-in-progress: true
jobs:
check:
runs-on: ubuntu-latest
outputs:
tests_exist: ${{ steps.check_tests.outputs.tests_exist }}
steps:
- name: Install component
uses: actions/checkout@v3
with:
path: tmp/component
fetch-depth: 1
- name: Check QUnit existence
id: check_tests
shell: bash
run: |
if [ 0 -lt $(find tmp/component/test -type f \( -name "*.js" -or -name "*.es6" \) 2> /dev/null | wc -l) ]; then
echo "::set-output name=tests_exist::true"
fi
test:
needs: check
if: ${{ needs.check.outputs.tests_exist }}
runs-on: ubuntu-latest
container: discourse/discourse_test:slim-browsers
timeout-minutes: 15
env:
DISCOURSE_HOSTNAME: www.example.com
RUBY_GLOBAL_METHOD_CACHE_SIZE: 131072
RAILS_ENV: development
PGUSER: discourse
PGPASSWORD: discourse
steps:
- uses: actions/checkout@v3
with:
repository: discourse/discourse
fetch-depth: 1
- name: Install component
uses: actions/checkout@v3
with:
path: tmp/component
fetch-depth: 1
- name: Setup Git
run: |
git config --global user.email "ci@ci.invalid"
git config --global user.name "Discourse CI"
- name: Start redis
run: |
redis-server /etc/redis/redis.conf &
- name: Start Postgres
run: |
chown -R postgres /var/run/postgresql
sudo -E -u postgres script/start_test_db.rb
sudo -u postgres psql -c "CREATE ROLE $PGUSER LOGIN SUPERUSER PASSWORD '$PGPASSWORD';"
- name: Bundler cache
uses: actions/cache@v3
with:
path: vendor/bundle
key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
restore-keys: |
${{ runner.os }}-gem-
- name: Setup gems
run: |
gem install bundler --conservative -v $(awk '/BUNDLED WITH/ { getline; gsub(/ /,""); print $0 }' Gemfile.lock)
bundle config --local path vendor/bundle
bundle config --local deployment true
bundle config --local without development
bundle install --jobs 4
bundle clean
- name: Lint English locale
run: bundle exec ruby script/i18n_lint.rb "tmp/component/locales/en.yml"
- name: Get yarn cache directory
id: yarn-cache-dir
run: echo "::set-output name=dir::$(yarn cache dir)"
- name: Yarn cache
uses: actions/cache@v3
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: Yarn install
run: yarn install
- name: Fetch app state cache
uses: actions/cache@v3
id: app-cache
with:
path: tmp/app-cache
key: >-
${{ hashFiles('.github/workflows/tests.yml') }}-
${{ hashFiles('db/**/*', 'plugins/**/db/**/*') }}-
- name: Restore database from cache
if: steps.app-cache.outputs.cache-hit == 'true'
run: psql -f tmp/app-cache/cache.sql postgres
- name: Restore uploads from cache
if: steps.app-cache.outputs.cache-hit == 'true'
run: rm -rf public/uploads && cp -r tmp/app-cache/uploads public/uploads
- name: Create and migrate database
if: steps.app-cache.outputs.cache-hit != 'true'
run: |
bin/rake db:create
bin/rake db:migrate
- name: Dump database for cache
if: steps.app-cache.outputs.cache-hit != 'true'
run: mkdir -p tmp/app-cache && pg_dumpall > tmp/app-cache/cache.sql
- name: Dump uploads for cache
if: steps.app-cache.outputs.cache-hit != 'true'
run: rm -rf tmp/app-cache/uploads && cp -r public/uploads tmp/app-cache/uploads
- name: Component QUnit
run: |
THEME_NAME=$(ruby -e 'require "json"; puts JSON.parse(File.read("tmp/component/about.json"))["name"]')
bundle exec rake themes:install -- "--{\"$THEME_NAME\": \"tmp/component\"}"
UNICORN_TIMEOUT=120 bundle exec rake "themes:qunit[name,$THEME_NAME]"
timeout-minutes: 10

View File

@ -1,11 +0,0 @@
name: Discourse Theme
on:
push:
branches:
- main
pull_request:
jobs:
ci:
uses: discourse/.github/.github/workflows/discourse-theme.yml@v1

2
.npmrc
View File

@ -1,2 +0,0 @@
engine-strict = true
auto-install-peers = false

1
.prettierrc Normal file
View File

@ -0,0 +1 @@
{}

View File

@ -1 +0,0 @@
module.exports = require("@discourse/lint-configs/prettier");

View File

@ -1,2 +0,0 @@
inherit_gem:
rubocop-discourse: stree-compat.yml

View File

@ -1,2 +0,0 @@
--print-width=100
--plugins=plugin/trailing_comma,plugin/disable_auto_ternary

View File

@ -1 +0,0 @@
module.exports = require("@discourse/lint-configs/template-lint");

4
.template-lintrc.js Normal file
View File

@ -0,0 +1,4 @@
module.exports = {
plugins: ["ember-template-lint-plugin-discourse"],
extends: "discourse:recommended",
};

View File

@ -1,8 +0,0 @@
# frozen_string_literal: true
source "https://rubygems.org"
group :development do
gem "rubocop-discourse"
gem "syntax_tree"
end

View File

@ -1,101 +0,0 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (8.0.2)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
ast (2.4.2)
base64 (0.2.0)
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.7)
concurrent-ruby (~> 1.0)
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.7.1)
ast (~> 2.4.1)
racc
prettier_print (1.2.1)
racc (1.8.1)
rack (3.1.12)
rainbow (3.1.1)
regexp_parser (2.10.0)
rubocop (1.74.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.38.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.39.0)
parser (>= 3.3.1.0)
rubocop-capybara (2.22.1)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
rubocop-discourse (3.12.1)
activesupport (>= 6.1)
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.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.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.4.1)
syntax_tree (6.2.0)
prettier_print (>= 1.2.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.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
ruby
DEPENDENCIES
rubocop-discourse
syntax_tree
BUNDLED WITH
2.6.6

View File

@ -1,7 +1,7 @@
{ {
"name": "OrcasHub Theme", "name": "OrcasHub Theme",
"about_url": "https://meta.discourse.org/t/discourse-air-theme/197703", "about_url": null,
"license_url": "https://github.com/discourse/discourse-air/blob/main/LICENSE", "license_url": null,
"components": [ "components": [
"https://github.com/jordanvidrine/discourse-category-group-boxes.git", "https://github.com/jordanvidrine/discourse-category-group-boxes.git",
"https://github.com/discourse/discourse-clickable-topic.git", "https://github.com/discourse/discourse-clickable-topic.git",
@ -27,10 +27,7 @@
"highlight": "e6cb37", "highlight": "e6cb37",
"danger": "d05454", "danger": "d05454",
"success": "71bd9f", "success": "71bd9f",
"love": "c16ad7", "love": "c16ad7"
"selected": "2f0177", }
"hover": "535353"
} }
},
"screenshots": ["screenshots/light.png", "screenshots/dark.png"]
} }

View File

@ -5,6 +5,7 @@
html.anon { html.anon {
body:not(.category-resources) { body:not(.category-resources) {
// Display this message on all pages except in Community Resources // Display this message on all pages except in Community Resources
#login-message { #login-message {
text-align: center; text-align: center;
@ -51,20 +52,13 @@ html.anon {
color: var(--secondary); color: var(--secondary);
h1 { h1 {
line-height: var(--line-height-small);
@include breakpoint("large", min-width) {
font-size: 4em; font-size: 4em;
} }
}
p { p {
margin-top: 0.5em; font-size: 1.25em !important;
margin-bottom: 2em; font-weight: bold;
margin-bottom: 1em;
@include breakpoint("large", min-width) {
font-size: var(--font-up-1);
}
} }
.btn { .btn {
@ -168,9 +162,9 @@ html.anon {
border-top-left-radius: 0.125em; border-top-left-radius: 0.125em;
border-bottom-left-radius: 0.125em; border-bottom-left-radius: 0.125em;
+ .badge-category-bg { +.badge-category-bg {
border-top-left-radius: 0; border-top-left-radius: 0px;
border-bottom-left-radius: 0; border-bottom-left-radius: 0px;
border-top-right-radius: 0.125em; border-top-right-radius: 0.125em;
border-bottom-right-radius: 0.125em; border-bottom-right-radius: 0.125em;
} }
@ -201,9 +195,9 @@ html.anon {
margin-left: unset; margin-left: unset;
} }
.topic-list .link-bottom-line .discourse-tag.simple::after, .topic-list .link-bottom-line .discourse-tag.simple:after,
.topic-list .link-bottom-line .discourse-tag.box { .topic-list .link-bottom-line .discourse-tag.box {
margin-right: 0; margin-right: 0px;
} }
.custom-category-boxes { .custom-category-boxes {
@ -235,10 +229,6 @@ html.anon {
} }
} }
.not-found-container {
background-color: var(--secondary);
}
input[type="text"], input[type="text"],
input[type="password"], input[type="password"],
input[type="datetime"], input[type="datetime"],
@ -306,7 +296,7 @@ div.ac-wrap {
background-color: rgba(var(--tertiary-rgb), 0.5); background-color: rgba(var(--tertiary-rgb), 0.5);
} }
.btn:not(.themes-tab, .components-tab), .btn:not(.themes-tab):not(.components-tab),
.select-kit.dropdown-select-box .dropdown-select-box-header { .select-kit.dropdown-select-box .dropdown-select-box-header {
border-radius: .375rem; border-radius: .375rem;
border: 1px solid transparent; border: 1px solid transparent;
@ -314,7 +304,7 @@ div.ac-wrap {
.post-admin-menu.popup-menu { .post-admin-menu.popup-menu {
.btn.widget-button { .btn.widget-button {
border-radius: 0; border-radius: 0px;
} }
} }
@ -330,6 +320,14 @@ div.ac-wrap {
border-left-color: var(--tertiary); border-left-color: var(--tertiary);
} }
// graceful ish style
@mixin box-shadow($value: 0px) {
box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px,
rgba(0, 0, 0, 0) 0px 0px 0px 0px,
rgba(0, 0, 0, 0.1) 0px 1px 3px 0px,
rgba(0, 0, 0, 0.1) 0px 1px 2px -1px;
}
html { html {
body { body {
background-color: var(--secondary); background-color: var(--secondary);
@ -343,18 +341,19 @@ html body #main-outlet {
border-radius: .5rem; border-radius: .5rem;
padding: 3em 3em 5%; padding: 3em 3em 5%;
max-width: 1150px; max-width: 1150px;
padding-bottom: 5% !important; // overriding inline style
box-shadow: .archetype-regular & {
0 24px 40px rgba(0, 0, 0, 0.07), min-height: 500px;
0 10.8529px 24.1177px rgba(0, 0, 0, 0.0456112), }
0 4.50776px 10.0172px rgba(0, 0, 0, 0.035),
0 1.63037px 3.62304px rgba(0, 0, 0, 0.0243888);
@media screen and (max-width: 700px) { @media screen and (max-width: 700px) {
padding: 1.5em; padding: 1.5em;
margin-top: 0; margin-top: 0;
} }
padding-bottom: 5% !important; //overriding inline style
@include box-shadow;
@media screen and (max-width: 1120px) { @media screen and (max-width: 1120px) {
width: 80%; width: 80%;
} }
@ -362,34 +361,13 @@ html body #main-outlet {
@media screen and (max-width: 1075px) { @media screen and (max-width: 1075px) {
width: 85%; width: 85%;
} }
.archetype-regular & {
min-height: 500px;
}
} }
.nav-pills:not(.user-nav) > li a.active, .nav-pills:not(.user-nav)>li a.active,
.nav-pills:not(.user-nav) > li > a { .nav-pills:not(.user-nav)>li>a {
border-radius: 0.5em; border-radius: 0.5em;
} }
.category-calendar {
&.before-topic-list-body-outlet {
display: block;
}
background: var(--secondary);
padding: 1em;
border-radius: 8px;
margin-bottom: 1em;
}
.discourse-post-event-upcoming-events {
background: var(--secondary);
border-radius: 8px;
padding: 1em;
margin-bottom: 1em;
}
// User directory (people) // User directory (people)
.users-directory { .users-directory {
@ -408,6 +386,7 @@ html body #main-outlet {
.badge-section, .badge-section,
.metadata-row { .metadata-row {
display: none; display: none;
}
} }
// Category List // Category List
@ -447,6 +426,7 @@ html body #main-outlet {
display: flex; display: flex;
border-bottom: none; border-bottom: none;
} }
display: contents; display: contents;
.topic-list-data.default { .topic-list-data.default {
@ -480,6 +460,7 @@ html body #main-outlet {
} }
.topic-list-item { .topic-list-item {
width: 100%;
display: flex; display: flex;
margin-bottom: 0.5em; margin-bottom: 0.5em;
background-color: var(--secondary); background-color: var(--secondary);
@ -487,7 +468,7 @@ html body #main-outlet {
border-radius: .5rem; border-radius: .5rem;
position: relative; position: relative;
transition: box-shadow 100ms ease-in-out; transition: box-shadow 100ms ease-in-out;
box-shadow: 0 0 8px rgba(0, 0, 0, 0.05); box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.05);
overflow: hidden; overflow: hidden;
&.visited { &.visited {
@ -508,7 +489,7 @@ html body #main-outlet {
&:hover { &:hover {
background-color: var(--secondary); background-color: var(--secondary);
box-shadow: 0 0 12px rgba(0, 0, 0, 0.1); box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.1);
border: 1px solid rgba(var(--primary-rgb), 0.3); border: 1px solid rgba(var(--primary-rgb), 0.3);
a.title:not(.badge-notification), a.title:not(.badge-notification),
@ -550,21 +531,33 @@ html body #main-outlet {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
}
}
}
&.selected { .topic-list-data.num.views {
td:nth-of-type(1) { display: none;
box-shadow: none; }
}
&:focus-visible td:nth-of-type(2) { .full-width .contents .topic-list .topic-list-item .posters a.latest {
box-shadow: inset 3px 0 0 var(--tertiary); margin-right: 4px;
border-radius: calc(1em - 3px); width: 100%;
} height: 100%;
} display: flex;
} justify-content: center;
align-content: center;
align-items: center;
.avatar {
margin-right: 0;
}
}
.full-width .contents .topic-list {
.topic-list-item {
.main-link { .main-link {
min-height: 100%; min-height: 100%;
min-height: 100%;
.link-top-line { .link-top-line {
display: block; display: block;
@ -599,14 +592,6 @@ html body #main-outlet {
} }
a.latest { a.latest {
margin-right: 4px;
width: 100%;
height: 100%;
display: flex;
justify-content: center;
align-content: center;
align-items: center;
.avatar { .avatar {
margin-right: 0; margin-right: 0;
} }
@ -649,8 +634,8 @@ html body #main-outlet {
} }
} }
.topic-list-data.num.views { .navigation-container {
display: none; margin-top: 2em;
} }
.d-icon-lock { .d-icon-lock {
@ -686,7 +671,8 @@ html body #main-outlet {
.topic-map, .topic-map,
.topic-avatar, .topic-avatar,
.more-topics__container, .more-topics__container,
.names.trigger-user-card { // Hide the lock icon in the topic header of the post .names.trigger-user-card {
// Hide the lock icon in the topic header of the post
display: none !important; display: none !important;
} }
@ -757,28 +743,30 @@ html body #main-outlet {
} }
} }
.published-page { .published-page-author {
&::before { display: none !important;
background: linear-gradient(
90deg,
var(--tertiary-hover) 0%,
var(--tertiary) 100%
);
clip-path: ellipse(148% 70% at 91% -14%);
content: "";
width: 100%;
height: 100%;
display: block;
position: fixed;
z-index: 0;
}
} }
.quote-button { .quote-button {
background-color: var(--primary-low-mid);
border-radius: 0.5em; border-radius: 0.5em;
} }
.topic-list .main-link.focused + .posters { .topic-list tr.selected td:nth-child(2),
.topic-list-item.selected td:nth-child(2),
.latest-topic-list-item.selected,
.search-results .fps-result.selected {
box-shadow: inset 3px 0 0 var(--danger);
}
.topic-list tr.selected td:first-child,
.topic-list-item.selected td:first-child,
.latest-topic-list-item.selected,
.search-results .fps-result.selected {
box-shadow: none;
}
.topic-list .main-link.focused+.posters {
box-shadow: inset 3px 0 0 var(--tertiary); box-shadow: inset 3px 0 0 var(--tertiary);
} }
@ -786,10 +774,6 @@ html body #main-outlet {
box-shadow: none; box-shadow: none;
} }
.title-voting {
padding-left: 14px;
}
// Footer // Footer
.orcashub-footer { .orcashub-footer {
background-color: rgb(31 41 55); background-color: rgb(31 41 55);
@ -864,4 +848,5 @@ html body #main-outlet {
color: rgb(209 213 219) !important; color: rgb(209 213 219) !important;
} }
} }
} }

View File

@ -1,3 +0,0 @@
import DiscourseRecommendedTheme from "@discourse/lint-configs/eslint-theme";
export default [...DiscourseRecommendedTheme];

View File

@ -1,5 +1,5 @@
import { cancel } from "@ember/runloop";
import { withPluginApi } from "discourse/lib/plugin-api"; import { withPluginApi } from "discourse/lib/plugin-api";
import { cancel } from "@ember/runloop";
export default { export default {
name: "customize-edit-category-general", name: "customize-edit-category-general",

View File

@ -1,13 +1,8 @@
import { apiInitializer } from "discourse/lib/api"; import { apiInitializer } from "discourse/lib/api";
import { withSilencedDeprecations } from "discourse/lib/deprecated";
export default apiInitializer("0.8", (api) => { export default apiInitializer("0.8", (api) => {
api.registerValueTransformer("topic-list-item-expand-pinned", () => true);
withSilencedDeprecations("discourse.hbr-topic-list-overrides", () => {
api.modifyClass("component:topic-list-item", { api.modifyClass("component:topic-list-item", {
pluginId: "orcashub-discourse-theme", pluginId: "orcashub-discourse-theme",
expandPinned: true, expandPinned: true,
}); });
});
}); });

View File

@ -1,3 +1,3 @@
en: en:
theme_metadata: theme_metadata:
description: "A clean and modern theme for Discourse" description: "Discourse Air Theme"

View File

@ -10,7 +10,6 @@
h1 { h1 {
font-size: 2.5em !important; font-size: 2.5em !important;
} }
p { p {
font-weight: normal; font-weight: normal;
font-size: $font-up-1; font-size: $font-up-1;
@ -18,45 +17,15 @@
} }
html html
body:not( body:not(.static-tos):not(.static-faq):not(.static-privacy):not(.about-page):not(.static-faq):not(.badges-page):not(.tags-page):not(.archetype-banner):not(.archetype-regular):not(.archetype-private_message):not(.admin-interface):not(.edit-category):not(.user-summary-page):not(.user-activity-page):not(.user-invites-page):not(.user-preferences-page)
.static-tos,
.static-faq,
.static-privacy,
.about-page,
.static-faq,
.badges-page,
.tags-page,
.archetype-banner,
.archetype-regular,
.archetype-private_message,
.admin-interface,
.edit-category,
.user-summary-page,
.user-activity-page,
.user-invites-page,
.user-preferences-page,
.user-messages-page,
.user-notifications-page,
.user-badges-page
)
#main-outlet { #main-outlet {
width: calc(100% - 1em); width: calc(100% - 1em);
padding: 0 0.5em 1em 0.5em; padding: 0em 0.5em 1em 0.5em;
box-shadow: none; box-shadow: none;
background-color: transparent; background-color: transparent;
} }
#main-outlet {
margin-inline: auto;
}
html body #main-outlet .docs {
padding: 1em;
background-color: var(--secondary);
}
html body.static-tos #main-outlet, html body.static-tos #main-outlet,
html body.no-ember #main-outlet,
html body.static-privacy #main-outlet, html body.static-privacy #main-outlet,
html body.about-page #main-outlet, html body.about-page #main-outlet,
html body.static-faq #main-outlet, html body.static-faq #main-outlet,
@ -70,14 +39,11 @@ html body.user-summary-page #main-outlet,
html body.user-activity-page #main-outlet, html body.user-activity-page #main-outlet,
html body.user-invites-page #main-outlet, html body.user-invites-page #main-outlet,
html body.user-preferences-page #main-outlet, html body.user-preferences-page #main-outlet,
html body.user-messages-page #main-outlet,
html body.user-notifications-page #main-outlet,
html body.user-badges-page #main-outlet,
html body.staff:not(.navigation-topics) #main-outlet { html body.staff:not(.navigation-topics) #main-outlet {
border-radius: 0; border-radius: 0px;
width: calc(100% - 3em); width: calc(100% - 3em);
background-color: var(--secondary); background-color: var(--secondary);
margin-bottom: 0; margin-bottom: 0px;
} }
.container.posts > .row { .container.posts > .row {
@ -86,7 +52,7 @@ html body.staff:not(.navigation-topics) #main-outlet {
.navigation-categories .navigation-container, .navigation-categories .navigation-container,
.categories-list .navigation-container { .categories-list .navigation-container {
border-bottom: 0 !important; border-bottom: 0px !important;
} }
body.category .category-breadcrumb .select-kit-header, body.category .category-breadcrumb .select-kit-header,
@ -115,18 +81,16 @@ ol.category-breadcrumb {
border-radius: 8px; border-radius: 8px;
border: none; border: none;
background-color: var(--secondary); background-color: var(--secondary);
a:hover, a:hover,
a:focus { a:focus {
color: var(--primary); color: var(--primary);
background-color: var(--secondary); background-color: var(--secondary);
} }
} }
.drop { .drop {
top: calc(100% + 0.5em); top: calc(100% + 0.5em);
border-radius: 8px; border-radius: 8px;
box-shadow: 0 0 12px rgba(0, 0, 0, 0.25); box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.25);
} }
} }
@ -169,7 +133,7 @@ ol.category-breadcrumb {
background: var(--secondary); background: var(--secondary);
padding: 1em; padding: 1em;
border-radius: 8px; border-radius: 8px;
box-shadow: 0 0 8px rgba(0, 0, 0, 0.05); box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.05);
border: 1px solid rgba(var(--primary-rgb), 0.1); border: 1px solid rgba(var(--primary-rgb), 0.1);
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }
@ -189,7 +153,7 @@ ol.category-breadcrumb {
.full-width .contents .topic-list .topic-list-header tr { .full-width .contents .topic-list .topic-list-header tr {
background-color: var(--secondary); background-color: var(--secondary);
border-radius: 8px; border-radius: 8px;
box-shadow: 0 0 8px rgba(0, 0, 0, 0.05); box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.05);
border: 1px solid rgba(var(--primary-rgb), 0.1); border: 1px solid rgba(var(--primary-rgb), 0.1);
margin-bottom: 1em; margin-bottom: 1em;
} }
@ -198,21 +162,14 @@ ol.category-breadcrumb {
flex-wrap: wrap; flex-wrap: wrap;
} }
.topic-list-item { .topic-list-item .discourse-tags {
> .topic-list-data {
width: 100%;
}
.discourse-tags {
order: 3; order: 3;
width: 100%; width: 100%;
margin-top: 0.5em; margin-top: 0.5em;
}
} }
.full-width .contents .topic-list .topic-list-item .posts-map { .full-width .contents .topic-list .topic-list-item .posts-map {
padding: 0; padding: 0;
.number { .number {
margin: 0; margin: 0;
} }
@ -233,29 +190,23 @@ ol.category-breadcrumb {
} }
// default category list styles when the modern category boxes theme component isn't used // default category list styles when the modern category boxes theme component isn't used
.category-list-item.category { .category-list-item.category {
background: var(--secondary); background: var(--secondary);
border-radius: 1em; border-radius: 1em;
tbody { tbody {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 100%; width: 100%;
} }
td { td {
width: 100%; width: 100%;
} }
.num.posts { .num.posts {
padding-right: 0.25em; padding-right: 0.25em;
} }
} }
.list-controls .nav-pills .list-control-toggle-link-trigger {
color: var(--secondary);
}
// Footer // Footer
.custom-footer { .custom-footer {
.list { .list {

View File

@ -1,17 +1,10 @@
{ {
"private": true, "name": "orcashub-discourse-theme",
"version": "1.0.0",
"repository": "https://git.grosinger.net/tgrosinger/orcashub-discourse-theme",
"author": "Jordan Vidrine",
"license": "GPL-2.0-or-later",
"devDependencies": { "devDependencies": {
"@discourse/lint-configs": "2.11.1", "eslint-config-discourse": "^3.2.0"
"ember-template-lint": "7.0.1", }
"eslint": "9.22.0",
"prettier": "3.5.3",
"stylelint": "16.16.0"
},
"engines": {
"node": ">= 22",
"npm": "please-use-pnpm",
"yarn": "please-use-pnpm",
"pnpm": "9.x"
},
"packageManager": "pnpm@9.15.5"
} }

4022
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 507 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 598 KiB

View File

@ -2,7 +2,6 @@ html body.has-sidebar-page.has-full-page-chat {
#main-outlet-wrapper { #main-outlet-wrapper {
gap: 2em; gap: 2em;
} }
#main-outlet { #main-outlet {
padding-bottom: 0 !important; padding-bottom: 0 !important;
} }
@ -13,7 +12,7 @@ html body.has-sidebar-page.has-full-page-chat {
} }
.chat-channel { .chat-channel {
height: calc(100vh - (var(--header-offset) + 7.85em)); height: calc(100vh - (var(--header-offset) + 10em));
} }
.c-navbar-container { .c-navbar-container {
@ -30,8 +29,7 @@ html body.has-sidebar-page.has-full-page-chat {
.has-full-page-chat #main-outlet.wrap { .has-full-page-chat #main-outlet.wrap {
margin-bottom: 30px; margin-bottom: 30px;
padding-bottom: 0 !important; padding-bottom: 0px !important;
.full-page-chat { .full-page-chat {
grid-template-rows: calc(var(--full-page-chat-height) - 50px); grid-template-rows: calc(var(--full-page-chat-height) - 50px);
} }
@ -48,7 +46,6 @@ html body.has-sidebar-page.has-full-page-chat {
border-radius: 0; border-radius: 0;
margin: 0; margin: 0;
padding: 0; padding: 0;
.full-page-chat { .full-page-chat {
grid-template-rows: var(--full-page-chat-height); grid-template-rows: var(--full-page-chat-height);
} }

View File

@ -1,5 +1,27 @@
.showcased-categories-sidebar .two-topic-list-sidebar {
.topic-excerpt {
display: none;
}
.btn-link.posts-map.badge-posts {
display: block;
}
.two-topic-list-sidebar .topic-list .topic-list-item {
height: unset;
}
}
.showcased-categories-sidebar { .showcased-categories-sidebar {
.full-width .contents .topic-list {
display: unset;
}
.two-topic-list-sidebar { .two-topic-list-sidebar {
.topic-excerpt {
display: none;
}
.btn-link.posts-map.badge-posts { .btn-link.posts-map.badge-posts {
display: block; display: block;
} }
@ -7,13 +29,5 @@
.topic-list .topic-list-item { .topic-list .topic-list-item {
height: unset; height: unset;
} }
.topic-excerpt {
display: none;
}
}
.full-width .contents .topic-list {
display: unset;
} }
} }

View File

@ -1,4 +1,12 @@
// sidebar // sidebar
@mixin box-shadow($value: 0px) {
box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px,
rgba(0, 0, 0, 0) 0px 0px 0px 0px,
rgba(0, 0, 0, 0.1) 0px 1px 3px 0px,
rgba(0, 0, 0, 0.1) 0px 1px 2px -1px;
}
#main-outlet-wrapper { #main-outlet-wrapper {
.sidebar-wrapper { .sidebar-wrapper {
margin: 30px 0 50px; margin: 30px 0 50px;
@ -6,13 +14,8 @@
border-radius: .5rem; border-radius: .5rem;
top: calc(var(--header-offset) + 30px); top: calc(var(--header-offset) + 30px);
height: calc(100vh - (var(--header-offset) + 80px)); height: calc(100vh - (var(--header-offset) + 80px));
box-shadow: @include box-shadow;
0 24px 40px rgba(0, 0, 0, 0.07),
0 10.8529px 24.1177px rgba(0, 0, 0, 0.0456112),
0 4.50776px 10.0172px rgba(0, 0, 0, 0.035),
0 1.63037px 3.62304px rgba(0, 0, 0, 0.0243888);
} }
.sidebar-footer-wrapper { .sidebar-footer-wrapper {
background: var(--secondary); background: var(--secondary);
} }
@ -22,7 +25,6 @@ body.has-sidebar-page {
#main-outlet-wrapper { #main-outlet-wrapper {
padding-left: 8px; padding-left: 8px;
} }
#main-outlet { #main-outlet {
max-width: unset; max-width: unset;
} }

View File

@ -1,3 +0,0 @@
export default {
extends: ["@discourse/lint-configs/stylelint"],
};

2036
yarn.lock Normal file

File diff suppressed because it is too large Load Diff