From 0c8acf33ce44cb188c427a613b899e8e960ab51b Mon Sep 17 00:00:00 2001 From: sasha-astiadi <43240801+sasha-astiadi@users.noreply.github.com> Date: Fri, 12 May 2023 17:35:38 +0200 Subject: [PATCH 1/2] Update README.md --- README.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/README.md b/README.md index 7841ff3..49def3b 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,31 @@ Last Updated: March 2023 - For any suggestions or improvement ideas please Create an issue on: https://github.com/threefoldfoundation/www_ourworld_tf/issues +## Administrators +[ThreeFold's Web Admins](https://github.com/orgs/threefoldfoundation/teams/team_web_admin) + +## Contribution Procedure + +![readme](https://user-images.githubusercontent.com/43240801/236867088-56c95abd-510c-4202-b0c5-317cdfb75cb3.png) + +It is highly important to follow this procedure to contribute to the website content.
+__WARNING__: DO NOT commit straight into __master__ / __development__ branch. + +1. Create an Issue +Feel free to [create a new issue](https://github.com/threefoldfoundation/www_threefold_io/issues/new) to report an error on the website, or if you have any suggestions on website improvements. + +2. Make your own branch from __'development'__ branch. +by creating a new branch from 'Master' you will be provided with the latest copy of the live website content. + +3. Add your edits into your own branch via code editor locally, and push your local changes online. WARNING: DO NOT add your edits straight into __master__ / __development__ branch. + +5. Create a PR to merge your own branch into '**development**', and assign one of [ThreeFold's Web Admins](https://github.com/orgs/threefoldfoundation/teams/team_web_admin) on your PR as reviewer, or assign @sasha-astiadi as reviewer. + +7. When PR is approved, you can see your changes on staging env on www2.threefold.io (development branch) + +8. Admin will then create a PR to merge 'development' into into '**maste**r' (production branch) + +10. When PR is approved, you can see your changes live on production (master branch). From 53015c8e13e565ba820321b01bc9e7350e8d52b1 Mon Sep 17 00:00:00 2001 From: ehab-hassan Date: Thu, 18 May 2023 15:31:46 +0300 Subject: [PATCH 2/2] fix margin --- templates/shortcodes/row.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/shortcodes/row.html b/templates/shortcodes/row.html index 0285595..a45eecb 100644 --- a/templates/shortcodes/row.html +++ b/templates/shortcodes/row.html @@ -85,13 +85,13 @@ Parameters: {% elif "wide" in margin %} {% set margin_class = " mx-4 sm:mx-8 md:mx-12 lg:mx-16 xl:mx-20" %} {% elif "moderate" in margin %} - {% set margin_class = " mx-8 sm:mx-16 md:mx-20 lg:mx-28" %} + {% set margin_class = " mx-4 sm:mx-16 md:mx-20 lg:mx-28" %} {% elif "narrow" in margin %} - {% set margin_class = " mx-12 sm:mx-20 md:mx-28 lg:mx-40" %} + {% set margin_class = " mx-4 sm:mx-20 md:mx-28 lg:mx-40" %} {% elif "tight" in margin %} - {% set margin_class = " mx-20 sm:mx-32 md:mx-40 lg:mx-80 xl:mx-96" %} + {% set margin_class = " mx-4 sm:mx-32 md:mx-40 lg:mx-80 xl:mx-96" %} {% elif "header" in margin %} - {% set margin_class = " mx-12 sm:mx-20 md:mx-28 lg:mx-40 my-10" %} + {% set margin_class = " mx-4 sm:mx-20 md:mx-28 lg:mx-40 my-10" %} {% endif %} {% if "lean-left" in margin %} {% set margin = margin_class | replace(from=" ", to=" first:")%} @@ -117,7 +117,7 @@ Parameters: {% if style %} {% if "center" in style %} - {% set row_class = row_class ~ " text-center items-center mx-auto " %} + {% set row_class = row_class ~ " text-center items-center" %} {% set col_class = col_class ~ " flex-1 " %} {% endif %}