diff --git a/package-lock.json b/package-lock.json index 2c20f87..36605e5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "eleventy-sass": "^1.3.1", "esm": "^3.2.25", "gsap": "^3.10.4", + "list.js": "^2.3.1", "rss-parser": "^3.12.0", "webpack": "^5.72.1" }, @@ -2804,6 +2805,17 @@ "url": "https://opencollective.com/liquidjs" } }, + "node_modules/list.js": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/list.js/-/list.js-2.3.1.tgz", + "integrity": "sha512-jnmm7DYpKtH3DxtO1E2VNCC9Gp7Wrp/FWA2JxQrZUhVJ2RCQBd57pCN6W5w6jpsfWZV0PCAbTX2NOPgyFeeZZg==", + "dependencies": { + "string-natural-compare": "^2.0.2" + }, + "engines": { + "node": "^6.0 || ^8.0 || ^10.0 || ^12.0 || >=14" + } + }, "node_modules/loader-runner": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", @@ -4555,6 +4567,11 @@ "safe-buffer": "~5.2.0" } }, + "node_modules/string-natural-compare": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-2.0.3.tgz", + "integrity": "sha512-4Kcl12rNjc+6EKhY8QyDVuQTAlMWwRiNbsxnVwBUKFr7dYPQuXVrtNU4sEkjF9LHY0AY6uVbB3ktbkIH4LC+BQ==" + }, "node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -7528,6 +7545,14 @@ "integrity": "sha512-qDj9iiNdB+QNZTR4iKjiQzoHQma7V8Itx5oZG/ZCP7xjebh1LI+s5IG2ZYUbs1ALO6hBzmW36Ptd8RR4eohuDA==", "dev": true }, + "list.js": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/list.js/-/list.js-2.3.1.tgz", + "integrity": "sha512-jnmm7DYpKtH3DxtO1E2VNCC9Gp7Wrp/FWA2JxQrZUhVJ2RCQBd57pCN6W5w6jpsfWZV0PCAbTX2NOPgyFeeZZg==", + "requires": { + "string-natural-compare": "^2.0.2" + } + }, "loader-runner": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", @@ -8907,6 +8932,11 @@ "safe-buffer": "~5.2.0" } }, + "string-natural-compare": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-2.0.3.tgz", + "integrity": "sha512-4Kcl12rNjc+6EKhY8QyDVuQTAlMWwRiNbsxnVwBUKFr7dYPQuXVrtNU4sEkjF9LHY0AY6uVbB3ktbkIH4LC+BQ==" + }, "string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", diff --git a/package.json b/package.json index 891dee0..58835fb 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "eleventy-sass": "^1.3.1", "esm": "^3.2.25", "gsap": "^3.10.4", + "list.js": "^2.3.1", "rss-parser": "^3.12.0", "webpack": "^5.72.1" } diff --git a/src/_includes/components/landing/be-your-own.njk b/src/_includes/components/landing/be-your-own.njk index a0f350a..4545155 100644 --- a/src/_includes/components/landing/be-your-own.njk +++ b/src/_includes/components/landing/be-your-own.njk @@ -23,7 +23,7 @@ {% if pseudoservice.slug in service.pseudoservices %}
- {{ service.name }} embassyos service icon

{{ service.name }}

diff --git a/src/_includes/components/landing/bitcoin.njk b/src/_includes/components/landing/bitcoin.njk index 2404f1e..7a303e3 100644 --- a/src/_includes/components/landing/bitcoin.njk +++ b/src/_includes/components/landing/bitcoin.njk @@ -21,8 +21,8 @@ {{ service.name }} embassyos service icon + alt="{{ service.name }} embassyOS service icon" + alt="{{ service.name }} embassyOS service icon"/> {% endif %} {% endfor %} {% endfor %} diff --git a/src/_includes/components/landing/dev.njk b/src/_includes/components/landing/dev.njk index 74537d3..6ad903f 100644 --- a/src/_includes/components/landing/dev.njk +++ b/src/_includes/components/landing/dev.njk @@ -13,7 +13,7 @@
-
+
screenshot of dockerfile
diff --git a/src/_includes/components/landing/infographics.njk b/src/_includes/components/landing/infographics.njk index a89ea0f..dcfd40c 100644 --- a/src/_includes/components/landing/infographics.njk +++ b/src/_includes/components/landing/infographics.njk @@ -29,6 +29,6 @@ {% include "components/svg/embassyos-network-diagram_red_extended.svg" %}
{% include "components/svg/embassyos-network-diagram_red_extended.svg" %}
- {# {% include "components/svg/embassyos-network-diagram_red_extended.svg" %} #} + {# {% include "components/svg/embassyOS-network-diagram_red_extended.svg" %} #} \ No newline at end of file diff --git a/src/_includes/components/landing/powered-by.njk b/src/_includes/components/landing/powered-by.njk index cac03f3..caa1ec7 100644 --- a/src/_includes/components/landing/powered-by.njk +++ b/src/_includes/components/landing/powered-by.njk @@ -1,8 +1,8 @@
-

Powered by EmbassyOS

+

Powered by embassyOS

- EmbassyOS (EOS) is a browser-based, graphical operating system for a personal server, designed to + embassyOS (eOS) is a browser-based, graphical operating system for a personal server, designed to turn anyone into a system administrator capable of managing their own server. diff --git a/src/_includes/components/svg/stack-new.svg b/src/_includes/components/svg/stack-new.svg index 2d12982..ca3e404 100644 --- a/src/_includes/components/svg/stack-new.svg +++ b/src/_includes/components/svg/stack-new.svg @@ -1,4 +1,4 @@ - + diff --git a/src/_includes/layouts/peripheral.njk b/src/_includes/layouts/peripheral.njk index 3560d61..1b6c462 100644 --- a/src/_includes/layouts/peripheral.njk +++ b/src/_includes/layouts/peripheral.njk @@ -6,13 +6,24 @@ layout: layouts/base.njk {{ content | safe }} - - - - - - - - + + + + + + + + + - \ No newline at end of file + + +{# #} \ No newline at end of file diff --git a/src/assets/js/_hero.js b/src/assets/js/_hero.js index 689a607..82b9f57 100644 --- a/src/assets/js/_hero.js +++ b/src/assets/js/_hero.js @@ -1,18 +1,18 @@ ////////////////////////////////////////// // HERO -gsap.from("#hero-image", { - duration: 1, - //y: "-10rem", - scale: 0.95, - opacity: 0, - filter: "blur(10px)", - delay: 0.5, - }); - gsap.from("#logo", { - duration: 0.5, - y: "-5rem", - opacity: 0, - delay: 1.25, - //ease: "in-out" - }); \ No newline at end of file +gsap.to("#hero-image", { + duration: 1, + //y: "-10rem", + scale: 1, + opacity: 1, + filter: "blur(0px)", + delay: 0.5, +}); +gsap.to("#logo", { + duration: 0.5, + y: 0, + opacity: 1, + delay: 1.25, + //ease: "in-out" +}); diff --git a/src/assets/js/list.min.js b/src/assets/js/list.min.js new file mode 100644 index 0000000..8131881 --- /dev/null +++ b/src/assets/js/list.min.js @@ -0,0 +1,2 @@ +var List;List=function(){var t={"./src/add-async.js":function(t){t.exports=function(t){return function e(r,n,s){var i=r.splice(0,50);s=(s=s||[]).concat(t.add(i)),r.length>0?setTimeout((function(){e(r,n,s)}),1):(t.update(),n(s))}}},"./src/filter.js":function(t){t.exports=function(t){return t.handlers.filterStart=t.handlers.filterStart||[],t.handlers.filterComplete=t.handlers.filterComplete||[],function(e){if(t.trigger("filterStart"),t.i=1,t.reset.filter(),void 0===e)t.filtered=!1;else{t.filtered=!0;for(var r=t.items,n=0,s=r.length;nv.page,a=new g(t[s],void 0,n),v.items.push(a),r.push(a)}return v.update(),r}m(t.slice(0),e)}},this.show=function(t,e){return this.i=t,this.page=e,v.update(),v},this.remove=function(t,e,r){for(var n=0,s=0,i=v.items.length;s-1&&r.splice(n,1),v},this.trigger=function(t){for(var e=v.handlers[t].length;e--;)v.handlers[t][e](v);return v},this.reset={filter:function(){for(var t=v.items,e=t.length;e--;)t[e].filtered=!1;return v},search:function(){for(var t=v.items,e=t.length;e--;)t[e].found=!1;return v}},this.update=function(){var t=v.items,e=t.length;v.visibleItems=[],v.matchingItems=[],v.templater.clear();for(var r=0;r=v.i&&v.visibleItems.lengthe},innerWindow:function(t,e,r){return t>=e-r&&t<=e+r},dotted:function(t,e,r,n,s,i,a){return this.dottedLeft(t,e,r,n,s,i)||this.dottedRight(t,e,r,n,s,i,a)},dottedLeft:function(t,e,r,n,s,i){return e==r+1&&!this.innerWindow(e,s,i)&&!this.right(e,n)},dottedRight:function(t,e,r,n,s,i,a){return!t.items[a-1].values().dotted&&(e==n&&!this.innerWindow(e,s,i)&&!this.right(e,n))}};return function(e){var n=new i(t.listContainer.id,{listClass:e.paginationClass||"pagination",item:e.item||"

  • ",valueNames:["page","dotted"],searchClass:"pagination-search-that-is-not-supposed-to-exist",sortClass:"pagination-sort-that-is-not-supposed-to-exist"});s.bind(n.listContainer,"click",(function(e){var r=e.target||e.srcElement,n=t.utils.getAttribute(r,"data-page"),s=t.utils.getAttribute(r,"data-i");s&&t.show((s-1)*n+1,n)})),t.on("updated",(function(){r(n,e)})),r(n,e)}}},"./src/parse.js":function(t,e,r){t.exports=function(t){var e=r("./src/item.js")(t),n=function(r,n){for(var s=0,i=r.length;s0?setTimeout((function(){e(r,s)}),1):(t.update(),t.trigger("parseComplete"))};return t.handlers.parseComplete=t.handlers.parseComplete||[],function(){var e=function(t){for(var e=t.childNodes,r=[],n=0,s=e.length;n]/g.exec(t)){var e=document.createElement("tbody");return e.innerHTML=t,e.firstElementChild}if(-1!==t.indexOf("<")){var r=document.createElement("div");return r.innerHTML=t,r.firstElementChild}}},a=function(e,r,n){var s=void 0,i=function(e){for(var r=0,n=t.valueNames.length;r=1;)t.list.removeChild(t.list.firstChild)},function(){var r;if("function"!=typeof t.item){if(!(r="string"==typeof t.item?-1===t.item.indexOf("<")?document.getElementById(t.item):i(t.item):s()))throw new Error("The list needs to have at least one item on init otherwise you'll have to add a template.");r=n(r,t.valueNames),e=function(){return r.cloneNode(!0)}}else e=function(e){var r=t.item(e);return i(r)}}()};t.exports=function(t){return new e(t)}},"./src/utils/classes.js":function(t,e,r){var n=r("./src/utils/index-of.js"),s=/\s+/;Object.prototype.toString;function i(t){if(!t||!t.nodeType)throw new Error("A DOM element reference is required");this.el=t,this.list=t.classList}t.exports=function(t){return new i(t)},i.prototype.add=function(t){if(this.list)return this.list.add(t),this;var e=this.array();return~n(e,t)||e.push(t),this.el.className=e.join(" "),this},i.prototype.remove=function(t){if(this.list)return this.list.remove(t),this;var e=this.array(),r=n(e,t);return~r&&e.splice(r,1),this.el.className=e.join(" "),this},i.prototype.toggle=function(t,e){return this.list?(void 0!==e?e!==this.list.toggle(t,e)&&this.list.toggle(t):this.list.toggle(t),this):(void 0!==e?e?this.add(t):this.remove(t):this.has(t)?this.remove(t):this.add(t),this)},i.prototype.array=function(){var t=(this.el.getAttribute("class")||"").replace(/^\s+|\s+$/g,"").split(s);return""===t[0]&&t.shift(),t},i.prototype.has=i.prototype.contains=function(t){return this.list?this.list.contains(t):!!~n(this.array(),t)}},"./src/utils/events.js":function(t,e,r){var n=window.addEventListener?"addEventListener":"attachEvent",s=window.removeEventListener?"removeEventListener":"detachEvent",i="addEventListener"!==n?"on":"",a=r("./src/utils/to-array.js");e.bind=function(t,e,r,s){for(var o=0,l=(t=a(t)).length;o32)return!1;var a=n,o=function(){var t,r={};for(t=0;t=p;b--){var j=o[t.charAt(b-1)];if(C[b]=0===m?(C[b+1]<<1|1)&j:(C[b+1]<<1|1)&j|(v[b+1]|v[b])<<1|1|v[b+1],C[b]&d){var x=l(m,b-1);if(x<=u){if(u=x,!((c=b-1)>a))break;p=Math.max(1,2*a-c)}}}if(l(m+1,a)>u)break;v=C}return!(c<0)}},"./src/utils/get-attribute.js":function(t){t.exports=function(t,e){var r=t.getAttribute&&t.getAttribute(e)||null;if(!r)for(var n=t.attributes,s=n.length,i=0;i=48&&t<=57}function i(t,e){for(var i=(t+="").length,a=(e+="").length,o=0,l=0;o=i&&l=a?-1:l>=a&&o=i?1:i-a}i.caseInsensitive=i.i=function(t,e){return i((""+t).toLowerCase(),(""+e).toLowerCase())},Object.defineProperties(i,{alphabet:{get:function(){return e},set:function(t){r=[];var s=0;if(e=t)for(;s a { font-family: var(--f-accent); - font-size: .8rem; + font-size: max(14px,.8rem); line-height: 1.5; font-weight: 300; //text-transform: uppercase; @@ -100,7 +104,7 @@ footer{ @media only screen and (max-width: 1200px) { footer .groups li > a { - font-size: 2.2vw; + font-size: 2vw; } } diff --git a/src/assets/styles/landing.scss b/src/assets/styles/landing.scss index 38d653a..9b69108 100644 --- a/src/assets/styles/landing.scss +++ b/src/assets/styles/landing.scss @@ -353,3 +353,12 @@ body { transform: rotateY(1turn) rotateX(1turn); } } + +@media screen and (max-width: 500px) { + #hero{ + margin-top: 25vh; + } + .line svg{ + max-height: 40vh; + } +} diff --git a/src/assets/styles/main.scss b/src/assets/styles/main.scss index 2fca62b..d18a80b 100644 --- a/src/assets/styles/main.scss +++ b/src/assets/styles/main.scss @@ -47,6 +47,7 @@ html { //background-color: lime; font-size: 2vmin; + font-size: max(2vmin, 10px); scroll-behavior: smooth; color: var(--c-text-primary); font-family: var(--f-accent); @@ -154,11 +155,10 @@ header{ } &:hover{ svg path{ - stroke-width: 0.4rem; + stroke-width: 0.2rem; stroke: var(--c-text-primary); } svg path:last-child{ - stroke-width: 0.4rem; stroke: var(--c-text-accent); } } @@ -243,6 +243,9 @@ nav{ #hero-image { position: relative; display: flex; + scale: 0.95; + opacity: 0; + filter: blur(10px); img { width: 50rem; max-width: 90vw; diff --git a/src/assets/styles/peripheral.scss b/src/assets/styles/peripheral.scss index cbc9ca4..12dcf43 100644 --- a/src/assets/styles/peripheral.scss +++ b/src/assets/styles/peripheral.scss @@ -1,4 +1,4 @@ -@use 'community'; +@use "community"; main { margin-top: 7rem; @@ -9,7 +9,7 @@ main { background-color: #333; } -#menu{ +#menu { box-shadow: inset 0 -5rem 5rem -2rem rgb(0 0 0 / 40%); } @@ -83,6 +83,7 @@ section#hero { @media only screen and (max-width: 1245px) { section#hero { flex-direction: column; + margin-bottom: 6rem; } } @@ -109,25 +110,30 @@ section#virtues { align-items: flex-start; } } - #logo{ - margin-bottom: -6rem; - h1 { font-size: 5rem; } +#logo { + transform: translateY(-5rem); + opacity: 0; + margin-bottom: -6rem; + h1 { + font-size: 5rem; } +} #hero-image img { margin-top: 0; width: 25rem; - } -.hero--about{ +.hero--about { #hero-image img { margin-top: 0; width: 28rem; } - #logo{ + #logo { margin-bottom: 0; - h1 { font-size: 4.2rem; } + h1 { + font-size: 4.2rem; + } } } @@ -202,8 +208,8 @@ p { /* about */ -section#origin{ - .section__image img{ +section#origin { + .section__image img { transform: rotate(-3deg); } } @@ -223,82 +229,85 @@ section#origin{ box-shadow: 0 3rem 2rem 0rem rgb(0 0 0 / 40%); } p { - font-size: .8rem; + font-size: 0.8rem; line-height: 1.4; } } } section#jobs { - p{ + p { line-height: 1.4; } .job { list-style: none; } - ul, ol { + ul, + ol { display: block; list-style: disc outside none; margin: 1em 0; padding: 0 0 0 2rem; -} -ol { + } + ol { list-style-type: decimal; -} -li { - display: list-item; - list-style: disc; - margin-bottom: .5rem; - &:last-child{ - margin-bottom: 2rem; + } + li { + display: list-item; + list-style: disc; + margin-bottom: 0.5rem; + &:last-child { + margin-bottom: 2rem; + } + } + ul ul, + ol ul { + list-style-type: circle; + margin-left: 15px; + } + ol ol, + ul ol { + list-style-type: lower-latin; + margin-left: 15px; } } -ul ul, ol ul { - list-style-type: circle; - margin-left: 15px; -} -ol ol, ul ol { - list-style-type: lower-latin; - margin-left: 15px; -} -} -section#news{ - ul{ +section#news { + ul { display: flex; flex-direction: column; gap: 4rem; } - li a{ + li a { display: flex; flex-direction: column; - gap: .5rem; + gap: 0.5rem; align-items: flex-start; outline: 1px solid rgb(255 255 255 / 0%); - outline-offset: .5rem; + outline-offset: 0.5rem; transition: var(--t-simple); - &:hover{ + &:hover { outline: 1px solid rgb(255 255 255 / 100%); outline-offset: 2rem; } } - h3{ + h3 { text-transform: unset; color: var(--c-text-primary); } - .creator{ + .creator { border-radius: 999px; background-color: var(--c-text-accent); color: var(--c-text-primary); - padding: .2em .5em; - font-size: .8rem; + padding: 0.2em 0.5em; + font-size: 0.8rem; font-weight: 500; - opacity: .6; + opacity: 0.6; } - .twitter-text{ + .twitter-text { color: var(--c-text-primary); font-size: 1.2rem; line-height: 1.4; margin: 0; } -} \ No newline at end of file +} diff --git a/src/index.njk b/src/index.njk index d993ae2..b24d7a1 100644 --- a/src/index.njk +++ b/src/index.njk @@ -98,6 +98,7 @@ layout: layouts/base.njk + diff --git a/src/news.njk b/src/news.njk index 13562c7..ae61cc0 100644 --- a/src/news.njk +++ b/src/news.njk @@ -39,4 +39,17 @@ layout: layouts/peripheral.njk {% endfor %} -
    \ No newline at end of file + + +{#
    + +
    #} \ No newline at end of file