-
Notifications
You must be signed in to change notification settings - Fork 2k
chore: update editorconfig and fix indent in views #6039
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.
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
kenjis
merged 2 commits into
codeigniter4:develop
from
kenjis:fix-editorconfig-and-indent-in-views
May 29, 2022
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,15 @@ | ||
| ; top-most EditorConfig file | ||
| ; This file is for unifying the coding style for different editors and IDEs. | ||
| ; More information at http://editorconfig.org | ||
|
|
||
| root = true | ||
|
|
||
| ; Unix-style newlines | ||
| [*] | ||
| end_of_line = lf | ||
|
|
||
| [*.php] | ||
| indent_style = space | ||
| indent_size = 4 | ||
| charset = utf-8 | ||
| trim_trailing_whitespace = true | ||
| indent_size = 4 | ||
| indent_style = space | ||
| end_of_line = lf | ||
| insert_final_newline = true | ||
| trim_trailing_whitespace = true | ||
|
|
||
| [*.yml] | ||
| indent_size = 2 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,197 +1,197 @@ | ||
| :root { | ||
| --main-bg-color: #fff; | ||
| --main-text-color: #555; | ||
| --dark-text-color: #222; | ||
| --light-text-color: #c7c7c7; | ||
| --brand-primary-color: #E06E3F; | ||
| --light-bg-color: #ededee; | ||
| --dark-bg-color: #404040; | ||
| --main-bg-color: #fff; | ||
| --main-text-color: #555; | ||
| --dark-text-color: #222; | ||
| --light-text-color: #c7c7c7; | ||
| --brand-primary-color: #E06E3F; | ||
| --light-bg-color: #ededee; | ||
| --dark-bg-color: #404040; | ||
| } | ||
|
|
||
| body { | ||
| height: 100%; | ||
| background: var(--main-bg-color); | ||
| font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; | ||
| color: var(--main-text-color); | ||
| font-weight: 300; | ||
| margin: 0; | ||
| padding: 0; | ||
| height: 100%; | ||
| background: var(--main-bg-color); | ||
| font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; | ||
| color: var(--main-text-color); | ||
| font-weight: 300; | ||
| margin: 0; | ||
| padding: 0; | ||
| } | ||
| h1 { | ||
| font-weight: lighter; | ||
| letter-spacing: 0.8; | ||
| font-size: 3rem; | ||
| color: var(--dark-text-color); | ||
| margin: 0; | ||
| font-weight: lighter; | ||
| letter-spacing: 0.8; | ||
| font-size: 3rem; | ||
| color: var(--dark-text-color); | ||
| margin: 0; | ||
| } | ||
| h1.headline { | ||
| margin-top: 20%; | ||
| font-size: 5rem; | ||
| margin-top: 20%; | ||
| font-size: 5rem; | ||
| } | ||
| .text-center { | ||
| text-align: center; | ||
| text-align: center; | ||
| } | ||
| p.lead { | ||
| font-size: 1.6rem; | ||
| font-size: 1.6rem; | ||
| } | ||
| .container { | ||
| max-width: 75rem; | ||
| margin: 0 auto; | ||
| padding: 1rem; | ||
| max-width: 75rem; | ||
| margin: 0 auto; | ||
| padding: 1rem; | ||
| } | ||
| .header { | ||
| background: var(--light-bg-color); | ||
| color: var(--dark-text-color); | ||
| background: var(--light-bg-color); | ||
| color: var(--dark-text-color); | ||
| } | ||
| .header .container { | ||
| padding: 1rem 1.75rem 1.75rem 1.75rem; | ||
| padding: 1rem 1.75rem 1.75rem 1.75rem; | ||
| } | ||
| .header h1 { | ||
| font-size: 2.5rem; | ||
| font-weight: 500; | ||
| font-size: 2.5rem; | ||
| font-weight: 500; | ||
| } | ||
| .header p { | ||
| font-size: 1.2rem; | ||
| margin: 0; | ||
| line-height: 2.5; | ||
| font-size: 1.2rem; | ||
| margin: 0; | ||
| line-height: 2.5; | ||
| } | ||
| .header a { | ||
| color: var(--brand-primary-color); | ||
| margin-left: 2rem; | ||
| display: none; | ||
| text-decoration: none; | ||
| color: var(--brand-primary-color); | ||
| margin-left: 2rem; | ||
| display: none; | ||
| text-decoration: none; | ||
| } | ||
| .header:hover a { | ||
| display: inline; | ||
| display: inline; | ||
| } | ||
|
|
||
| .footer { | ||
| background: var(--dark-bg-color); | ||
| color: var(--light-text-color); | ||
| background: var(--dark-bg-color); | ||
| color: var(--light-text-color); | ||
| } | ||
| .footer .container { | ||
| border-top: 1px solid #e7e7e7; | ||
| margin-top: 1rem; | ||
| text-align: center; | ||
| border-top: 1px solid #e7e7e7; | ||
| margin-top: 1rem; | ||
| text-align: center; | ||
| } | ||
|
|
||
| .source { | ||
| background: #343434; | ||
| color: var(--light-text-color); | ||
| padding: 0.5em 1em; | ||
| border-radius: 5px; | ||
| font-family: Menlo, Monaco, Consolas, "Courier New", monospace; | ||
| font-size: 0.85rem; | ||
| margin: 0; | ||
| overflow-x: scroll; | ||
| background: #343434; | ||
| color: var(--light-text-color); | ||
| padding: 0.5em 1em; | ||
| border-radius: 5px; | ||
| font-family: Menlo, Monaco, Consolas, "Courier New", monospace; | ||
| font-size: 0.85rem; | ||
| margin: 0; | ||
| overflow-x: scroll; | ||
| } | ||
| .source span.line { | ||
| line-height: 1.4; | ||
| line-height: 1.4; | ||
| } | ||
| .source span.line .number { | ||
| color: #666; | ||
| color: #666; | ||
| } | ||
| .source .line .highlight { | ||
| display: block; | ||
| background: var(--dark-text-color); | ||
| color: var(--light-text-color); | ||
| display: block; | ||
| background: var(--dark-text-color); | ||
| color: var(--light-text-color); | ||
| } | ||
| .source span.highlight .number { | ||
| color: #fff; | ||
| color: #fff; | ||
| } | ||
|
|
||
| .tabs { | ||
| list-style: none; | ||
| list-style-position: inside; | ||
| margin: 0; | ||
| padding: 0; | ||
| margin-bottom: -1px; | ||
| list-style: none; | ||
| list-style-position: inside; | ||
| margin: 0; | ||
| padding: 0; | ||
| margin-bottom: -1px; | ||
| } | ||
| .tabs li { | ||
| display: inline; | ||
| display: inline; | ||
| } | ||
| .tabs a:link, | ||
| .tabs a:visited { | ||
| padding: 0rem 1rem; | ||
| line-height: 2.7; | ||
| text-decoration: none; | ||
| color: var(--dark-text-color); | ||
| background: var(--light-bg-color); | ||
| border: 1px solid rgba(0,0,0,0.15); | ||
| border-bottom: 0; | ||
| border-top-left-radius: 5px; | ||
| border-top-right-radius: 5px; | ||
| display: inline-block; | ||
| padding: 0rem 1rem; | ||
| line-height: 2.7; | ||
| text-decoration: none; | ||
| color: var(--dark-text-color); | ||
| background: var(--light-bg-color); | ||
| border: 1px solid rgba(0,0,0,0.15); | ||
| border-bottom: 0; | ||
| border-top-left-radius: 5px; | ||
| border-top-right-radius: 5px; | ||
| display: inline-block; | ||
| } | ||
| .tabs a:hover { | ||
| background: var(--light-bg-color); | ||
| border-color: rgba(0,0,0,0.15); | ||
| background: var(--light-bg-color); | ||
| border-color: rgba(0,0,0,0.15); | ||
| } | ||
| .tabs a.active { | ||
| background: var(--main-bg-color); | ||
| color: var(--main-text-color); | ||
| background: var(--main-bg-color); | ||
| color: var(--main-text-color); | ||
| } | ||
| .tab-content { | ||
| background: var(--main-bg-color); | ||
| border: 1px solid rgba(0,0,0,0.15); | ||
| background: var(--main-bg-color); | ||
| border: 1px solid rgba(0,0,0,0.15); | ||
| } | ||
| .content { | ||
| padding: 1rem; | ||
| padding: 1rem; | ||
| } | ||
| .hide { | ||
| display: none; | ||
| display: none; | ||
| } | ||
|
|
||
| .alert { | ||
| margin-top: 2rem; | ||
| display: block; | ||
| text-align: center; | ||
| line-height: 3.0; | ||
| background: #d9edf7; | ||
| border: 1px solid #bcdff1; | ||
| border-radius: 5px; | ||
| color: #31708f; | ||
| margin-top: 2rem; | ||
| display: block; | ||
| text-align: center; | ||
| line-height: 3.0; | ||
| background: #d9edf7; | ||
| border: 1px solid #bcdff1; | ||
| border-radius: 5px; | ||
| color: #31708f; | ||
| } | ||
| ul, ol { | ||
| line-height: 1.8; | ||
| line-height: 1.8; | ||
| } | ||
|
|
||
| table { | ||
| width: 100%; | ||
| overflow: hidden; | ||
| width: 100%; | ||
| overflow: hidden; | ||
| } | ||
| th { | ||
| text-align: left; | ||
| border-bottom: 1px solid #e7e7e7; | ||
| padding-bottom: 0.5rem; | ||
| text-align: left; | ||
| border-bottom: 1px solid #e7e7e7; | ||
| padding-bottom: 0.5rem; | ||
| } | ||
| td { | ||
| padding: 0.2rem 0.5rem 0.2rem 0; | ||
| padding: 0.2rem 0.5rem 0.2rem 0; | ||
| } | ||
| tr:hover td { | ||
| background: #f1f1f1; | ||
| background: #f1f1f1; | ||
| } | ||
| td pre { | ||
| white-space: pre-wrap; | ||
| white-space: pre-wrap; | ||
| } | ||
|
|
||
| .trace a { | ||
| color: inherit; | ||
| color: inherit; | ||
| } | ||
| .trace table { | ||
| width: auto; | ||
| width: auto; | ||
| } | ||
| .trace tr td:first-child { | ||
| min-width: 5em; | ||
| font-weight: bold; | ||
| min-width: 5em; | ||
| font-weight: bold; | ||
| } | ||
| .trace td { | ||
| background: var(--light-bg-color); | ||
| padding: 0 1rem; | ||
| background: var(--light-bg-color); | ||
| padding: 0 1rem; | ||
| } | ||
| .trace td pre { | ||
| margin: 0; | ||
| margin: 0; | ||
| } | ||
| .args { | ||
| display: none; | ||
| display: none; | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are these diffs generated by Dart SASS?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, it seems my mistake.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, it is not generated by SASS.
I replaced tabs with spaces manually.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok. It seems kinda weird that they look the same from my PC.