diff --git a/build.sh b/build.sh
index d4e42ff48..c118f488f 100755
--- a/build.sh
+++ b/build.sh
@@ -1,32 +1,34 @@
echo "Starting build..."
+SOURCE=${BASH_SOURCE[0]}
+DIR_OF_THIS_SCRIPT="$( dirname "$SOURCE" )"
+ABS_DIR_OF_SCRIPT="$( realpath $DIR_OF_THIS_SCRIPT )"
+
# TODO: Check if current version is latest to avoid redundant installation
if [[ -f "tailwindcss" ]]
then
- echo "Tailwind installed"
-else
- # rm tailwindcss
- # checks os and architecture for correct release
- # https://stackoverflow.com/a/8597411
- echo "Installing & building tailwind..."
- ASSET="tailwindcss"
-
- if [[ "$OSTYPE" == "linux-gnu"* ]]; then
- ASSET="$ASSET-linux"
- elif [[ "$OSTYPE" == "darwin"* ]]; then
- ASSET="$ASSET-macos"
- fi
- if [[ "$(uname -m)" == "x86_64"* ]]; then
- ASSET="$ASSET-x64"
- elif [[ "$(uname -m)" == "arm64"* ]]; then
- ASSET="$ASSET-arm64"
- fi
-
- curl -sLO "https://github.com/tailwindlabs/tailwindcss/releases/latest/download/${ASSET}"
- chmod +x $ASSET
- mv $ASSET tailwindcss
+ rm tailwindcss
fi
+# checks os and architecture for correct release
+# https://stackoverflow.com/a/8597411
+echo "Installing & building tailwind..."
+ASSET="tailwindcss"
+
+if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+ ASSET="$ASSET-linux"
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+ ASSET="$ASSET-macos"
+fi
+if [[ "$(uname -m)" == "x86_64"* ]]; then
+ ASSET="$ASSET-x64"
+elif [[ "$(uname -m)" == "arm64"* ]]; then
+ ASSET="$ASSET-arm64"
+fi
+
+curl -sLO "https://github.com/tailwindlabs/tailwindcss/releases/latest/download/${ASSET}"
+chmod +x $ASSET
+mv $ASSET tailwindcss
# initialized and configures tailwind if not configured
@@ -41,6 +43,6 @@ fi
echo "Compiling tailwindcss and building zola project..."
rm -rf public static/css
./tailwindcss -i css/index.css -o ./static/css/index.css --minify
-zola build
+zola --root $ABS_DIR_OF_SCRIPT build
diff --git a/content/_index.md b/content/_index.md
index 83a68cd5c..77539e27e 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -17,7 +17,7 @@ extra:
-
+
diff --git a/content/footer/_index.md b/content/footer/_index.md
index b4cb8f4ff..35d7afa70 100644
--- a/content/footer/_index.md
+++ b/content/footer/_index.md
@@ -4,7 +4,7 @@ description: ""
insert_anchor_links: "left"
template: "partials/footer.html"
extra:
- logoPath: "images/black_threefold.png"
+ logoPath: "images/white_threefold.png"
socialLinks: { Github: "https://github.com/threefoldfoundation", Github2: "https://github.com/threefoldtech", Twitter: "https://twitter.com/threefold_io", Telegram: "https://t.me/threefoldnews" }
---
diff --git a/content/header/index.md b/content/header/index.md
index 80510227f..f668206e1 100644
--- a/content/header/index.md
+++ b/content/header/index.md
@@ -3,15 +3,12 @@ title: "Header"
insert_anchor_links: "left"
template: "partials/header.html"
extra:
- logoPath: "images/black_threefold.png"
- button_Path: "/images/gettft_node_2.png"
+ logoPath: "images/white_threefold.png"
+
---
-- [About]("/about")
-- [Technology]("/technology")
-- [Host]("/host")
-- [Deploy]("/deploy")
-- [Utilization]("/utilization")
+- [Why]("/about")
+- [Product]("/product")
- Info
diff --git a/css/index.css b/css/index.css
index b7a8ef3d3..bbb7d986e 100644
--- a/css/index.css
+++ b/css/index.css
@@ -10,19 +10,35 @@
@import "tailwindcss/utilities";
@import url('https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&family=Raleway:ital,wght@0,100..900;1,100..900&display=swap');
+
/* Custom CSS for header partial */
.backdrop-blur {
-webkit-backdrop-filter: blur(40px);
}
* {
- font-family: "Lato", sans-serif;
+ font-family: "Inter", sans-serif;
}
.bg-semi-white {
background-color: rgba(255, 255, 255, 0.75);
}
+.bg-dark-gradient {
+ background: rgb(15,15,15);
+ background: radial-gradient(circle, rgba(15,15,15,1) 0%, rgb(24, 24, 24) 50%, rgba(15,15,15,1) 100%);
+}
+
+.bg-black1 {
+ background-color: rgba(15,15,15,1);
+}
+
+.bg-transparent {
+ background-color: transparent;
+}
+
+
/* Custom css allowing image styling in markdown */
img[src*="#mx-auto"] {
margin: auto;
@@ -239,12 +255,12 @@ background-color:#5596f5 !important;
h1 {
@apply text-4xl lg:text-6xl font-normal;
color: #2b2b2b;
- font-family: "Lato", sans-serif !important;
+ font-family: "Inter", sans-serif !important;
}
h2 {
@apply text-3xl lg:text-4xl my-4 font-normal leading-none;
color: #2b2b2b;
- font-family: "Lato", sans-serif !important;
+ font-family: "Inter", sans-serif !important;
}
h2 strong {
@apply font-semibold;
@@ -252,28 +268,28 @@ background-color:#5596f5 !important;
h3 {
@apply text-2xl lg:text-3xl my-4 font-extralight;
color: #2b2b2b;
- font-family: "Lato", sans-serif !important;
+ font-family: "Inter", sans-serif !important;
}
h3 strong {
@apply font-normal;
}
h4 {
@apply text-xl lg:text-2xl font-normal tracking-wider;
- font-family: "Lato", sans-serif !important;
+ font-family: "Inter", sans-serif !important;
}
h5 {
- @apply text-lg my-1 tracking-normal font-semibold;
- font-family: "Lato", sans-serif !important;
+ @apply text-lg my-1 tracking-normal font-medium;
+ font-family: "Inter", sans-serif !important;
}
h6 {
@apply text-md not-italic font-normal my-1;
- font-family: "Lato", sans-serif !important;
+ font-family: "Inter", sans-serif !important;
}
p {
@apply text-lg;
color: #3d3d3d;
- font-family: "Lato", sans-serif !important;
+ font-family: "Inter", sans-serif !important;
}
blockquote {
@apply border-l-4 border-gray-400 mx-2 my-2 p-2;
@@ -320,20 +336,20 @@ background-color:#5596f5 !important;
.article h2{
font-size: 2.25rem;
- font-family: "Lato", sans-serif;
+ font-family: "Inter", sans-serif;
line-height: 1.5;
font-weight: 700;
color:#333;
}
.article h1{
- font-family: "Lato", sans-serif;
+ font-family: "Inter", sans-serif;
}
}
.article p{
font-size: 1.125rem;
- font-family: "Lato", sans-serif;
+ font-family: "Inter", sans-serif;
line-height: 1.7;
color:#333
}
@@ -348,7 +364,7 @@ background-color:#5596f5 !important;
.article li{
font-size: 1.125rem;
- font-family: "Lato", sans-serif;
+ font-family: "Inter", sans-serif;
line-height: 1.7;
color:#333
}
@@ -359,7 +375,7 @@ background-color:#5596f5 !important;
}
.main-title {
- font-family: "Lato", sans-serif;
+ font-family: "Inter", sans-serif;
}
@@ -391,7 +407,7 @@ a {
}
header {
- font-family: "Lato", sans-serif;
+ font-family: "Inter", sans-serif;
}
.nav_btn {
@@ -535,15 +551,15 @@ header {
}
.my-test{
- font-family: "Lato", sans-serif;
+ font-family: "Inter", sans-serif;
}
.post-content-text .my-test {
- font-family: "Lato", sans-serif;
+ font-family: "Inter", sans-serif;
line-height: 1.7;
}
.post-content-text h2 {
- font-family: "Lato", sans-serif;
+ font-family: "Inter", sans-serif;
line-height: 1.5;
font-size: 2.25rem;
font-weight: 700;
diff --git a/css/layout.css b/css/layout.css
index 8881cc851..8ba45960d 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -38,11 +38,11 @@ code {
@apply text-gray-500;
}
-.text-blue-dark {
+ /*.text-blue-dark {
/* for dark mode
@apply text-blue-200;
- */
-}
+
+}*/
.text-shadow-titles {
text-shadow: 4px 4px 2px #000;
@@ -85,7 +85,7 @@ a:active {
}
h5 a {
- @apply text-gray-900 font-normal;
+ @apply text-gray-200 font-normal;
}
/*
@@ -381,7 +381,7 @@ blockquote {
}
& ol li {
margin-bottom: 0.5rem;
- font-size: $pokey;
+ font-size: 75%;
}
& li p {
font-size: 100%;
@@ -464,3 +464,8 @@ footer {
width: 40%;
}
}
+
+.bg-dark {
+ background: rgb(15,15,15);
+ background: radial-gradient(circle, rgba(15,15,15,1) 0%, rgb(24, 24, 24) 50%, rgba(15,15,15,1) 100%);
+}
\ No newline at end of file
diff --git a/start.sh b/start.sh
index 34af69b2a..ac927fddf 100755
--- a/start.sh
+++ b/start.sh
@@ -1,48 +1,25 @@
-set +ex
-# Check if tailwindcss is already installed
-if command -v tailwindcss &> /dev/null; then
- echo "tailwindcss is already installed."
-else
- # checks OS and architecture for correct release
- echo "Installing & building tailwind..."
-
- ASSET="tailwindcss"
-
- if [[ "$OSTYPE" == "linux-gnu"* ]]; then
- ASSET="$ASSET-linux"
- elif [[ "$OSTYPE" == "darwin"* ]]; then
- ASSET="$ASSET-macos"
- fi
- if [[ "$(uname -m)" == "x86_64"* ]]; then
- ASSET="$ASSET-x64"
- elif [[ "$(uname -m)" == "arm64"* ]]; then
- ASSET="$ASSET-arm64"
- fi
- pushd /tmp
- curl -sLO "https://github.com/tailwindlabs/tailwindcss/releases/latest/download/${ASSET}"
- chmod +x $ASSET
- mv $ASSET /usr/local/bin/tailwindcss
- popd
+# builds if executable isn't foound
+if [[ ! -f "tailwindcss" ]]
+then
+ sh build.sh
fi
-source ./env.sh
+
# initialized and configures tailwind if not configured
-if [ ! -f "tailwind.config.js" ]
+if [[ ! -f "tailwind.config.js" ]]
then
./tailwindcss init
sed -i '' "s| content: \\[\\],| content: \\['./templates/**/*.html'\\],|g" tailwind.config.js
fi
# compiles tailwind css & launches locally
-# rm -rf public static/css
-# ./tailwindcss -i css/index.css -o ./static/css/index.css --watch
-# zola serve &
-# compiles tailwind css for prod & builds project
-# ./tailwindcss -i css/index.css -o ./static/css/index.css --minify
-# zola build
-# # kills zola and tw bg processes on interrupt
-# trap 'kill $(jobs -p); exit 1' INT
-# wait
rm -rf public static/css
-tailwindcss -i css/index.css -o ./static/css/index.css --minify
-zola build -o ~/Documents/web/$NAME/
-open ~/Documents/web/$NAME/index.html
\ No newline at end of file
+./tailwindcss -i css/index.css -o ./static/css/index.css --watch & zola serve &
+
+# compiles tailwind css for prod & builds project
+./tailwindcss -i css/index.css -o ./static/css/index.css --minify
+zola build
+
+# kills zola and tw bg processes on interrupt
+trap 'kill $(jobs -p); exit 1' INT
+wait
+
diff --git a/static/images/banner.gif b/static/images/banner.gif
new file mode 100644
index 000000000..dd9c2fe9a
Binary files /dev/null and b/static/images/banner.gif differ
diff --git a/static/images/banner2.gif b/static/images/banner2.gif
new file mode 100644
index 000000000..3e9676b79
Binary files /dev/null and b/static/images/banner2.gif differ
diff --git a/static/images/getanode.png b/static/images/getanode.png
new file mode 100644
index 000000000..15280612b
Binary files /dev/null and b/static/images/getanode.png differ
diff --git a/static/images/gettft_node_21.png b/static/images/gettft_node_21.png
new file mode 100644
index 000000000..68036899b
Binary files /dev/null and b/static/images/gettft_node_21.png differ
diff --git a/static/images/map2.png b/static/images/map2.png
new file mode 100644
index 000000000..e9415cfd0
Binary files /dev/null and b/static/images/map2.png differ
diff --git a/static/images/map_white.png b/static/images/map_white.png
new file mode 100644
index 000000000..1fb1e693f
Binary files /dev/null and b/static/images/map_white.png differ
diff --git a/static/images/tf_dark.png b/static/images/tf_dark.png
new file mode 100644
index 000000000..3f360ec1c
Binary files /dev/null and b/static/images/tf_dark.png differ
diff --git a/static/images/tf_dark_2.png b/static/images/tf_dark_2.png
new file mode 100644
index 000000000..dd36696cf
Binary files /dev/null and b/static/images/tf_dark_2.png differ
diff --git a/static/images/white_threefold.png b/static/images/white_threefold.png
new file mode 100644
index 000000000..db0f8aeb5
Binary files /dev/null and b/static/images/white_threefold.png differ
diff --git a/tailwind.config.js b/tailwind.config.js
index dcd4482ca..6d6f71ab5 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -4,6 +4,27 @@ module.exports = {
content: [
'./templates/**/*.html'
],
+ safelist: [
+ {
+ pattern: /(-|)(ml|mr)-(4|8|12|16|20|24|28)/,
+ variants: [
+ 'sm', 'md', 'lg',
+ 'first', 'first:sm', 'first:md', 'first:lg',
+ 'last', 'last:sm', 'last:md', 'last:lg'
+ ],
+ },
+ {
+ pattern: /(pt|pb)-(0)/,
+ variants: [
+ '!', 'lg',
+ 'first', 'first:sm', 'first:md', 'first:lg',
+ 'last', 'last:sm', 'last:md', 'last:lg'
+ ],
+ },
+ {
+ pattern: /bg-teal-(50|100|200|300|400|500|600|700|800|900)/, // Added teal color safelist
+ }
+ ],
darkMode: false,
important: true,
theme: {
@@ -59,8 +80,13 @@ module.exports = {
from: { transform: 'translateX(0)' },
to: { transform: 'translateX(-100%)' },
}
- }
+ },
+ fontFamily: {
+ sans: ['Inter', 'sans-serif'],
+ },
},
},
- plugins: [], // if we add forms, do it here
+ plugins: [
+ require('@tailwindcss/aspect-ratio'),
+ ], // if we add forms, do it here
}
diff --git a/templates/_default/base.html b/templates/_default/base.html
index 72e998c41..10e0805b2 100644
--- a/templates/_default/base.html
+++ b/templates/_default/base.html
@@ -3,7 +3,7 @@
{% include "partials/head.html" %}
{% include "partials/header.html" %}
-