-
-
Notifications
You must be signed in to change notification settings - Fork 188
refactored open source website's home page to implement and align with vocabulary #856
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
TimidRobot
merged 8 commits into
creativecommons:vocab-refresh
from
Queen-codes:homepage-refactor
Dec 27, 2024
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
95577bf
feat: updated header/footer, added bluesky icon, refactored code to u…
Queen-codes 6ffc3fd
updated header/footer, added bluesky icon, refactored code to use voc…
Queen-codes 0920197
Merge branch 'vocab-refresh' into homepage-refactor
Queen-codes e948461
removed duplicates to resolve conflicts
Queen-codes d5a73e5
fixed spelling of ancillary per new vocab merge
Queen-codes 6a6127a
removed commented out code
Queen-codes ba86195
added comments
Queen-codes 9c4dfc1
made requested changes
Queen-codes File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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*/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 39 additions & 46 deletions
85
themes/vocabulary_theme/templates/blocks/featured-projects.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
40
themes/vocabulary_theme/templates/blocks/get-involved.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.