ourworld_web/www_ow_freezone
Archived
20
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

ZZMerge branch 'development'

Browse Source
This commit is contained in:
Ehab Hassan 2023-05-18 15:33:32 +03:00
commit ee676ded3e
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
README.md
View File

@ -9,6 +9,31 @@ Last Updated: March 2023
- For any suggestions or improvement ideas please - For any suggestions or improvement ideas please
Create an issue on: https://github.com/threefoldfoundation/www_ourworld_tf/issues 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. <br>
__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).

10
templates/shortcodes/row.html
View File

@ -85,13 +85,13 @@ Parameters:
{% elif "wide" in margin %} {% elif "wide" in margin %}
{% set margin_class = " mx-4 sm:mx-8 md:mx-12 lg:mx-16 xl:mx-20" %} {% set margin_class = " mx-4 sm:mx-8 md:mx-12 lg:mx-16 xl:mx-20" %}
{% elif "moderate" in margin %} {% 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 %} {% 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 %} {% 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 %} {% 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 %} {% endif %}
{% if "lean-left" in margin %} {% if "lean-left" in margin %}
{% set margin = margin_class | replace(from=" ", to=" first:")%} {% set margin = margin_class | replace(from=" ", to=" first:")%}
@ -117,7 +117,7 @@ Parameters:
{% if style %} {% if style %}
{% if "center" in 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 " %} {% set col_class = col_class ~ " flex-1 " %}
{% endif %} {% endif %}