Skip to content

Commit

Permalink
Merge pull request #856 from Queen-codes/homepage-refactor
Browse files Browse the repository at this point in the history
refactored open source website's home page to implement and align with vocabulary
  • Loading branch information
TimidRobot authored Dec 27, 2024
2 parents a152f41 + 9c4dfc1 commit dce343d
Show file tree
Hide file tree
Showing 6 changed files with 113 additions and 197 deletions.
3 changes: 3 additions & 0 deletions assets/static/css/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import "/assets/static/vocabulary/css/vocabulary.css" layer(vocabulary);

/*put local styles here*/
17 changes: 8 additions & 9 deletions content/contents.lr
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,26 @@ We have been building <span class="has-text-forest-green">free software</span> a
----
links:

<p class="hero-description">We work on code and products that support digital creativity and sharing, from usability of our legal tools to enabling discovery of CC-licensed content.</p>
<div class="hero-links">
<p>We work on code and products that support digital creativity and sharing, from usability of our legal tools to enabling discovery of CC-licensed content.</p>
<!-- Button linking to the developer community page -->
<a class="button small is-success row" href="/community">
<a href="/community">
Join the Developer Community
<!-- TODO: Evaluate legacy design button -->
</a>
</div>

<p class="hero-description">This site is for developers looking to contribute, but anyone can use CC tools to share their works.</p>
<div class="hero-links">
<p>This site is for developers looking to contribute, but anyone can use CC tools to share their works.</p>
<!-- Button linking to the Creative Commons "Share your work" page -->
<a class="button small row" href="https://creativecommons.org/share-your-work/">
<a href="https://creativecommons.org/share-your-work/">
Share your work using our licenses/tools
<!-- TODO: Evaluate legacy design button -->
</a>
</div>

<!--TODO: Refactor code for the get involved section? -->
#### get-involved ####
title:

<h2>Get Involved</h2>
<p class="get-involved-description">Help CC’s mission by contributing to our products, integrating our tools into your project, or using our plugins. We have a small team and really appreciate your involvement!</p>
<p>Help CC’s mission by contributing to our products, integrating our tools into your project, or using our plugins. We have a small team and really appreciate your involvement!</p>
----
links_product:

Expand Down
85 changes: 39 additions & 46 deletions themes/vocabulary_theme/templates/blocks/featured-projects.html
Original file line number Diff line number Diff line change
@@ -1,50 +1,43 @@
<section class="featured-projects">
<div class="container">
<div class="level">
<h2 class="is-paddingless level-left">
{{ this.title }}
</h2>
<span class="level-right">
<a class="project-page-link" href="/contributing-code/projects/">See all available projects <i class="icon angle-right"></i></a>
</span>
</div>
<div class="project-list columns is-multiline">
<article class="projects">
<h2>{{ this.title }}</h2>
<ul>
{% for repo in bag('repos.repos') %}
{% if repo.featured %}
<div class="column is-one-third">
<article class="card entry-post vertical project-index">
<div class="card-content">
<h4 class="card-title b-header"><a href="{{ repo.url }}">{{ repo.english_name }}</a></h4>
<a class="button is-text tiny site-link" href="{{ repo.website or repo.url }}">
<span>Visit site</span>
<i class="icon external-link"></i>
</a>
<div class="content">
{{ repo.description }}
</div>
<div class="labels">
{% for technology in repo.technologies %}
<button class="button tag">{{ technology }}</button>
{% endfor %}
</div>
<div class="external-links">
<a class="button is-text tiny" href="{{ repo.url }}">
<i class="icon github"></i>
<span class="link-content">Github Repository</span>
</a>
{% if repo.slack %}
<br>
<a class="button is-text tiny" href="https://creativecommons.slack.com/channels/{{ repo.slack }}">
<i class="icon slack"></i>
<span class="link-content">Slack channel (#{{ repo.slack }})</span>
</a>
{% endif %}
</div>
</div>
</article>
</div>
{% endif %}
<li>
<article class="project">
<h3><a href="{{ repo.url }}">{{ repo.english_name }}</a></h3>
<p>{{ repo.description }}</p>
</article>
</li>

<!--TODO: Reintroduce external links, tags, and Slack in future updates -->

<!-- old HTML for reference commented out for now -->
<!--
<div class="external-links">
<a class="button is-text tiny" href="{{ repo.url }}">
<i class="icon github"></i>
<span class="link-content">Github Repository</span>
</a>
{% if repo.slack %}
<br>
<a class="button is-text tiny" href="https://creativecommons.slack.com/channels/{{ repo.slack }}">
<i class="icon slack"></i>
<span class="link-content">Slack channel (#{{ repo.slack }})</span>
</a>
{% endif %}
</div>
-->

<!-- old tags structure for reference commented out for now -->
<!--
<div class="labels">
{% for technology in repo.technologies %}
<button class="button tag">{{ technology }}</button>
{% endfor %}
</div>
</div>
</section>
-->
{% endif %}
{% endfor %}
</ul>
</article>
40 changes: 21 additions & 19 deletions themes/vocabulary_theme/templates/blocks/get-involved.html
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
<section class="get-involved">
<div class="container">
<div class="column is-9 is-paddingless">
{{ this.title }}
</div>

<div class="columns get-involved-links">
<div class="column is-one-third">
{{ this.links_product }}
</div>
<div class="column is-one-third">
{{ this.links_integrate }}
</div>
<div class="column is-one-third">
{{ this.links_plugins }}
</div>
</div>
</div>
</section>
<article class="projects">
<h2>{{ this.title }}</h2>
<ul>
<li>
<article class="project">
<h3>{{ this.links_product }}</h3>
</article>
</li>
<li>
<article class="project">
<h3>{{ this.links_integrate }}</h3>
</article>
</li>
<li>
<article class="project">
<h3>{{ this.links_plugins }} </h3>
<!--Evaluate: Vocabulary markup uses <a> tags here also. To retain?-->
</article>
</li>
</ul>
</article>
18 changes: 4 additions & 14 deletions themes/vocabulary_theme/templates/blocks/hero.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
<section class="hero">
<div class="container">
<div class="hero-title column is-12 is-paddingless">
<h1>
{{ this.title }}
</h1>
</div>
<div class="columns margin-right-0">
<div class="column is-5">
<article>
<h2> {{ this.title }} </h2>
<div class="description">
{{ this.links }}
</div>
</div>
</div>
<div class="level-right hero-image">
<img class="image" src="./github.svg" />
</div>
</section>
</article>
Loading

0 comments on commit dce343d

Please sign in to comment.