Skip to content

Commit

Permalink
Merge pull request #223 from mortendk/styleguide-menu-test
Browse files Browse the repository at this point in the history
Styleguide menu test
  • Loading branch information
mortendk committed Jan 4, 2023
2 parents 8aa7502 + 0adf004 commit 87d6ca4
Show file tree
Hide file tree
Showing 10 changed files with 146 additions and 4,406 deletions.
4,349 changes: 71 additions & 4,278 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "saga11",
"version": "0.7.3beta",
"version": "0.7.4beta",
"description": "Website builder based on 11ty & netlifycms",
"main": "eleventy.config.js",
"scripts": {
Expand All @@ -20,7 +20,7 @@
"author": "mortendk",
"license": "MIT",
"devDependencies": {
"@11ty/eleventy": "^2.0.0-canary.18",
"@11ty/eleventy": "^2.0.0-canary.23",
"@11ty/eleventy-fetch": "^3.0.0",
"@11ty/eleventy-img": "^2.0.1",
"@11ty/eleventy-navigation": "^0.3.5",
Expand All @@ -29,7 +29,7 @@
"@tailwindcss/forms": "^0.5.3",
"@tailwindcss/typography": "^0.5.4",
"luxon": "^3.0.1",
"tailwindcss": "^3.1.6"
"tailwindcss": "^3.2.0"
},
"dependencies": {
"calendar-link": "^2.2.0",
Expand Down
41 changes: 0 additions & 41 deletions src/content/styleguide/02-navigation/01-menu.njk

This file was deleted.

2 changes: 1 addition & 1 deletion src/content/styleguide/02-navigation/03-nav-pre-next.njk
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
title: Nav Pre & Next

---
todo
How to add pre next ?
{% include "nav/post-pre-next.njk" %}
23 changes: 23 additions & 0 deletions src/content/styleguide/02-navigation/10-some.njk
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@
---
title: Navigation SoMe

some:
pinterest_verification: true
mastodonme: true
youtube: true
github: true
soundcloud: true
facebook: true
mastodon:
discord: true
rss: true,
instagram: true
twitter: true
twitch: true
dribble: true
patreon: true
coundcloud: true
bandcamp: true
tiktok: true
pinterest: true
linkedin: true


---

{% include "nav/socialmedia.njk" %}
1 change: 0 additions & 1 deletion src/content/styleguide/05-components/40share.njk
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ title: Share
---



{% include "share.njk" %}


2 changes: 1 addition & 1 deletion src/content/styleguide/09-global/01-header.njk
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
title: Header
---

{# {% include "header.njk" %} #}
{% include "header.njk" %}
4 changes: 0 additions & 4 deletions src/content/styleguide/09-global/20-404.njk
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,4 @@
title: 404 page
---


<a href="/404.html" class="underline" target="_blank">404 page</a>

<a href="/pwa-splashscreen/" class="underline" target="_blank">PWA screen</a>
<a href="/pwa-splashscreen-dark/" class="underline" target="_blank">PWA screen darm</a>
60 changes: 15 additions & 45 deletions src/themes/grunn/assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -1489,10 +1489,6 @@ form button:focus {
top: 0px;
}

.left-2 {
left: 0.5rem;
}

.right-2 {
right: 0.5rem;
}
Expand All @@ -1505,22 +1501,18 @@ form button:focus {
bottom: 1rem;
}

.top-8 {
top: 2rem;
.left-2 {
left: 0.5rem;
}

.right-96 {
right: 24rem;
.z-20 {
z-index: 20;
}

.z-50 {
z-index: 50;
}

.z-20 {
z-index: 20;
}

.z-10 {
z-index: 10;
}
Expand Down Expand Up @@ -1712,18 +1704,10 @@ form button:focus {
height: 20rem;
}

.h-0 {
height: 0px;
}

.min-h-screen {
min-height: 100vh;
}

.min-h-full {
min-height: 100%;
}

.w-full {
width: 100%;
}
Expand Down Expand Up @@ -1808,10 +1792,6 @@ form button:focus {
width: 1536px;
}

.w-0 {
width: 0px;
}

.max-w-screen-xl {
max-width: 1280px;
}
Expand Down Expand Up @@ -2170,11 +2150,6 @@ form button:focus {
background-color: rgb(229 231 235 / var(--tw-bg-opacity));
}

.bg-background-50 {
--tw-bg-opacity: 1;
background-color: rgb(248 250 252 / var(--tw-bg-opacity));
}

.bg-white {
--tw-bg-opacity: 1;
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
Expand Down Expand Up @@ -2263,15 +2238,20 @@ form button:focus {
background-color: rgb(6 182 212 / var(--tw-bg-opacity));
}

.bg-black {
.bg-neutral-800 {
--tw-bg-opacity: 1;
background-color: rgb(0 0 0 / var(--tw-bg-opacity));
background-color: rgb(31 41 55 / var(--tw-bg-opacity));
}

.bg-black\/70 {
background-color: rgb(0 0 0 / 0.7);
}

.bg-black {
--tw-bg-opacity: 1;
background-color: rgb(0 0 0 / var(--tw-bg-opacity));
}

.bg-orange-100 {
--tw-bg-opacity: 1;
background-color: rgb(255 237 213 / var(--tw-bg-opacity));
Expand Down Expand Up @@ -2312,11 +2292,6 @@ form button:focus {
background-color: rgb(107 114 128 / var(--tw-bg-opacity));
}

.bg-neutral-800 {
--tw-bg-opacity: 1;
background-color: rgb(31 41 55 / var(--tw-bg-opacity));
}

.bg-success-600 {
--tw-bg-opacity: 1;
background-color: rgb(101 163 13 / var(--tw-bg-opacity));
Expand Down Expand Up @@ -2477,6 +2452,10 @@ form button:focus {
text-align: right;
}

.font-mono {
font-family: firacoda;
}

.font-sans {
font-family: barlow;
}
Expand All @@ -2485,10 +2464,6 @@ form button:focus {
font-family: robotoslap;
}

.font-mono {
font-family: firacoda;
}

.text-5xl {
font-size: 3rem;
line-height: 1;
Expand Down Expand Up @@ -3148,11 +3123,6 @@ pre[class*="language-"] {
background-color: rgb(125 211 252 / var(--tw-bg-opacity));
}

.hover\:bg-red-50:hover {
--tw-bg-opacity: 1;
background-color: rgb(254 242 242 / var(--tw-bg-opacity));
}

.hover\:text-sky-700:hover {
--tw-text-opacity: 1;
color: rgb(3 105 161 / var(--tw-text-opacity));
Expand Down
64 changes: 32 additions & 32 deletions src/themes/grunn/includes/share.njk
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,40 @@
{% set thisurl = env.url + page.url %}

<div class="flex flex-row space-x-4 mt-4 items-center">
{# pinterest #}
<a
class="block w-8"
href="http://pinterest.com/pin/create/link/?url={{ thisurl }}"
target="_blank" rel="noopener noreferrer nofollow">
<div class="sr-only">pinterest</div>
{% include "svg/some/pinterest.svg" %}
</a>
{# pinterest #}
<a
class="block w-8"
href="http://pinterest.com/pin/create/link/?url={{ thisurl }}"
target="_blank" rel="noopener noreferrer nofollow">
<div class="sr-only">pinterest</div>
{% include "svg/some/pinterest.svg" %}
</a>

{# twitter #}
<a
class="block w-8"
href="https://twitter.com/intent/tweet?text={{thisurl}}%20%23hashtag%20%40{{some.twitter}}"
target="_blank" rel="noopener noreferrer nofollow">
<div class="sr-only">Twitter</div>
{% include "svg/some/twitter.svg" %}
</a>
{# twitter #}
<a
class="block w-8"
href="https://twitter.com/intent/tweet?text={{thisurl}}%20%23hashtag%20%40{{some.twitter}}"
target="_blank" rel="noopener noreferrer nofollow">
<div class="sr-only">Twitter</div>
{% include "svg/some/twitter.svg" %}
</a>

{# fb #}
<a
class="block w-8"
href="https://www.facebook.com/sharer/sharer.php?u={{ thisurl }}"
target="_blank" rel="noopener noreferrer nofollow">
<div class="sr-only">Facebook</div>
{% include "svg/some/facebook.svg" %}
</a>
{# fb #}
<a
class="block w-8"
href="https://www.facebook.com/sharer/sharer.php?u={{ thisurl }}"
target="_blank" rel="noopener noreferrer nofollow">
<div class="sr-only">Facebook</div>
{% include "svg/some/facebook.svg" %}
</a>

{# linkedin #}
<a
class="block w-8"
target="_blank" rel="noopener noreferrer nofollow"
href="https://www.linkedin.com/shareArticle?mini=true&amp;url={{ thisurl }}&amp;title={{title}}&amp;summary={{teaser}}&amp;source={{site.title}}">
<div class="sr-only">Linkedin</div>
{% include "svg/some/linkedin.svg" %}
</a>
{# linkedin #}
<a
class="block w-8"
target="_blank" rel="noopener noreferrer nofollow"
href="https://www.linkedin.com/shareArticle?mini=true&amp;url={{ thisurl }}&amp;title={{title}}&amp;summary={{teaser}}&amp;source={{site.title}}">
<div class="sr-only">Linkedin</div>
{% include "svg/some/linkedin.svg" %}
</a>

</div>

0 comments on commit 87d6ca4

Please sign in to comment.