Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: magic-themes/project
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: aec02a51fd5a1daedc3c37466f80ef57a0831087
Choose a base ref
...
head repository: magic-themes/project
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cfc8d681b9f27f68e659080544907cc4cc688adc
Choose a head ref
  • 4 commits
  • 8 files changed
  • 1 contributor

Commits on Aug 31, 2020

  1. add default font size

    @jaeh
    jaeh committed Aug 31, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 136F30F901A2231D
    Learn about vigilant mode
    Copy the full SHA
    4d92b41 View commit details

  2. docs: update

    @jaeh
    jaeh committed Aug 31, 2020
    Copy the full SHA
    b6eb37f View commit details

  3. readme: update changelog

    @jaeh
    jaeh committed Aug 31, 2020
    Copy the full SHA
    b50bc67 View commit details

  4. 0.0.23

    @jaeh
    jaeh committed Aug 31, 2020
    Copy the full SHA
    cfc8d68 View commit details
Showing with 14 additions and 9 deletions.
  1. +4 −1 README.md
  2. +1 −1 docs/404.html
  3. +1 −1 docs/index.html
  4. +1 −1 docs/magic.css
  5. +3 −3 docs/sri-hashes.json
  6. +1 −1 package-lock.json
  7. +1 −1 package.json
  8. +2 −0 src/index.mjs
5 changes: 4 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -131,5 +131,8 @@ re-update icon positions
##### 0.0.22
Logo in Hero gets state.root passed instead of full state

##### 0.0.23 - unreleased
##### 0.0.23
* add default font size to prevent font-size: undefined; in css

##### 0.0.24 - unreleased
...
2 changes: 1 addition & 1 deletion docs/404.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link rel="icon" href="/project/favicon.ico"/><title>404 - not found</title><meta name="description" content="404 - not found."/><script type="application/ld+json">{"@context":"http://schema.org","@type":"website","name":"404 - not found"}</script><link rel="stylesheet" href="/project/magic.css?TEJIgPkY1O" integrity="sha384-TEJIgPkY1OVWtIvhVHcQq3pOqYueyZb0P0+mRBeQBFhvb8LW8MgLqurJJag9t7se" crossorigin="anonymous"/></head><body><a class="SkipLink" href="/project/#page">Skip to Content</a><main id="Magic"><div class="Wrapper"><header class="Header"><div><a class="Logo" href="/project/"><svg viewBox="0 0 512 444"><path d="M512 444L256 0 0 444z" fill="#663695"></path><circle cx="256" cy="294" r="130" fill="#fff"></circle><circle cx="256" cy="281" r="40" fill="#663695"></circle><path d="M256 350v44m24-44l1 13c1 27 29 27 29-7m-160-72s46-47 106-47c59 0 106 47 106 47s-47 43-106 43c-60 0-106-43-106-43zm65-75a134 134 0 0189 2" class="stroke"></path><path d="M256 81v53m184 270l-43-29M72 404l43-29" class="stroke white"></path></svg></a><a class="branding" href="/project/"><span>@</span>project</a><nav class="Menu"><ul><li><a href="/project/#installation">setup</a></li><li><a href="/project/#usage">usage</a></li><li><a href="/project/#theme-vars">theme vars</a></li></ul></nav></div></header><div class="Page" id="page"><div>404 - not found.</div></div><footer class="Footer"><div class="Container"><div class="Menus"><div class="Child Info"><h2>@magic</h2><p>jamstack generator</p><p>created by</p><p>Wizards &amp; Witches</p></div><div class="Child"><h2>projects</h2><ul><li><a href="https://github.com/magic/" target="_blank" rel="noopener">@magic</a></li><li><a href="https://github.com/grundstein/" target="_blank" rel="noopener">@grundstein</a></li><li><a href="https://github.com/webboot/" target="_blank" rel="noopener">@webboot</a></li></ul></div><div class="Child"><h2>social links</h2><ul><li><a href="https://www.npmjs.com/org/magic" target="_blank" rel="noopener">npm</a></li><li><a href="https://github.com/magic" target="_blank" rel="noopener">github</a></li></ul></div></div><div class="Credits">made with a few bits of <a target="_blank" rel="noopener" href="https://magic.github.io/">magic</a></div></div></footer></div></main><script src="/project/magic.js?xP86X1s2PQ" integrity="sha384-xP86X1s2PQ5sv53lDS1md+qrAfg/LnTj8hLdeSVV8Ri4z4u8JB3d6pBZzC2CcB90" crossorigin="anonymous"></script></body></html>
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link rel="icon" href="/project/favicon.ico"/><title>404 - not found</title><meta name="description" content="404 - not found."/><script type="application/ld+json">{"@context":"http://schema.org","@type":"website","name":"404 - not found"}</script><link rel="stylesheet" href="/project/magic.css?gUVxeIBun6" integrity="sha384-gUVxeIBun6mz2DbOs+VSvneRixQDjZK+lOFrjCA5kr8BZzO5AuccxHPl+A9uT+lo" crossorigin="anonymous"/></head><body><a class="SkipLink" href="/project/#page">Skip to Content</a><main id="Magic"><div class="Wrapper"><header class="Header"><div><a class="Logo" href="/project/"><svg viewBox="0 0 512 444"><path d="M512 444L256 0 0 444z" fill="#663695"></path><circle cx="256" cy="294" r="130" fill="#fff"></circle><circle cx="256" cy="281" r="40" fill="#663695"></circle><path d="M256 350v44m24-44l1 13c1 27 29 27 29-7m-160-72s46-47 106-47c59 0 106 47 106 47s-47 43-106 43c-60 0-106-43-106-43zm65-75a134 134 0 0189 2" class="stroke"></path><path d="M256 81v53m184 270l-43-29M72 404l43-29" class="stroke white"></path></svg></a><a class="branding" href="/project/"><span>@</span>project</a><nav class="Menu"><ul><li><a href="/project/#installation">setup</a></li><li><a href="/project/#usage">usage</a></li><li><a href="/project/#theme-vars">theme vars</a></li></ul></nav></div></header><div class="Page" id="page"><div>404 - not found.</div></div><footer class="Footer"><div class="Container"><div class="Menus"><div class="Child Info"><h2>@magic</h2><p>jamstack generator</p><p>created by</p><p>Wizards &amp; Witches</p></div><div class="Child"><h2>projects</h2><ul><li><a href="https://github.com/magic/" target="_blank" rel="noopener">@magic</a></li><li><a href="https://github.com/grundstein/" target="_blank" rel="noopener">@grundstein</a></li><li><a href="https://github.com/webboot/" target="_blank" rel="noopener">@webboot</a></li></ul></div><div class="Child"><h2>social links</h2><ul><li><a href="https://www.npmjs.com/org/magic" target="_blank" rel="noopener">npm</a></li><li><a href="https://github.com/magic" target="_blank" rel="noopener">github</a></li></ul></div></div><div class="Credits">made with a few bits of <a target="_blank" rel="noopener" href="https://magic.github.io/">magic</a></div></div></footer></div></main><script src="/project/magic.js?xP86X1s2PQ" integrity="sha384-xP86X1s2PQ5sv53lDS1md+qrAfg/LnTj8hLdeSVV8Ri4z4u8JB3d6pBZzC2CcB90" crossorigin="anonymous"></script></body></html>
2 changes: 1 addition & 1 deletion docs/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link rel="icon" href="/project/favicon.ico"/><script type="application/ld+json">{"@context":"http://schema.org","@type":"website"}</script><link rel="stylesheet" href="/project/magic.css?TEJIgPkY1O" integrity="sha384-TEJIgPkY1OVWtIvhVHcQq3pOqYueyZb0P0+mRBeQBFhvb8LW8MgLqurJJag9t7se" crossorigin="anonymous"/></head><body><a class="SkipLink" href="/project/#page">Skip to Content</a><main id="Magic"><div class="Wrapper"><header class="Header"><div><a class="Logo" href="/project/"><svg viewBox="0 0 512 444"><path d="M512 444L256 0 0 444z" fill="#663695"></path><circle cx="256" cy="294" r="130" fill="#fff"></circle><circle cx="256" cy="281" r="40" fill="#663695"></circle><path d="M256 350v44m24-44l1 13c1 27 29 27 29-7m-160-72s46-47 106-47c59 0 106 47 106 47s-47 43-106 43c-60 0-106-43-106-43zm65-75a134 134 0 0189 2" class="stroke"></path><path d="M256 81v53m184 270l-43-29M72 404l43-29" class="stroke white"></path></svg></a><a class="branding" href="/project/"><span>@</span>project</a><nav class="Menu"><ul><li><a href="/project/#installation">setup</a></li><li><a href="/project/#usage">usage</a></li><li><a href="/project/#theme-vars">theme vars</a></li></ul></nav></div></header><div class="Page" id="page"><div id="hero" class="Hero"><div class="LogoWrapper"><a class="Logo" href="/project/"><svg viewBox="0 0 512 444"><path d="M512 444L256 0 0 444z" fill="#663695"></path><circle cx="256" cy="294" r="130" fill="#fff"></circle><circle cx="256" cy="281" r="40" fill="#663695"></circle><path d="M256 350v44m24-44l1 13c1 27 29 27 29-7m-160-72s46-47 106-47c59 0 106 47 106 47s-47 43-106 43c-60 0-106-43-106-43zm65-75a134 134 0 0189 2" class="stroke"></path><path d="M256 81v53m184 270l-43-29M72 404l43-29" class="stroke white"></path></svg></a><h1><span>hero module</span></h1><p>short branding slogan</p></div><div class="content"><p>some additional text. optional.</p></div><nav class="Menu"><ul><li><a href="/project/#about">about</a></li><li><a href="/project/#usage">usage</a></li><li><a href="/project/#theme-vars">theme vars</a></li></ul></nav></div><div><h2 id="about">about</h2><p>this is the
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link rel="icon" href="/project/favicon.ico"/><script type="application/ld+json">{"@context":"http://schema.org","@type":"website"}</script><link rel="stylesheet" href="/project/magic.css?gUVxeIBun6" integrity="sha384-gUVxeIBun6mz2DbOs+VSvneRixQDjZK+lOFrjCA5kr8BZzO5AuccxHPl+A9uT+lo" crossorigin="anonymous"/></head><body><a class="SkipLink" href="/project/#page">Skip to Content</a><main id="Magic"><div class="Wrapper"><header class="Header"><div><a class="Logo" href="/project/"><svg viewBox="0 0 512 444"><path d="M512 444L256 0 0 444z" fill="#663695"></path><circle cx="256" cy="294" r="130" fill="#fff"></circle><circle cx="256" cy="281" r="40" fill="#663695"></circle><path d="M256 350v44m24-44l1 13c1 27 29 27 29-7m-160-72s46-47 106-47c59 0 106 47 106 47s-47 43-106 43c-60 0-106-43-106-43zm65-75a134 134 0 0189 2" class="stroke"></path><path d="M256 81v53m184 270l-43-29M72 404l43-29" class="stroke white"></path></svg></a><a class="branding" href="/project/"><span>@</span>project</a><nav class="Menu"><ul><li><a href="/project/#installation">setup</a></li><li><a href="/project/#usage">usage</a></li><li><a href="/project/#theme-vars">theme vars</a></li></ul></nav></div></header><div class="Page" id="page"><div id="hero" class="Hero"><div class="LogoWrapper"><a class="Logo" href="/project/"><svg viewBox="0 0 512 444"><path d="M512 444L256 0 0 444z" fill="#663695"></path><circle cx="256" cy="294" r="130" fill="#fff"></circle><circle cx="256" cy="281" r="40" fill="#663695"></circle><path d="M256 350v44m24-44l1 13c1 27 29 27 29-7m-160-72s46-47 106-47c59 0 106 47 106 47s-47 43-106 43c-60 0-106-43-106-43zm65-75a134 134 0 0189 2" class="stroke"></path><path d="M256 81v53m184 270l-43-29M72 404l43-29" class="stroke white"></path></svg></a><h1><span>hero module</span></h1><p>short branding slogan</p></div><div class="content"><p>some additional text. optional.</p></div><nav class="Menu"><ul><li><a href="/project/#about">about</a></li><li><a href="/project/#usage">usage</a></li><li><a href="/project/#theme-vars">theme vars</a></li></ul></nav></div><div><h2 id="about">about</h2><p>this is the
<a href="https://github.com/magic-themes" target="_blank" rel="noopener">@magic-themes</a>
project theme. It can be used as the foundational theme for any kind of project.</p><p>currently, this theme is being used on the following pages:</p><ul><li><a href="https://magic.github.io" target="_blank" rel="noopener">@magic</a></li><li><a href="https://webboot.org" target="_blank" rel="noopener">@webboot</a></li><li><a href="https://grundstein.github.io" target="_blank" rel="noopener">@grundstein</a></li></ul><h3 id="installation">installation</h3><div class="Pre"><div class="menu"><button>copy</button></div><pre><code class="line"><span class="keyword">npm</span> <span class="keyword">install</span> --save --save-exact @magic-themes/project</code></pre></div><h2 id="usage">usage</h2><h3 id="usage-require">require in config.mjs:</h3><div class="Pre lines"><div class="menu"><button>copy</button></div><pre><code class="line"><span class="comment">// config.mjs</span></code><code class="line"></code><code class="line"><span class="keyword">export</span> <span class="keyword">default</span> {</code><code class="line"> <span class="comment">// ... other config</span></code><code class="line"> THEME: <span class="string">&#39;project&#39;</span>,</code><code class="line">}</code></pre></div><p>magic will then find and merge the themes automatically, just as it did on this page</p><div class="ThemeVars"><h2 id="theme-vars">theme vars</h2><h3>colors</h3><p>this theme exports and uses the following colors.</p><ul><li>vars.white: <span class="Bg" style="background-color:#ffffff">#ffffff</span></li><li>vars.neutral: <span class="Bg" style="background-color:#5a5a5a">#5a5a5a</span></li><li><h5>background</h5><ul><li>vars.background.light: <span class="Bg" style="background-color:#e0e0e0">#e0e0e0</span></li><li>vars.background.dark: <span class="Bg" style="background-color:#212121">#212121</span></li></ul></li><li><h5>link</h5><ul><li>vars.link.light: <span class="Bg" style="background-color:#8f6ab4">#8f6ab4</span></li><li>vars.link.dark: <span class="Bg" style="background-color:#8f6ab4">#8f6ab4</span></li><li><h5>link.hover</h5><ul><li>vars.link.hover.light: <span class="Bg" style="background-color:#412162">#412162</span></li><li>vars.link.hover.dark: <span class="Bg" style="background-color:#412162">#412162</span></li></ul></li></ul></li><li><h5>primary</h5><ul><li>vars.primary.neutral: <span class="Bg" style="background-color:rebeccapurple">rebeccapurple</span></li><li>vars.primary.light: <span class="Bg" style="background-color:#8f6ab4">#8f6ab4</span></li><li>vars.primary.dark: <span class="Bg" style="background-color:#412162">#412162</span></li></ul></li><li><h5>text</h5><ul><li>vars.text.light: <span class="Bg" style="background-color:#212121">#212121</span></li><li>vars.text.dark: <span class="Bg" style="background-color:#c4c4c4">#c4c4c4</span></li></ul></li></ul><h4>max page width</h4><p>vars.maxWidth: 1200px</p><h3>fade duration:</h3><p>vars.fadeDuration should be used for all css animations</p><p>vars.fadeDuration: 500ms</p><h3>breakpoints</h3><p>the following width breakpoints exist</p><ul><li>vars.widths.tablet: 500px</li><li>vars.widths.laptop: 1024px</li><li>vars.widths.desktop: 1600px</li></ul><h3>headers</h3><p>the five header sizes look like the following:</p><h1>This is a h1</h1><h2>This is a h2</h2><h3>This is a h3</h3><h4>This is a h4</h4><h5>This is a h5</h5><h3>links</h3><p>links will look like the following:</p><a href="" target="_blank" rel="noopener">This is a link</a></div></div></div><footer class="Footer"><div class="Container"><div class="Menus"><div class="Child Info"><h2>@magic</h2><p>jamstack generator</p><p>created by</p><p>Wizards &amp; Witches</p></div><div class="Child"><h2>projects</h2><ul><li><a href="https://github.com/magic/" target="_blank" rel="noopener">@magic</a></li><li><a href="https://github.com/grundstein/" target="_blank" rel="noopener">@grundstein</a></li><li><a href="https://github.com/webboot/" target="_blank" rel="noopener">@webboot</a></li></ul></div><div class="Child"><h2>social links</h2><ul><li><a href="https://www.npmjs.com/org/magic" target="_blank" rel="noopener">npm</a></li><li><a href="https://github.com/magic" target="_blank" rel="noopener">github</a></li></ul></div></div><div class="Credits">made with a few bits of <a target="_blank" rel="noopener" href="https://magic.github.io/">magic</a></div></div></footer></div></main><script src="/project/magic.js?xP86X1s2PQ" integrity="sha384-xP86X1s2PQ5sv53lDS1md+qrAfg/LnTj8hLdeSVV8Ri4z4u8JB3d6pBZzC2CcB90" crossorigin="anonymous"></script></body></html>
Loading