Skip to content

Commit

Permalink
Prettier writes
Browse files Browse the repository at this point in the history
  • Loading branch information
timkelty committed Apr 19, 2022
1 parent 41977e2 commit 2c24aed
Show file tree
Hide file tree
Showing 303 changed files with 49,977 additions and 41,261 deletions.
36 changes: 18 additions & 18 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
codecov:
require_ci_to_pass: yes
coverage:
range: "20...100"
range: '20...100'
round: down
precision: 2
status:
project:
default:
threshold: .1
notify:
slack:
default:
url: "secret:M/dQaxt1nCzNG8JinXO5SmKdYoqErol7pzCV4Xv194cltAc0qu9WEezFP8Gnwkdg4eXfdxw2M0SbjcE8R8QB2B9n/YUHdXPdWsnhxa/HuIwc4kbvcaHyM7fU/lh7eWgYs4O5K3z/YnrirkmqNlzcgUuRmBOajf6MocPp4zd3sz8="
slack:
default:
url: 'secret:M/dQaxt1nCzNG8JinXO5SmKdYoqErol7pzCV4Xv194cltAc0qu9WEezFP8Gnwkdg4eXfdxw2M0SbjcE8R8QB2B9n/YUHdXPdWsnhxa/HuIwc4kbvcaHyM7fU/lh7eWgYs4O5K3z/YnrirkmqNlzcgUuRmBOajf6MocPp4zd3sz8='
parsers:
gcov:
branch_detection:
Expand All @@ -23,17 +23,17 @@ comment: off
github_checks:
annotations: false
ignore:
- "src/web/assets"
- "src/test/internal"
- "src/config"
- "src/icons"
- "src/test/internal"
- "src/migrations"
- "src/templates"
- "src/translations"
- "src/views"
- "src/web/assets"
- "bootstrap"
- "lib"
- "tests"
- "vendor"
- 'src/web/assets'
- 'src/test/internal'
- 'src/config'
- 'src/icons'
- 'src/test/internal'
- 'src/migrations'
- 'src/templates'
- 'src/translations'
- 'src/views'
- 'src/web/assets'
- 'bootstrap'
- 'lib'
- 'tests'
- 'vendor'
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/BUG-REPORT-V3.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Bug Report – Craft 3
description: Report an issue or unexpected behavior pertaining to Craft 3
title: "[3.x]: "
title: '[3.x]: '
labels:
- bug
- craft3
Expand Down Expand Up @@ -28,7 +28,6 @@ body:
### Actual behavior
validations:
required: true
- type: input
Expand Down
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/BUG-REPORT-V4.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Bug Report – Craft 4 Beta
description: Report an issue or unexpected behavior pertaining to Craft 4 Beta
title: "[4.x]: "
title: '[4.x]: '
labels:
- bug
- craft4
Expand Down Expand Up @@ -28,7 +28,6 @@ body:
### Actual behavior
validations:
required: true
- type: input
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
php_versions: '["7.2", "7.3", "7.4", "8.0", "8.1"]'
notify-slack:
name: Notify Slack
needs: [ ecs, codecept ]
needs: [ecs, codecept]
if: ${{ always() }}
uses: craftcms/.github/.github/workflows/notify-slack.yml@v1
with:
Expand Down
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
*.php
*.md
composer.lock
src/web/assets/**/dist/*
vendor/*
lib/*
cpresources/*
composer.lock
src/templates/*
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"config": {
"sort-packages": true,
"platform": {
"php": "7.2.5"
"php": "7.2.5"
},
"allow-plugins": {
"yiisoft/yii2-composer": true,
Expand Down
2 changes: 1 addition & 1 deletion crowdin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ files:
- el
- id
- ky
commit_message: "[ci skip]"
commit_message: '[ci skip]'
163 changes: 91 additions & 72 deletions packages/craftcms-sass/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,71 +15,71 @@ $grey800: hsl(209, 20%, 25%);
$grey900: hsl(210, 24%, 16%);
$grey1000: hsl(210, 24%, 10%);

$blue050: #E3F8FF;
$blue100: #B3ECFF;
$blue200: #81DEFD;
$blue300: #5ED0FA;
$blue400: #40C3F7;
$blue500: #2BB0ED;
$blue600: #1992D4;
$blue700: #127FBF;
$blue800: #0B69A3;
$blue050: #e3f8ff;
$blue100: #b3ecff;
$blue200: #81defd;
$blue300: #5ed0fa;
$blue400: #40c3f7;
$blue500: #2bb0ed;
$blue600: #1992d4;
$blue700: #127fbf;
$blue800: #0b69a3;
$blue900: #035388;

$cyan050: #E0FCFF;
$cyan100: #BEF8FD;
$cyan200: #87EAF2;
$cyan300: #54D1DB;
$cyan400: #38BEC9;
$cyan500: #2CB1BC;
$cyan600: #14919B;
$cyan700: #0E7C86;
$cyan800: #0A6C74;
$cyan900: #044E54;

$pink050: #FFE3EC;
$pink100: #FFB8D2;
$pink200: #FF8CBA;
$pink300: #F364A2;
$pink400: #E8368F;
$pink500: #DA127D;
$pink600: #BC0A6F;
$pink700: #A30664;
$cyan050: #e0fcff;
$cyan100: #bef8fd;
$cyan200: #87eaf2;
$cyan300: #54d1db;
$cyan400: #38bec9;
$cyan500: #2cb1bc;
$cyan600: #14919b;
$cyan700: #0e7c86;
$cyan800: #0a6c74;
$cyan900: #044e54;

$pink050: #ffe3ec;
$pink100: #ffb8d2;
$pink200: #ff8cba;
$pink300: #f364a2;
$pink400: #e8368f;
$pink500: #da127d;
$pink600: #bc0a6f;
$pink700: #a30664;
$pink800: #870557;
$pink900: #620042;

$red050: #FFE3E3;
$red100: #FFBDBD;
$red200: #FF9B9B;
$red300: #F86A6A;
$red400: #EF4E4E;
$red500: #E12D39;
$red600: #CF1124;
$red700: #AB091E;
$red800: #8A041A;
$red050: #ffe3e3;
$red100: #ffbdbd;
$red200: #ff9b9b;
$red300: #f86a6a;
$red400: #ef4e4e;
$red500: #e12d39;
$red600: #cf1124;
$red700: #ab091e;
$red800: #8a041a;
$red900: #610316;

$yellow050: #FFFBEA;
$yellow100: #FFF3C4;
$yellow200: #FCE588;
$yellow300: #FADB5F;
$yellow400: #F7C948;
$yellow500: #F0B429;
$yellow600: #DE911D;
$yellow700: #CB6E17;
$yellow800: #B44D12;
$yellow900: #8D2B0B;

$teal050: #EFFCF6;
$teal100: #C6F7E2;
$teal200: #8EEDC7;
$teal300: #65D6AD;
$teal400: #3EBD93;
$teal500: #27AB83;
$yellow050: #fffbea;
$yellow100: #fff3c4;
$yellow200: #fce588;
$yellow300: #fadb5f;
$yellow400: #f7c948;
$yellow500: #f0b429;
$yellow600: #de911d;
$yellow700: #cb6e17;
$yellow800: #b44d12;
$yellow900: #8d2b0b;

$teal050: #effcf6;
$teal100: #c6f7e2;
$teal200: #8eedc7;
$teal300: #65d6ad;
$teal400: #3ebd93;
$teal500: #27ab83;
$teal600: #199473;
$teal700: #147D64;
$teal800: #0C6B58;
$teal900: #014D40;
$teal700: #147d64;
$teal800: #0c6b58;
$teal900: #014d40;

// submit button colors
$primaryColor: $red500;
Expand Down Expand Up @@ -107,12 +107,15 @@ $darkHairlineColor: transparentize($grey400, 0.5);
// focus colors
$lightFocusColor: $blue300;
$mediumFocusColor: $blue500;
$darkFocusColor: #0F74B1;
$darkFocusColor: #0f74b1;

// focus rings
$lightFocusRing: 0 0 0 1px $lightFocusColor, 0 0 0 3px transparentize($lightFocusColor, 0.3);
$mediumFocusRing: 0 0 0 1px $mediumFocusColor, 0 0 0 3px transparentize($mediumFocusColor, 0.3);
$darkFocusRing: 0 0 0 1px $darkFocusColor, 0 0 0 3px transparentize($darkFocusColor, 0.3);
$lightFocusRing: 0 0 0 1px $lightFocusColor,
0 0 0 3px transparentize($lightFocusColor, 0.3);
$mediumFocusRing: 0 0 0 1px $mediumFocusColor,
0 0 0 3px transparentize($mediumFocusColor, 0.3);
$darkFocusRing: 0 0 0 1px $darkFocusColor,
0 0 0 3px transparentize($darkFocusColor, 0.3);

// selection colors
$lightSelColor: $grey200;
Expand All @@ -134,18 +137,28 @@ $checkboxSize: 16px;
$radioSize: 16px;

@mixin sans-serif-font {
font-family: system-ui, BlinkMacSystemFont, -apple-system, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
font-family: system-ui, BlinkMacSystemFont, -apple-system, 'Segoe UI',
'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans',
'Helvetica Neue', sans-serif;
}

@mixin fixed-width-font {
font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier,
monospace;
font-size: 0.9em !important;
}

// Other

@mixin svg-mask($color) {
rect, circle, ellipse, line, polyline, polygon, path, text {
rect,
circle,
ellipse,
line,
polyline,
polygon,
path,
text {
fill: $color;
stroke-width: 0;
transition: fill linear 100ms;
Expand All @@ -155,12 +168,12 @@ $radioSize: 16px;
@mixin icon {
font-family: 'Craft';
speak: none;
-webkit-font-feature-settings: "liga", "dlig";
-moz-font-feature-settings: "liga=1, dlig=1";
-moz-font-feature-settings: "liga", "dlig";
-ms-font-feature-settings: "liga", "dlig";
-o-font-feature-settings: "liga", "dlig";
font-feature-settings: "liga", "dlig";
-webkit-font-feature-settings: 'liga', 'dlig';
-moz-font-feature-settings: 'liga=1, dlig=1';
-moz-font-feature-settings: 'liga', 'dlig';
-ms-font-feature-settings: 'liga', 'dlig';
-o-font-feature-settings: 'liga', 'dlig';
font-feature-settings: 'liga', 'dlig';
text-rendering: optimizeLegibility;
font-weight: normal;
font-variant: normal;
Expand Down Expand Up @@ -506,7 +519,8 @@ $radioSize: 16px;
overflow: auto;
background: $white;
user-select: none;
box-shadow: 0 0 0 1px transparentize($grey900, 0.9), 0 5px 20px transparentize($grey900, 0.75);
box-shadow: 0 0 0 1px transparentize($grey900, 0.9),
0 5px 20px transparentize($grey900, 0.75);
}

@mixin menu-option-styles {
Expand Down Expand Up @@ -620,7 +634,12 @@ $radioSize: 16px;
font-size: 16px;
line-height: 22px;

h1, h2, h3, h4, h5, h6 {
h1,
h2,
h3,
h4,
h5,
h6 {
margin: 24px 0 16px;
font-weight: 600;
}
Expand Down
28 changes: 16 additions & 12 deletions packages/craftcms-webpack/Craft.d.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,31 @@
// Set up interfaces and types
interface ProgressBarInterface {
new($element: JQuery, displaySteps?: boolean): ProgressBarInterface
new ($element: JQuery, displaySteps?: boolean): ProgressBarInterface;

$progressBar: JQuery
$progressBar: JQuery;

setItemCount(count: number): void
setItemCount(count: number): void;

setProcessedItemCount(count: number): void
setProcessedItemCount(count: number): void;

updateProgressBar(): void
updateProgressBar(): void;

showProgressBar(): void
showProgressBar(): void;
}

// Declare existing variables, mock the things we'll use.
declare var Craft: {
ProgressBar: ProgressBarInterface,
t(category: string, message: string, params?: object): string,
postActionRequest(action: string, data?: object, callback?: (response: object, textStatus: string) => void): void,
initUiElements($container: JQuery): void,
expandPostArray(arr: object): any
ProgressBar: ProgressBarInterface;
t(category: string, message: string, params?: object): string;
postActionRequest(
action: string,
data?: object,
callback?: (response: object, textStatus: string) => void
): void;
initUiElements($container: JQuery): void;
expandPostArray(arr: object): any;
};

declare var Garnish: any;
declare type JQuery = any;
declare var $: any;
declare var $: any;
Loading

0 comments on commit 2c24aed

Please sign in to comment.