Skip to content
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

Jump to bottom

Revise Prettier config #592

Merged
merged 2 commits into from
Nov 13, 2023
Merged

Revise Prettier config #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
674e5e3
Revise Prettier config
tynanbe Nov 11, 2023
b690ba1
npm run format
tynanbe Nov 11, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- master
- dev
- "v*.*"
- 'v*.*'
pull_request:

jobs:
Expand All @@ -16,7 +16,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "20"
node-version: '20'
check-latest: true
cache: npm
cache-dependency-path: package-lock.json
Expand Down
16 changes: 16 additions & 0 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
**/*.min.*
**/*.ori.*
**/*.tpl.php
assets/js/css_async.js
assets/js/webfontloader.js
lib
tpl/banner
tpl/esi_widget_edit.php
tpl/inc/api_key.php
tpl/inc/check_cache_disabled.php
tpl/inc/check_if_network_disable_all.php
tpl/inc/modal.header.php
!tpl/cache/network_settings-browser.tpl.php
!tpl/cache/network_settings-object.tpl.php
!tpl/cache/settings-browser.tpl.php
!tpl/cache/settings-object.tpl.php
14 changes: 11 additions & 3 deletions .prettierrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
{
"plugins": [
"@prettier/plugin-php"
"overrides": [
{
"files": ".prettierrc",
"options": { "parser": "json" }
},
{
"files": "**/*.{yml,yaml}",
"options": { "tabWidth": 2 }
}
],
"plugins": ["@prettier/plugin-php"],
"arrowParens": "avoid",
"braceStyle": "per-cs",
"endOfLine": "auto",
Expand All @@ -11,6 +19,6 @@
"singleQuote": true,
"tabWidth": 4,
"trailingComma": "all",
"trailingCommaPHP": false,
"trailingCommaPHP": true,
"useTabs": true
}
14 changes: 6 additions & 8 deletions assets/css/litespeed-legacy.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
.litespeed-wrap h2.nav-tab-wrapper, .litespeed-wrap h3.nav-tab-wrapper{
margin-bottom:0;
.litespeed-wrap h2.nav-tab-wrapper,
.litespeed-wrap h3.nav-tab-wrapper {
margin-bottom: 0;
}

.litespeed-wrap h2 .nav-tab{
font-size:14px;
.litespeed-wrap h2 .nav-tab {
font-size: 14px;
}


.litespeed-wrap .striped > tbody > :nth-child(odd),
.litespeed-wrap ul.striped > :nth-child(odd),
.litespeed-wrap .alternate {
background-color: #f9f9f9;
}



.litespeed-wrap .notice,
.litespeed-wrap div.updated,
.litespeed-wrap div.error {
Expand Down Expand Up @@ -55,4 +53,4 @@

.litespeed-wrap .notice-info.notice-alt {
background-color: #e5f5fa;
}
}
Loading