diff --git a/README.md b/README.md index 2510524..5a16a23 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ # Fccan Fort Collins Colorado Website -[![Netlify Status](https://api.netlify.com/api/v1/badges/5a05781c-e452-4664-8407-83473d8f8b0a/deploy-status)](https://app.netlify.com/sites/fuerza-latina/deploys) +[![Netlify Status](https://api.netlify.com/api/v1/badges/077425e5-d667-4fee-afb2-aac79195beea/deploy-status)](https://app.netlify.com/sites/fccan/deploys) This is the repo for https://fccan.com. Fccan is an organization based in community focused on furthering economic, social, and environmental justice, sustainability, human rights, and peace for all by building coalitions, developing strategies and actions, and supporting existing progressive organizations. This site functions off the following technologies: [Jekyll](https://jekyllrb.com/) [netlify-cms](https://www.netlifycms.org/). - [netlify](https://app.netlify.com/) (team page: https://app.netlify.com/sites/fuerza-latina/overview) + [netlify](https://app.netlify.com/) (team page: https://app.netlify.com/sites/fccan/overview) Using these technologies, we can obtain the following: - static site generation (no backend servers) diff --git a/_config.yml b/_config.yml index ca113b0..fc35ae7 100644 --- a/_config.yml +++ b/_config.yml @@ -18,15 +18,17 @@ # You can create any custom variable you would like, and they will be accessible # in the templates via {{ site.myvariable }}. -title: Fuerza Latina +title: +title_short: FCCAN email: info@fccan.org description: >- # this means to ignore newlines until "baseurl:" - Fuerza Latina is an organizaitions of immigrants and allies - dedicated to educating, informaing, organizing & promoting - change to facilitate an imporved quality of life for immigrants - in Nothern Colorado. -url: "https://fueralatinafoco.org" # the base hostname & protocol for your site, e.g. http://example.com + FCCAN’s mission is to create community based on furthering economic, + social, and environmental justice, sustainability, human rights, and + peace for all by building coalitions, developing strategies and + actions, and supporting existing progressive organizations. +url: "https://fccan.org" # the base hostname & protocol for your site, e.g. http://example.com twitter_username: FCCAN2 +mast-background: media/IMG_2882.jpeg # Build settings plugins: @@ -76,7 +78,7 @@ collections: social: - name: Fuerza Latina + name: FCCAN links: - https://twitter.com/FCCAN2 diff --git a/_data/menus.yml b/_data/menus.yml index 50dd652..94147ad 100644 --- a/_data/menus.yml +++ b/_data/menus.yml @@ -15,21 +15,15 @@ header: - title: Our Staff title-es: Nuestro Personal url: our-staff -- title: Our Affiliates - title-es: Our Affiliates +- title: Affiliates + title-es: Affiliates url: affiliates -- title: Healing Justice - title-es: Healing Justice - url: healing-justice -- title: Take Action - title-es: Take Action - url: take-action -- title: TimePeace - title-es: TimePeace +- title: Programs + title-es: Programas + url: programs +- title: Blog + title-es: Blog url: blog -- title: Donate - title-es: Donate - url: donate -- title: Contact Us - title-es: Contact Us - url: contact \ No newline at end of file +- title: Get Involved + title-es: Involucrarse + url: get-involved \ No newline at end of file diff --git a/_includes/affliates.html b/_includes/affiliates.html similarity index 100% rename from _includes/affliates.html rename to _includes/affiliates.html diff --git a/_includes/contact.html b/_includes/contact.html index 865a3a9..9c50921 100644 --- a/_includes/contact.html +++ b/_includes/contact.html @@ -8,6 +8,39 @@

{{ section.title }}

+ + + +
+
+
+

Subscribe to our FCCAN newletter!

+
* indicates required
+
+ + +
+
+ + +
+ +
+
+ + +
+
+
+
+
+ + {% for action in section.actions %} {% assign fa = action.icon_type | default: "fas" %}
diff --git a/_includes/getinvolved.html b/_includes/getinvolved.html index 9ede0e3..9ca7a84 100644 --- a/_includes/getinvolved.html +++ b/_includes/getinvolved.html @@ -8,7 +8,6 @@
-
@@ -27,12 +26,45 @@

Contact Us!

-
-
-
-
- {% if page.lang == "es" %}Inscribirse en la lista de correo!{% else %}Subscribe to Our Email Newsletter!{% endif %} -
+
+ + + +
+
+
+

Subscribe to our FCCAN newletter!

+
* indicates required
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+
+ +
+
-
+ +
+ +
\ No newline at end of file diff --git a/_includes/guiding-values.html b/_includes/guiding-values.html new file mode 100644 index 0000000..9a43c30 --- /dev/null +++ b/_includes/guiding-values.html @@ -0,0 +1,8 @@ +
+
+ {% for value in site.values %} +

{% if page.lang == "es" %}{{ value.title-es | newline_to_br }}{% else %}{{ value.title-en | newline_to_br }}{% endif %} + {% if page.lang == "es" %}{{ value.body-es | newline_to_br | markdownify }}{% else %}{{ value.body-en | newline_to_br | markdownify }}{% endif %}

+ {% endfor %} +
+
\ No newline at end of file diff --git a/_includes/nav.html b/_includes/nav.html index 0e97d96..c8c087c 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -12,6 +12,8 @@
  • @@ -39,7 +60,7 @@ - + diff --git a/_includes/resources.html b/_includes/resources.html index f4cfd11..e969bed 100644 --- a/_includes/resources.html +++ b/_includes/resources.html @@ -87,11 +87,11 @@

    {% if page.lang == "es" %}{{ resource.title-es | ne {% if community_resource == 0 %} {% endif %} -

    Important Fuerza Latina Resources

    - {% assign fuerza_resource=0 %} +

    Important Fccan Resources

    + {% assign fccan_resource=0 %} {% for resource in site.resources limit:5%} - {% if resource.resource-type == "Fuerza Resource" %} - {% capture fuerza_resource %}{% increment fuerza_resource %}{% endcapture %} + {% if resource.resource-type == "fccan Resource" %} + {% capture fccan_resource %}{% increment fccan_resource %}{% endcapture %}

    {% if page.lang == "es" %}{{ resource.title-es | newline_to_br }}{% else %}{{ resource.title-en | newline_to_br }}{% endif %}

    diff --git a/_layouts/base.html b/_layouts/base.html index d45e042..d49c447 100644 --- a/_layouts/base.html +++ b/_layouts/base.html @@ -7,7 +7,7 @@ - {% assign title_is_not_empty = page.title | is_not_empty %}{% if title_is_not_empty %}{{ page.title }} - {% endif %}{{ site.title }} + {% assign title_is_not_empty = page.title | is_not_empty %}{% if title_is_not_empty %}{{ page.title }} - {% endif %}{{ site.title_short }} diff --git a/_site/README.md b/_site/README.md index 300a794..5a16a23 100644 --- a/_site/README.md +++ b/_site/README.md @@ -1,13 +1,13 @@ -# Fuerza Latina Fort Collins Colorado Website +# Fccan Fort Collins Colorado Website -[![Netlify Status](https://api.netlify.com/api/v1/badges/5a05781c-e452-4664-8407-83473d8f8b0a/deploy-status)](https://app.netlify.com/sites/fuerza-latina/deploys) +[![Netlify Status](https://api.netlify.com/api/v1/badges/077425e5-d667-4fee-afb2-aac79195beea/deploy-status)](https://app.netlify.com/sites/fccan/deploys) -This is the repo for https://fuerzalatinafoco.com. Fuerza Latina is an organization of immigrants and allies dedicated to educating, informing, organizing, and promoting change to facilitate an improved quality of life for immigrants in our community. +This is the repo for https://fccan.com. Fccan is an organization based in community focused on furthering economic, social, and environmental justice, sustainability, human rights, and peace for all by building coalitions, developing strategies and actions, and supporting existing progressive organizations. This site functions off the following technologies: [Jekyll](https://jekyllrb.com/) [netlify-cms](https://www.netlifycms.org/). - [netlify](https://app.netlify.com/) (team page: https://app.netlify.com/sites/fuerza-latina/overview) + [netlify](https://app.netlify.com/) (team page: https://app.netlify.com/sites/fccan/overview) Using these technologies, we can obtain the following: - static site generation (no backend servers) @@ -17,11 +17,11 @@ Using these technologies, we can obtain the following: ## How to run Website // CMS locally for development purposes - Install ruby/jekyll (https://jekyllrb.com/docs/installation/) - Obtain access to repo, contact info@fccan.org - - `git clone https://github.com/pbjtime/fuerza-latina.git` - - `cd fuerza-latina` + - `git clone https://github.com/pbjtime/fccan.git` + - `cd fccan` - `bundle exec jekyll serve --host 0.0.0.0` - You can now access the site: http://0.0.0.0:4000 (replace 0.0.0.0 with the local-link if hosting locally http://127.0.0.1:4000 or public address of your computer.) **Optional:** In another terminal (to run the cms locally): - - `cd fuerza-latina` + - `cd fccan` - `PORT=8076 npx netlify-cms-proxy-server` \ No newline at end of file diff --git a/_site/about.html b/_site/about.html index 4a9a6f7..4672667 100644 --- a/_site/about.html +++ b/_site/about.html @@ -7,7 +7,7 @@ - About Us - Fuerza Latina + About Us - FCCAN @@ -29,17 +29,16 @@ -About Us | Fuerza Latina +About Us - - + + - +{"@type":"WebPage","headline":"About Us","url":"http://0.0.0.0:4000/about","description":"FCCAN’s mission is to create community based on furthering economic, social, and environmental justice, sustainability, human rights, and peace for all by building coalitions, developing strategies and actions, and supporting existing progressive organizations.","@context":"https://schema.org"} @@ -52,11 +51,13 @@
    + +
    +
    +
    +
    +

    Affiliates

    +
    +
    +
    +
    +
    + + + + +
    +
    +

    Our Affliates

    + + + + + + +

    Important Fuerza Latina Resources

    + + + + + + + + +
    + + + +
    +
    +
    + Find us on our social media!
    + + + + + + + + + +
    +
    +
    + + + + + + + + + + + + + + diff --git a/_site/assets/css/creative.css b/_site/assets/css/creative.css index a8610d3..c426c6a 100644 --- a/_site/assets/css/creative.css +++ b/_site/assets/css/creative.css @@ -3443,8 +3443,7 @@ input[type=button].btn-block { position: relative; display: flex; flex-wrap: wrap; - align-items: center; - padding: 0.5rem 1rem; } + align-items: center; } .navbar .container, .navbar .container-fluid, @@ -3461,8 +3460,6 @@ input[type=button].btn-block { font-weight: bold; text-transform: uppercase; display: inline-block; - padding-top: 0.3125rem; - padding-bottom: 0.3125rem; margin-right: 1rem; font-size: 1.25rem; line-height: inherit; @@ -8433,7 +8430,7 @@ hr.light { header.masthead { padding-top: 10rem; padding-bottom: calc(10rem - 4.5rem); - background: linear-gradient(to bottom, rgba(92, 77, 66, 0.8) 0%, rgba(92, 77, 66, 0.8) 100%), url("../img/bg-masthead.jpg"); + background: linear-gradient(to bottom, rgba(92, 77, 66, 0.8) 0%, rgba(92, 77, 66, 0.8) 100%), url("../../../media/IMG_2882.jpeg"); background-position: center; background-repeat: no-repeat; background-attachment: scroll; diff --git a/_site/assets/img/members/person1.jpg b/_site/assets/img/members/person1.jpg deleted file mode 100644 index ef364cc..0000000 Binary files a/_site/assets/img/members/person1.jpg and /dev/null differ diff --git a/_site/assets/img/members/person2.jpg b/_site/assets/img/members/person2.jpg deleted file mode 100644 index cd0994f..0000000 Binary files a/_site/assets/img/members/person2.jpg and /dev/null differ diff --git a/_site/assets/img/members/person3.jpg b/_site/assets/img/members/person3.jpg deleted file mode 100644 index 1b39721..0000000 Binary files a/_site/assets/img/members/person3.jpg and /dev/null differ diff --git a/_site/assets/img/members/person5.jpg b/_site/assets/img/members/person5.jpg deleted file mode 100644 index b8c6805..0000000 Binary files a/_site/assets/img/members/person5.jpg and /dev/null differ diff --git a/_site/assets/img/members/person6.jpg b/_site/assets/img/members/person6.jpg deleted file mode 100644 index c01820f..0000000 Binary files a/_site/assets/img/members/person6.jpg and /dev/null differ diff --git a/_site/assets/img/members/person7.jpg b/_site/assets/img/members/person7.jpg deleted file mode 100644 index edd59b1..0000000 Binary files a/_site/assets/img/members/person7.jpg and /dev/null differ diff --git a/_site/blog.html b/_site/blog.html new file mode 100644 index 0000000..f601bcf --- /dev/null +++ b/_site/blog.html @@ -0,0 +1,204 @@ + + + + + + + + + + Blog - FCCAN + + + + + + + + + + + + + + + + + + +Blog + + + + + + + + + + + + + + +
  • + + +
    +
    +
    +
    +

    Blog

    +
    +
    +
    +
    +
    + + + + +
    + + +
    + + + + + + + + + + + + + + + + + + diff --git a/_site/es/about.html b/_site/es/about.html index 1533a2d..2b6859f 100644 --- a/_site/es/about.html +++ b/_site/es/about.html @@ -7,7 +7,7 @@ - Sobre Nosotros - Fuerza Latina + Sobre Nosotros - FCCAN @@ -29,17 +29,16 @@ -Sobre Nosotros | Fuerza Latina +Sobre Nosotros - - + + - +{"@type":"WebPage","headline":"Sobre Nosotros","url":"http://0.0.0.0:4000/es/about.html","description":"FCCAN’s mission is to create community based on furthering economic, social, and environmental justice, sustainability, human rights, and peace for all by building coalitions, developing strategies and actions, and supporting existing progressive organizations.","@context":"https://schema.org"} @@ -52,11 +51,13 @@ + +
    +
    +
    +
    +

    Affiliates

    +
    +
    +
    +
    +
    + + + + +
    +
    +

    Our Affliates

    + + + + + + +

    Important Fuerza Latina Resources

    + + + + + + +
    + + + + + + + + + + + + + + + + + + diff --git a/_site/es/blog.html b/_site/es/blog.html new file mode 100644 index 0000000..c1111eb --- /dev/null +++ b/_site/es/blog.html @@ -0,0 +1,204 @@ + + + + + + + + + + Blog - FCCAN + + + + + + + + + + + + + + + + + + +Blog + + + + + + + + + + + + + + + + +
    +
    +
    +
    +

    Blog

    +
    +
    +
    +
    +
    + + + + +
    + + +
    + + + + + + + + + + + + + + + + + + diff --git a/_site/es/events.html b/_site/es/events.html index 68b6c26..e89453c 100644 --- a/_site/es/events.html +++ b/_site/es/events.html @@ -7,7 +7,7 @@ - Eventos - Fuerza Latina + Eventos - FCCAN @@ -29,17 +29,16 @@ -Eventos | Fuerza Latina +Eventos - - + + - +{"@type":"WebPage","headline":"Eventos","url":"http://0.0.0.0:4000/es/events.html","description":"FCCAN’s mission is to create community based on furthering economic, social, and environmental justice, sustainability, human rights, and peace for all by building coalitions, developing strategies and actions, and supporting existing progressive organizations.","@context":"https://schema.org"} @@ -52,11 +51,13 @@