Skip to content

Commit

Permalink
style: run prettier on the codebase
Browse files Browse the repository at this point in the history
  • Loading branch information
RomainLanz committed May 21, 2021
1 parent 64431eb commit ce757b2
Show file tree
Hide file tree
Showing 12 changed files with 45 additions and 85 deletions.
23 changes: 4 additions & 19 deletions .adonisrc.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/adonisjs/application/master/adonisrc.schema.json",
"typescript": true,
"commands": [
"./commands",
"@adonisjs/core/build/commands",
"@adonisjs/repl/build/commands"
],
"commands": ["./commands", "@adonisjs/core/build/commands", "@adonisjs/repl/build/commands"],
"exceptionHandlerNamespace": "App/Exceptions/Handler",
"aliases": {
"App": "app",
Expand All @@ -18,20 +14,11 @@
"./start/kernel",
{
"file": "./start/content",
"environment": [
"web",
"console",
"repl",
"test"
],
"environment": ["web", "console", "repl", "test"],
"optional": false
}
],
"providers": [
"./providers/AppProvider",
"@adonisjs/core",
"@adonisjs/view"
],
"providers": ["./providers/AppProvider", "@adonisjs/core", "@adonisjs/view"],
"metaFiles": [
{
"pattern": "public/**",
Expand All @@ -50,7 +37,5 @@
"reloadServer": true
}
],
"aceProviders": [
"@adonisjs/repl"
]
"aceProviders": ["@adonisjs/repl"]
}
3 changes: 1 addition & 2 deletions commands/BuildStatic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { ProcessedDoc } from '@dimerapp/content'
import { BaseCommand } from '@adonisjs/core/build/standalone'

export default class BuildStatic extends BaseCommand {

/**
* Command Name is used to run the command
*/
Expand Down Expand Up @@ -72,7 +71,7 @@ export default class BuildStatic extends BaseCommand {
/**
* Run command
*/
public async run () {
public async run() {
const Content = (await import('App/Services/Content')).default
const docs: any[] = []

Expand Down
2 changes: 1 addition & 1 deletion config/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ export const logger: LoggerConfig = {
| can have huge impact on performance.
|
*/
prettyPrint: false //Env.get('NODE_ENV') === 'development',
prettyPrint: false, //Env.get('NODE_ENV') === 'development',
}

/*
Expand Down
4 changes: 2 additions & 2 deletions config/markdown.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const markdownLanguages = [
path: './resources/vscode/dotenv.tmLanguage.json',
scopeName: 'source.env',
id: 'dotenv',
}
},
]

/*
Expand Down Expand Up @@ -80,5 +80,5 @@ export const zones = [
template: 'docs',
contentPath: './content/releases',
menu: Releases,
}
},
]
6 changes: 2 additions & 4 deletions docsearch.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@
"text": ".markdown p, .markdown li"
}
},
"conversation_id": [
"1156190793"
],
"conversation_id": ["1156190793"],
"nb_hits": 69556
}
}
4 changes: 2 additions & 2 deletions resources/css/header.css
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ HEADER STYLES

.header-nav > ul > li.active > a,
.header-nav > ul > li.expand > a,
.header-nav > ul > li > a:hover {
.header-nav > ul > li > a:hover {
color: #fff;
background: rgba(0, 0, 0, 0.2);
}
Expand All @@ -193,7 +193,7 @@ HEADER STYLES
height: auto;
padding: 0;
margin: 0;
width: 100%;
width: 100%;
}

.search-wrapper {
Expand Down
27 changes: 16 additions & 11 deletions resources/css/markdown.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,21 @@
padding: 2px 6px;
}

.markdown h1 a, .markdown h2 a, .markdown h3 a, .markdown h4 a {
.markdown h1 a,
.markdown h2 a,
.markdown h3 a,
.markdown h4 a {
color: var(--mute-color);
margin-left: -1em;
opacity: 0;
padding-right: 0.2em;
text-decoration: none;
}

.markdown h1 .icon:before, .markdown h2 .icon:before, .markdown h3 .icon:before, .markdown h4 .icon:before {
.markdown h1 .icon:before,
.markdown h2 .icon:before,
.markdown h3 .icon:before,
.markdown h4 .icon:before {
content: '#';
}
.markdown h1:hover a,
Expand Down Expand Up @@ -64,7 +70,6 @@
font-size: 2.6rem;
}


.markdown h3 {
color: var(--heading-color);
font-weight: var(--bold-font-weight);
Expand All @@ -74,7 +79,7 @@
}
/** Required only when using Calibre */
.markdown h3 code {
font-size: 2.0rem;
font-size: 2rem;
}

.markdown h4 {
Expand Down Expand Up @@ -156,14 +161,14 @@
.markdown .ctc-action {
background-color: transparent;
border: 0;
color: var(--pre-header-color);
cursor: pointer;
color: var(--pre-header-color);
cursor: pointer;
font-size: 1.4rem;
position: absolute;
top: 0;
top: 0;
right: 0;
margin: 10px;
opacity: .5;
opacity: 0.5;
transition: opacity 100ms ease-in-out, color 100ms ease-in-out;
}

Expand Down Expand Up @@ -287,7 +292,7 @@
}

.markdown .alert.alert-tip {
border-top: 6px solid #70D787;
border-top: 6px solid #70d787;
}

.table-container {
Expand Down Expand Up @@ -477,11 +482,11 @@ Development only file errors
--------------------------------
*/
.file-errors pre .line.fatal {
color: #EF4444;
color: #ef4444;
}

.file-errors pre .line.warning {
color: #EAB308;
color: #eab308;
}

/*
Expand Down
19 changes: 7 additions & 12 deletions resources/fonts/Calibre/stylesheet.css
Original file line number Diff line number Diff line change
@@ -1,38 +1,33 @@
@font-face {
font-family: 'Calibre';
src: local('Calibre-Bold'),
url('Calibre-Bold.woff2') format('woff2'),
url('Calibre-Bold.woff') format('woff');
src: local('Calibre-Bold'), url('Calibre-Bold.woff2') format('woff2'),
url('Calibre-Bold.woff') format('woff');
font-weight: bold;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'Calibre';
src: local('Calibre-Semibold'),
url('Calibre-Semibold.woff2') format('woff2'),
url('Calibre-Semibold.woff') format('woff');
src: local('Calibre-Semibold'), url('Calibre-Semibold.woff2') format('woff2'),
url('Calibre-Semibold.woff') format('woff');
font-weight: 600;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'Calibre';
src: local('Calibre-Medium'),
url('Calibre-Medium.woff2') format('woff2'),
url('Calibre-Medium.woff') format('woff');
src: local('Calibre-Medium'), url('Calibre-Medium.woff2') format('woff2'),
url('Calibre-Medium.woff') format('woff');
font-weight: 500;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: 'Calibre';
src: local('Calibre'),
url('Calibre.woff2') format('woff2'),
url('Calibre.woff') format('woff');
src: local('Calibre'), url('Calibre.woff2') format('woff2'), url('Calibre.woff') format('woff');
font-weight: normal;
font-style: normal;
font-display: swap;
Expand Down
2 changes: 1 addition & 1 deletion resources/vscode/edge.tmLanguage.json
Original file line number Diff line number Diff line change
Expand Up @@ -3893,4 +3893,4 @@
]
}
}
}
}
4 changes: 1 addition & 3 deletions resources/vscode/shell.tmLanguage.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"scopeName": "source.shell",
"fileTypes": [
"sh"
],
"fileTypes": ["sh"],
"version": "",
"information_for_contributors": [
"This code was auto generated by a much-more-readble ruby file",
Expand Down
2 changes: 1 addition & 1 deletion start/content.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ zones.forEach(({ title, baseUrl, template, menu, contentPath }) => {
const zone = Content.zone(title)
markdownLanguages.forEach((lang) => zone.loadLanguage({ ...lang }))

zone
zone
.baseUrl(baseUrl)
.baseContentPath(contentPath)
.template(template)
Expand Down
34 changes: 7 additions & 27 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,38 +1,18 @@
{
"extends": "./node_modules/adonis-preset-ts/tsconfig",
"include": [
"**/*"
],
"exclude": [
"node_modules",
"build"
],
"include": ["**/*"],
"exclude": ["node_modules", "build"],
"compilerOptions": {
"outDir": "build",
"resolveJsonModule": true,
"rootDir": "./",
"sourceMap": true,
"paths": {
"App/*": [
"./app/*"
],
"Config/*": [
"./config/*"
],
"Contracts/*": [
"./contracts/*"
],
"Database/*": [
"./database/*"
]
"App/*": ["./app/*"],
"Config/*": ["./config/*"],
"Contracts/*": ["./contracts/*"],
"Database/*": ["./database/*"]
},
"types": [
"@adonisjs/core",
"@adonisjs/repl",
"@adonisjs/session",
"@adonisjs/view",
"@adonisjs/shield",
"@adonisjs/lucid"
]
"types": ["@adonisjs/core", "@adonisjs/repl", "@adonisjs/view"]
}
}

0 comments on commit ce757b2

Please sign in to comment.