Skip to content

Commit

Permalink
DEV: Update linting (#7)
Browse files Browse the repository at this point in the history
  • Loading branch information
davidtaylorhq committed Mar 27, 2024
1 parent d44f99a commit 47c3cf5
Show file tree
Hide file tree
Showing 11 changed files with 3,510 additions and 17 deletions.
1 change: 1 addition & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require("@discourse/lint-configs/eslint-theme");
11 changes: 11 additions & 0 deletions .github/workflows/discourse-theme.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: Discourse Theme

on:
push:
branches:
- main
pull_request:

jobs:
ci:
uses: discourse/.github/.github/workflows/discourse-theme.yml@v1
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.DS_Store
node_modules
1 change: 1 addition & 0 deletions .prettierrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require("@discourse/lint-configs/prettier");
1 change: 1 addition & 0 deletions .template-lintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require("@discourse/lint-configs/template-lint");
18 changes: 10 additions & 8 deletions common/common.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'variables';
@import "variables";

// INPUT FIELDS - SELECT - DROPDOWNS
// *------------------------------------------------*
Expand Down Expand Up @@ -96,7 +96,8 @@ textarea:focus {
// MODAL
// *------------------------------------------------*
.modal-inner-container {
box-shadow: 0 8px 60px 0 rgba(103,151,255,.15), 0 12px 90px 0 rgba(103,151,255,.15);
box-shadow: 0 8px 60px 0 rgba(103, 151, 255, 0.15),
0 12px 90px 0 rgba(103, 151, 255, 0.15);
border-radius: $radius-8;
}

Expand Down Expand Up @@ -144,7 +145,8 @@ textarea:focus {

.menu-panel.drop-down {
border-radius: $radius-20;
box-shadow: 0 8px 60px 0 rgba(255, 103, 222, 0.15), 0 12px 90px 0 rgba(255, 103, 217, 0.15);
box-shadow: 0 8px 60px 0 rgba(255, 103, 222, 0.15),
0 12px 90px 0 rgba(255, 103, 217, 0.15);
}

.search-menu input[type="text"] {
Expand All @@ -153,19 +155,19 @@ textarea:focus {

// Buttons
// *------------------------------------------------*
#create-topic{
#create-topic {
border: 2px solid $color-royal;
background-color: $color-royal;
border-radius: 10px;
color: $color-white;
transition: .3s;
transition: 0.3s;
.fa {
color: $color-white;
}
}
#create-topic:hover {
box-shadow: 8px 8px $color-light-violet;
transition: .3s;
transition: 0.3s;
}

.btn {
Expand Down Expand Up @@ -210,7 +212,7 @@ textarea:focus {
.discourse-no-touch & {
&:hover,
&.btn-hover {
background: $danger-hover;
background: $danger-hover;
}
}
}
Expand Down Expand Up @@ -244,7 +246,7 @@ textarea:focus {
// Admin
// *------------------------------------------------*
.admin-controls {
.nav-pills>li a.active {
.nav-pills > li a.active {
background: none;
color: $tertiary;
}
Expand Down
1 change: 0 additions & 1 deletion desktop/desktop.scss
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,3 @@
color: $color-black;
border: none;
}

9 changes: 5 additions & 4 deletions mobile/mobile.scss
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
@import 'variables';
@import "variables";

// Container
// *------------------------------------------------*
#main-outlet {
margin-top: 30px;
margin-bottom: 30px;
background: $color-cream;
box-shadow: 0 8px 60px 0 rgba(103,151,255,.15), 0 12px 90px 0 rgba(103,151,255,.15);
box-shadow: 0 8px 60px 0 rgba(103, 151, 255, 0.15),
0 12px 90px 0 rgba(103, 151, 255, 0.15);
border-radius: $radius-20;
}

// Navigation Bar
// *------------------------------------------------*
.nav-pills li a {
.nav-pills li a {
&.active {
color: $color-black;
}
Expand All @@ -24,4 +25,4 @@

.list-controls .navigation-container {
margin: 0.8em 9px 1px;
}
}
9 changes: 9 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"private": true,
"devDependencies": {
"@discourse/lint-configs": "^1.3.7",
"ember-template-lint": "^5.13.0",
"eslint": "^8.56.0",
"prettier": "^2.8.8"
}
}
16 changes: 12 additions & 4 deletions scss/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,22 @@
// *------------------------------------------------*
$color-white: #ffffff;
$color-black: #000000;
$color-cream: #FAFFFD;
$color-cream: #fafffd;
$color-mud: #f4d35e;
$color-royal: #3c73ff;
$color-green: #2ecc71;
$color-turqoise: #CCE1EA;
$color-turqoise: #cce1ea;
$color-light-violet: #99bdff;
$gradient-pink: linear-gradient(146deg,rgba(255,74,158,0) 55%,rgba(255,74,158,.4) 100%);
$gradient-blue: linear-gradient(200deg,rgba(255,74,158,0) 45%,rgba(40, 13, 194, 0.068) 100%);
$gradient-pink: linear-gradient(
146deg,
rgba(255, 74, 158, 0) 55%,
rgba(255, 74, 158, 0.4) 100%
);
$gradient-blue: linear-gradient(
200deg,
rgba(255, 74, 158, 0) 45%,
rgba(40, 13, 194, 0.068) 100%
);

$radius-2: 2px;
$radius-4: 4px;
Expand Down
Loading

0 comments on commit 47c3cf5

Please sign in to comment.