Skip to content

Commit

Permalink
Merge pull request #1700 from Office-of-Digital-Services/dev
Browse files Browse the repository at this point in the history 
6.4.0
  • Loading branch information
@carterm
carterm authored Oct 17, 2024
2 parents 65a1677 + 2f9ff6f commit ad82a62
Show file tree
Hide file tree
Showing 15 changed files with 68 additions and 15 deletions.
12 changes: 6 additions & 6 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cagov-template-v6",
"version": "6.3.4",
"version": "6.4.0",
"description": "CA State Web Template",
"scripts": {
"start": "npx @11ty/eleventy --serve",
Expand All @@ -15,7 +15,7 @@
"prettier": "2.8.3"
},
"dependencies": {
"@cagovweb/state-template": "6.3.4",
"@cagovweb/state-template": "6.4.0",
"csv-parse": "^5.5.6",
"@11ty/eleventy": "^2.0.1"
}
Expand Down
51 changes: 45 additions & 6 deletions pages/cdn.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ <h2>How this works</h2>

<h2>Examples</h2>
<h3>Using core CSS files</h3>
<pre><span class="text-accent-p2">&lt;link</span> <span class="text-info">href=</span><span class="text-accent7">"https://cdn.cdt.ca.gov/cdt/statetemplate/6.3.4/css/cagov.core.css" <span class="text-info">rel=</span><span class="text-accent7">"stylesheet"</span> <span class="text-info">integrity=</span><span class="text-accent7">"sha256-E1gw6FZS3euuiCtwnCsNUr+UnAR3Wf26Zqexq6nCQw4="</span> <span class="text-info">crossorigin=</span><span class="text-accent7">"anonymous"</span></span><span class="text-accent-p2">&gt;</span>
<span class="text-accent-p2">&lt;link</span> <span class="text-info">href=</span><span class="text-accent7">"https://cdn.cdt.ca.gov/cdt/statetemplate/6.3.4/css/colortheme-oceanside.css"</span> <span class="text-info">rel=</span><span class="text-accent7">"stylesheet"</span> <span class="text-info">integrity=</span><span class="text-accent7">"sha256-PC5Yszm8bAjYYFmjeL8EeB8mHo+S4dJbQt4OwA4aTmg="</span> <span class="text-info">crossorigin=</span><span class="text-accent7">"anonymous"</span><span class="text-accent-p2">&gt;</span><br /></pre>
<pre><span class="text-accent-p2">&lt;link</span> <span class="text-info">href=</span><span class="text-accent7">"https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/cagov.core.css" <span class="text-info">rel=</span><span class="text-accent7">"stylesheet"</span> <span class="text-info">integrity=</span><span class="text-accent7">"sha256-KMWK+aRIYEpsrUgd/XS5Mnav9E5MOMih6baThgCoVR4="</span> <span class="text-info">crossorigin=</span><span class="text-accent7">"anonymous"</span></span><span class="text-accent-p2">&gt;</span>
<span class="text-accent-p2">&lt;link</span> <span class="text-info">href=</span><span class="text-accent7">"https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-oceanside.css"</span> <span class="text-info">rel=</span><span class="text-accent7">"stylesheet"</span> <span class="text-info">integrity=</span><span class="text-accent7">"sha256-PC5Yszm8bAjYYFmjeL8EeB8mHo+S4dJbQt4OwA4aTmg="</span> <span class="text-info">crossorigin=</span><span class="text-accent7">"anonymous"</span><span class="text-accent-p2">&gt;</span><br /></pre>

<h3>Using JS files</h3>
<pre><span class="text-accent-p2">&lt;script</span> <span class="text-info">src=</span><span class="text-accent7">"https://cdn.cdt.ca.gov/cdt/statetemplate/6.3.4/js/cagov.core.js"</span> <span class="text-info">integrity=</span><span class="text-accent7">"sha256-MjiXAPfgqajlDwvZJ80mAvLPWBiQU0O74UPkudX9gqo="</span> <span class="text-info">crossorigin=</span><span class="text-accent7">"anonymous"</span><span class="text-accent-p2">&gt;&lt;/script&gt;</span></pre>
<pre><span class="text-accent-p2">&lt;script</span> <span class="text-info">src=</span><span class="text-accent7">"https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/js/cagov.core.js"</span> <span class="text-info">integrity=</span><span class="text-accent7">"sha256-pW+BuLxL4Eute7KocYco01bvYop8Dj0aGRE4VKIZF80="</span> <span class="text-info">crossorigin=</span><span class="text-accent7">"anonymous"</span><span class="text-accent-p2">&gt;&lt;/script&gt;</span></pre>

<h3>Crossorigin anonymous</h3>
<p>
Expand Down Expand Up @@ -92,10 +92,10 @@ <h2>Web page using Web State Template CDN</h2>
<span class="text-accent-p2">&lt;link</span> <span class="text-info">rel=</span><span class="text-accent7">"stylesheet"</span> <span class="text-info">href=</span><span class="text-accent7">"https://fonts.googleapis.com/css2?family=Public+Sans:ital,wght@0,100..900;1,100..900&amp;display=block"</span><span class="text-accent-p2">&gt;</span>

<span class="text-muted">&lt;!-- State Template CDN CSS --&gt;</span>
<span class="text-accent-p2">&lt;link</span> <span class="text-info">rel=</span><span class="text-accent7">"stylesheet"</span> <span class="text-info">href=</span><span class="text-accent7">"https://cdn.cdt.ca.gov/cdt/statetemplate/6.3.4/css/cagov.core.css"</span> <span class="text-info">integrity=</span><span class="text-accent7">"sha256-E1gw6FZS3euuiCtwnCsNUr+UnAR3Wf26Zqexq6nCQw4="</span> <span class="text-info">crossorigin=</span><span class="text-accent7">"anonymous"</span><span class="text-accent-p2">&gt;</span>
<span class="text-accent-p2">&lt;link</span> <span class="text-info">rel=</span><span class="text-accent7">"stylesheet"</span> <span class="text-info">href=</span><span class="text-accent7">"https://cdn.cdt.ca.gov/cdt/statetemplate/6.3.4/css/colortheme-oceanside.css"</span> <span class="text-info">integrity=</span><span class="text-accent7">"sha256-PC5Yszm8bAjYYFmjeL8EeB8mHo+S4dJbQt4OwA4aTmg="</span> <span class="text-info">crossorigin=</span><span class="text-accent7">"anonymous"</span><span class="text-accent-p2">&gt;</span>
<span class="text-accent-p2">&lt;link</span> <span class="text-info">rel=</span><span class="text-accent7">"stylesheet"</span> <span class="text-info">href=</span><span class="text-accent7">"https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/cagov.core.css"</span> <span class="text-info">integrity=</span><span class="text-accent7">"sha256-KMWK+aRIYEpsrUgd/XS5Mnav9E5MOMih6baThgCoVR4="</span> <span class="text-info">crossorigin=</span><span class="text-accent7">"anonymous"</span><span class="text-accent-p2">&gt;</span>
<span class="text-accent-p2">&lt;link</span> <span class="text-info">rel=</span><span class="text-accent7">"stylesheet"</span> <span class="text-info">href=</span><span class="text-accent7">"https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-oceanside.css"</span> <span class="text-info">integrity=</span><span class="text-accent7">"sha256-PC5Yszm8bAjYYFmjeL8EeB8mHo+S4dJbQt4OwA4aTmg="</span> <span class="text-info">crossorigin=</span><span class="text-accent7">"anonymous"</span><span class="text-accent-p2">&gt;</span>
<span class="text-muted">&lt;!-- State Template JavaScript CDN --&gt;</span>
<span class="text-accent-p2">&lt;script </span><span class="text-info">src=</span><span class="text-accent7">"https://cdn.cdt.ca.gov/cdt/statetemplate/6.3.4/js/cagov.core.js"</span> <span class="text-info">integrity=</span><span class="text-accent7">"sha256-MjiXAPfgqajlDwvZJ80mAvLPWBiQU0O74UPkudX9gqo="</span> <span class="text-info">crossorigin=</span><span class="text-accent7">"anonymous"</span><span class="text-accent-p2">&gt;&lt;/script&gt;</span>
<span class="text-accent-p2">&lt;script </span><span class="text-info">src=</span><span class="text-accent7">"https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/js/cagov.core.js"</span> <span class="text-info">integrity=</span><span class="text-accent7">"sha256-pW+BuLxL4Eute7KocYco01bvYop8Dj0aGRE4VKIZF80="</span> <span class="text-info">crossorigin=</span><span class="text-accent7">"anonymous"</span><span class="text-accent-p2">&gt;&lt;/script&gt;</span>

<span class="text-accent-p2">&lt;/head&gt;</span>
<span class="text-accent-p2">&lt;body&gt;</span>
Expand Down Expand Up @@ -134,6 +134,45 @@ <h2>Core files CDN links, by template version</h2>
</p>
<h3>Web State Template v6 (production)</h3>
<ol data-aria-accordion data-multi data-transition data-default="none">
<li>
<h4 data-aria-accordion-heading>Version 6.4.0</h4>
<div data-aria-accordion-panel>
<p>CSS</p>
<pre>
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/cagov.core.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/cagov.core.min.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-delta.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-delta.min.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-eureka.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-eureka.min.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-mono.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-mono.min.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-oceanside.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-oceanside.min.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-orangecounty.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-orangecounty.min.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-pasorobles.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-pasorobles.min.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-sacramento.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-sacramento.min.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-santabarbara.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-santabarbara.min.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-santacruz.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-santacruz.min.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-sierra.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-sierra.min.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-shasta.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-shasta.min.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-trinity.css" rel="stylesheet" crossorigin="anonymous"&gt;
&lt;link href="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/css/colortheme-trinity.min.css" rel="stylesheet" crossorigin="anonymous"&gt;</pre
>
<p>JS</p>
<pre>
&lt;script src="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/js/cagov.core.js" crossorigin="anonymous&gt;&lt;/script&gt;
&lt;script src="https://cdn.cdt.ca.gov/cdt/statetemplate/6.4.0/js/cagov.core.min.js" crossorigin="anonymous"&gt;&lt;/script&gt;</pre
>
</div>
</li>
<li>
<h4 data-aria-accordion-heading>Version 6.3.4</h4>
<div data-aria-accordion-panel>
Expand Down
14 changes: 14 additions & 0 deletions pages/template-updates.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,20 @@ <h2 id="v6">Release features</h2>
</tr>
</thead>
<tbody>
<tr>
<td class="text-bold font-size-16">6.4.0</td>
<td class="font-size-16">10-18-24</td>
<td>
<ul class="font-size-16">
<li>Updated ca.gov branding</li>
<li>Increased the size of the hamburger menu button</li>
<li>
Added a "button" type to toggle buttons to prevent default "submit"
behavior in ASP frameworks
</li>
</ul>
</td>
</tr>
<tr>
<td class="text-bold font-size-16">6.3.4</td>
<td class="font-size-16">8-21-24</td>
Expand Down
2 changes: 1 addition & 1 deletion src/_includes/utility-header.njk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<div class="settings-links">
<a
href="https://github.com/Office-of-Digital-Services/California-State-Web-Template-HTML/releases"
>Web template v6.3.4</a
>Web template v6.4.0</a
>
</div>
</div>
Expand Down
Binary file modified src/images/apple-touch-icon-114x114.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/apple-touch-icon-120x120.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/apple-touch-icon-144x144.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/apple-touch-icon-152x152.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/apple-touch-icon-180x180.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/apple-touch-icon-192x192.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/apple-touch-icon-57x57.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/apple-touch-icon-72x72.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/apple-touch-icon-precomposed.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/apple-touch-icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit ad82a62

Please sign in to comment.