diff --git a/README.md b/README.md index 82ec05a30..8fc41b866 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ Install npm and dependencies: ```bash -yarn install -yarn run dev +npm install +npm run dev ``` Install composer dependencies: diff --git a/first-run.sh b/first-run.sh index a4624c168..feb7d7106 100644 --- a/first-run.sh +++ b/first-run.sh @@ -17,7 +17,7 @@ mkdir -p storage/framework/sessions mkdir -p storage/framework/views # create the manifest.json file -npm build +npm run build # since Laravel 11 ↓ diff --git a/package.json b/package.json index 01d00c3dc..790f1ca8e 100644 --- a/package.json +++ b/package.json @@ -2,10 +2,6 @@ "name": "getrector-com", "type": "module", "dependencies": { - "@fortawesome/fontawesome-free": "^6.2", - "@fortawesome/free-brands-svg-icons": "^6.2", - "@fortawesome/free-regular-svg-icons": "^6.2", - "@fortawesome/free-solid-svg-icons": "^6.2", "ajv": "^8.0", "bootstrap": "^5.3", "codemirror": "^5.0.1", diff --git a/public/assets/images/logo/logo_bigger/complex.jpg b/public/assets/images/logo/logo_bigger/complex.jpg deleted file mode 100644 index 51f68ff61..000000000 Binary files a/public/assets/images/logo/logo_bigger/complex.jpg and /dev/null differ diff --git a/public/assets/images/logo/logo_bigger/curve.jpg b/public/assets/images/logo/logo_bigger/curve.jpg deleted file mode 100644 index 625d5cf09..000000000 Binary files a/public/assets/images/logo/logo_bigger/curve.jpg and /dev/null differ diff --git a/public/assets/images/logo/logo_bigger/curve.svg b/public/assets/images/logo/logo_bigger/curve.svg new file mode 100644 index 000000000..776fb7263 --- /dev/null +++ b/public/assets/images/logo/logo_bigger/curve.svg @@ -0,0 +1,41 @@ + + + + + + diff --git a/public/assets/images/logo/logo_bigger/eonx.png b/public/assets/images/logo/logo_bigger/eonx.png index 66a97db5b..0142cc5e1 100644 Binary files a/public/assets/images/logo/logo_bigger/eonx.png and b/public/assets/images/logo/logo_bigger/eonx.png differ diff --git a/public/assets/images/logo/logo_bigger/gotphoto.jpg b/public/assets/images/logo/logo_bigger/gotphoto.jpg deleted file mode 100644 index dca78da1f..000000000 Binary files a/public/assets/images/logo/logo_bigger/gotphoto.jpg and /dev/null differ diff --git a/public/assets/images/logo/logo_bigger/gotphoto.png b/public/assets/images/logo/logo_bigger/gotphoto.png new file mode 100644 index 000000000..8eb28fc55 Binary files /dev/null and b/public/assets/images/logo/logo_bigger/gotphoto.png differ diff --git a/public/assets/images/logo/logo_bigger/i6.png b/public/assets/images/logo/logo_bigger/i6.png new file mode 100644 index 000000000..153dcc467 Binary files /dev/null and b/public/assets/images/logo/logo_bigger/i6.png differ diff --git a/resources/blog/posts/2020/2020-09-07-how-to-inline-value-object-in-symfony-php-config.md b/resources/blog/posts/2020/2020-09-07-how-to-inline-value-object-in-symfony-php-config.md index 15576b0b7..347bd1d17 100644 --- a/resources/blog/posts/2020/2020-09-07-how-to-inline-value-object-in-symfony-php-config.md +++ b/resources/blog/posts/2020/2020-09-07-how-to-inline-value-object-in-symfony-php-config.md @@ -71,7 +71,7 @@ $services->set(FuncCallToStaticCallRector::class)
- +❌ ## 2. Native `inline_service()` Function @@ -106,7 +106,7 @@ This approach shuts us back to coding in the dark with Notepad.
- +❌ ## 3. Best of Both Worlds - `inline_value_objects()` @@ -158,7 +158,7 @@ And you're set!
- +✅ This way, **anyone can configure even the most complex Rector rules** without ever looking inside the Rector rule and scan for configuration values. diff --git a/resources/blog/posts/2021/2021-05-03-prefixed-rector-by-default.md b/resources/blog/posts/2021/2021-05-03-prefixed-rector-by-default.md index a68183b81..e8ff70daf 100644 --- a/resources/blog/posts/2021/2021-05-03-prefixed-rector-by-default.md +++ b/resources/blog/posts/2021/2021-05-03-prefixed-rector-by-default.md @@ -20,7 +20,7 @@ composer require symfony/console:2.8 composer require rector/rector --dev ``` - +❌ That's where [prefixed version](/blog/2020/01/20/how-to-install-rector-despite-composer-conflicts) helps too. @@ -29,7 +29,7 @@ composer require symfony/console:2.8 composer require rector/rector-prefixed --dev ``` - +✅ The ultimate problem with this setup is a terrible user experience [with hidden knowledge](@todo memory lock post). As a user, I don't want to think about different names for the same package. Would you install `symfony/console` or `symfony/console-prefixed` based on conflicts on install? No. @@ -42,7 +42,7 @@ composer require symfony/console:2.8 composer require rector/rector --dev ``` - +✅ In April and May we've been working hard to make `rector/rector-prefixed` experience identical to `rector/rector`. It included: diff --git a/resources/blog/posts/2021/2021-05-10-how-to-bump-minimal-version-without-leaving-anyone-behind.md b/resources/blog/posts/2021/2021-05-10-how-to-bump-minimal-version-without-leaving-anyone-behind.md index d5e50d7b1..b21c81211 100644 --- a/resources/blog/posts/2021/2021-05-10-how-to-bump-minimal-version-without-leaving-anyone-behind.md +++ b/resources/blog/posts/2021/2021-05-10-how-to-bump-minimal-version-without-leaving-anyone-behind.md @@ -143,7 +143,7 @@ composer require symfony/console:^6.0 This way, if any package will require `symfony/console:^6.0`, they will always match the current set of features. - +✅ For now, it's just an idea. Yet we already can see working ~~prototype~~ examples in the PHP world. PHPStan is using this release approach since 0.12. This week Rector and [ECS has joined](https://twitter.com/VotrubaT/status/1391445133405696014). diff --git a/resources/css/app.scss b/resources/css/app.scss index 9889bbdea..83c875493 100644 --- a/resources/css/app.scss +++ b/resources/css/app.scss @@ -1,15 +1,7 @@ @import "bootstrap/scss/bootstrap"; -@import "@fortawesome/fontawesome-free/css/all.css"; - - -// setting the value of this variable to an empty data URL is the only working solution -// to load the Bootswatch web fonts locally and avoid loading them from Google servers -// see https://github.com/thomaspark/bootswatch/issues/55#issuecomment-298093182 - -// @import url('https://rsms.me/inter/inter.css'); html { - font-family: 'Inter', sans-serif; + font-family: 'Inter var', sans-serif; } $black: #24292e; @@ -22,6 +14,8 @@ body { display: flex; flex-direction: column; font-size: 110%; + + background: hsl(48 33.3% 97.1% / 1) } a, a:hover, a:focus, button, button:focus { @@ -30,6 +24,23 @@ a, a:hover, a:focus, button, button:focus { box-shadow: none !important; } +.navbar-dark .navbar-nav { + margin-top: .3em; + margin-bottom: .3em; + + a.nav-link { + color: white; + text-decoration: none; + + margin-right: 1em; + } + + a { + font-size: 1.15em; + } +} + + .bigger-buttons .btn { padding: .8rem 1.3rem; font-size: 1.3rem; @@ -73,7 +84,7 @@ a, a:hover, a:focus, button, button:focus { ============================*/ h1, h2, h3 { - font-family: 'Inter', sans-serif; + font-family: 'Inter var', sans-serif; } h3 { @@ -126,7 +137,7 @@ html, body { } } - a { + a, a svg { color: #FFF; &:hover { @@ -655,4 +666,10 @@ label.required:before { .anchor-link { margin-left: .1em; padding: .1em .3em; + opacity: .5; + text-decoration: none !important; + + &:hover { + opacity: .8; + } } diff --git a/resources/css/menu.scss b/resources/css/menu.scss deleted file mode 100644 index fb7893e8c..000000000 --- a/resources/css/menu.scss +++ /dev/null @@ -1,15 +0,0 @@ -.navbar-dark .navbar-nav { - margin-top: .3em; - margin-bottom: .3em; - - a.nav-link { - color: white; - text-decoration: none; - - margin-right: 1em; - } - - a { - font-size: 1.15em; - } -} diff --git a/resources/views/_snippets/javascripts.blade.php b/resources/views/_snippets/javascripts.blade.php index 7b1172d68..9a24a3396 100644 --- a/resources/views/_snippets/javascripts.blade.php +++ b/resources/views/_snippets/javascripts.blade.php @@ -1,3 +1,5 @@ +@isset ($codeMirror) + @@ -54,3 +56,5 @@ } }); + +@endisset diff --git a/resources/views/_snippets/layout/footer.blade.php b/resources/views/_snippets/layout/footer.blade.php index b63dec6cf..2ef99514f 100644 --- a/resources/views/_snippets/layout/footer.blade.php +++ b/resources/views/_snippets/layout/footer.blade.php @@ -7,20 +7,25 @@
- + + + - + + + - + - - + + + +
diff --git a/resources/views/_snippets/line/company_logos.blade.php b/resources/views/_snippets/line/company_logos.blade.php deleted file mode 100644 index 2bdb5fd55..000000000 --- a/resources/views/_snippets/line/company_logos.blade.php +++ /dev/null @@ -1,8 +0,0 @@ -
- - - - - - -
diff --git a/resources/views/_snippets/menu.blade.php b/resources/views/_snippets/menu.blade.php index fd7dd5026..5b76a38ea 100644 --- a/resources/views/_snippets/menu.blade.php +++ b/resources/views/_snippets/menu.blade.php @@ -9,7 +9,8 @@