Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .storybook/preview-head.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<link rel="preconnect" href="https://use.typekit.net" crossorigin>
<link rel="preconnect" href="https://p.typekit.net" crossorigin>
<link rel="stylesheet" href="https://use.typekit.net/wyy0pka.css"/>
<link rel="stylesheet" href="https://use.typekit.net/wyy0pka.css">

<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/extend/forms/fields/hidden.antlers.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
type="hidden"
name="{{ name }}"
value="{{ value }}"
/>
>
2 changes: 1 addition & 1 deletion resources/views/forms/automagic-email.antlers.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
{{ value | nl2br }}
{{ /if }}
{{ /if }}
<br />
<br>
{{ /fields }}
8 changes: 4 additions & 4 deletions resources/views/graphql/graphiql.blade.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>GraphiQL ‹ Statamic</title>
<style>
body {
Expand All @@ -25,11 +25,11 @@
<link
rel="stylesheet"
href="https://esm.sh/graphiql@4.0.0/dist/style.css"
/>
>
<link
rel="stylesheet"
href="https://esm.sh/@graphiql/plugin-explorer@4.0.0/dist/style.css"
/>
>
<!-- Note: the ?standalone flag bundles the module along with all of its `dependencies`, excluding `peerDependencies`, into a single JavaScript file. -->
<script type="importmap">
{
Expand Down
4 changes: 2 additions & 2 deletions resources/views/partials/favicon.antlers.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
type="image/png"
href="{{ glide :src="favicon_url" format="png" height="32" width="32" }}"
sizes="32x32"
/>
>
<link
rel="icon"
type="image/png"
href="{{ glide :src="favicon_url" format="png" height="16" width="16" }}"
sizes="16x16"
/>
>
17 changes: 8 additions & 9 deletions resources/views/partials/head.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@
use function Statamic\trans as __;
@endphp

<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="viewport" content="width=device-width" />
<meta name="robots" content="noindex,nofollow" />
<meta charset="utf-8">
<meta name="viewport" content="width=device-width">
<meta name="robots" content="noindex,nofollow">
<meta name="color-scheme" content="{{ $user?->preferredColorMode() ?? 'auto' }}">

@if (Statamic::pro() && config('statamic.cp.custom_favicon_url'))
@include('statamic::partials.favicon', ['favicon_url' => config('statamic.cp.custom_favicon_url')])
@else
<link rel="icon" type="image/png" href="{{ Statamic::cpViteAsset('img/favicon-32x32.png') }}" sizes="32x32" />
<link rel="icon" type="image/png" href="{{ Statamic::cpViteAsset('img/favicon-16x16.png') }}" sizes="16x16" />
<link rel="icon" type="image/png" href="{{ Statamic::cpViteAsset('img/favicon-32x32.png') }}" sizes="32x32">
<link rel="icon" type="image/png" href="{{ Statamic::cpViteAsset('img/favicon-16x16.png') }}" sizes="16x16">
<link rel="apple-touch-icon" href="{{ Statamic::cpViteAsset('img/apple-touch-icon.png') }}">
<link rel="shortcut icon" type="image/x-icon" href="{{ Statamic::cpViteAsset('img/favicon.ico') }}">
@endif
Expand All @@ -33,16 +32,16 @@
{{ Statamic::cpViteScripts() }}

@if (Statamic::pro() && config('statamic.cp.custom_css_url'))
<link href="{{ config('statamic.cp.custom_css_url') }}?v={{ Statamic::version() }}" rel="stylesheet" />
<link href="{{ config('statamic.cp.custom_css_url') }}?v={{ Statamic::version() }}" rel="stylesheet">
@endif

@foreach (Statamic::availableExternalStyles(request()) as $url)
<link href="{{ $url }}" rel="stylesheet" />
<link href="{{ $url }}" rel="stylesheet">
@endforeach

@foreach (Statamic::availableStyles(request()) as $package => $paths)
@foreach ($paths as $path)
<link href="{{ Statamic::vendorPackageAssetUrl($package, $path, 'css') }}" rel="stylesheet" />
<link href="{{ Statamic::vendorPackageAssetUrl($package, $path, 'css') }}" rel="stylesheet">
@endforeach
@endforeach

Expand Down
2 changes: 1 addition & 1 deletion src/Tags/Theme.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public function css()
$url = $this->themeUrl($path);

if ($this->params->bool('tag')) {
return '<link rel="stylesheet" href="'.$url.'" />';
return '<link rel="stylesheet" href="'.$url.'">';
}

return $url;
Expand Down
2 changes: 1 addition & 1 deletion tests/Tags/ThemeTagsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public function testOutputsNamedCssWithAppendedExtension()
public function testOutputsCssTag()
{
$this->assertEquals(
'<link rel="stylesheet" href="'.$this->path.'/css/style.css" />',
'<link rel="stylesheet" href="'.$this->path.'/css/style.css">',
$this->tag('{{ theme:css src="style" tag="true" }}')
);
}
Expand Down