Skip to content
This repository has been archived by the owner on Mar 3, 2023. It is now read-only.

Article layout refresh 2021 05 #96

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Article layout refresh 2021 05 #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
77c7414
Update dependencies
Convincible May 18, 2021
677a7e0
Prevent Jekyll caching
Convincible May 18, 2021
6a7e116
Added explanation of the tech stack
Convincible May 18, 2021
605a6db
Update dependencies
Convincible May 18, 2021
523ae79
Prevent Jekyll caching
Convincible May 18, 2021
07fca48
Description next to smaller image
Convincible May 25, 2021
e25639b
Recompile styles
Convincible May 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ gem 'jekyll'
group :jekyll_plugins do
gem 'jekyll-feed'
gem 'jekyll-imgix'
gem 'jekyll-paginate-v2', github: 'openownership/jekyll-paginate-v2', tag: 'v1.9.5'
gem 'jekyll-paginate-v2'#, github: 'openownership/jekyll-paginate-v2', tag: 'v1.9.5'
gem 'jekyll-seo-tag'
gem 'jekyll-sitemap'
end
1 change: 1 addition & 0 deletions _config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,3 +169,4 @@ autopages:
permalink: "/tag/:tag"
imgix:
source: open-ownership-team.imgix.net
disable_disk_cache: true
19 changes: 12 additions & 7 deletions _layouts/post.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
<div class="grid-x grid-padding-x grid-padding-y page__title border-bottom">
<div class="small-12 medium-10 cell" cell">
<h1>{{ page.title }}</h1>
{% assign description = page.description | strip_newlines %}
{% unless description == "" %}
<p>{{description}}</p>
{% endunless %}
<p>
{% include blocks/categories.html categories=page.categories %}
</p>
Expand All @@ -27,10 +23,19 @@ <h1>{{ page.title }}</h1>
<section class="grid-container">
{% if page.image %}
{% assign image = page.image %}
<div class="grid-x grid-padding-x grid-padding-y">
<div class="small-12 cell">
<div class="light-gray-background image" data-interchange="{% include images/interchange-img-small-12-medium-6-cell.html %}"></div>
<div class="grid-x margin-top-1 snow-background">
<div class="small-12 {% if page.description %}medium-4 large-6{% endif %} cell">
<div class="image" data-interchange="{% include images/interchange-img-small-12-medium-6-cell.html %}"></div>
</div>
{% if page.description %}
<div class="small-12 medium-8 large-6 cell">
<div class="news_summary">
<div>
{{ page.description | markdownify }}
</div>
</div>
</div>
{% endif %}
</div>
{% endif %}
<div class="grid-x grid-padding-x grid-padding-y align-center">
Expand Down
2 changes: 1 addition & 1 deletion assets/css/app.css
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions assets/scss/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,15 @@ h2 {
@include links ($black, $primary-color);
}

.news_summary {
padding: 1em;
height: 100%;
font-size: 1.25em;
display: flex;
flex-direction: column;
justify-content: center;
}

// X. Sponsors
// -----------

Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"main": "gulpfile.js",
"devDependencies": {
"@popperjs/core": "2",
"@popperjs/core": "^2.9.2",
"aos": "^2.3.4",
"foundation-sites": "6.5.1",
"gulp": "^4.0.2",
"gulp-concat": "^2.6.1",
"gulp-sass": "^4.1.0",
"gulp-uglify": "^3.0.2",
"hamburgers": "^1.1.3",
"jquery": "^3.3.1",
"jquery": "^3.6.0",
"jvectormap-content": "^0.1.0",
"jvectormap-next": "^3.1.1",
"motion-ui": "^2.0.3",
"svgxuse": "^1.2.6",
"tippy.js": "6"
"tippy.js": "^6.3.1"
},
"scripts": {
"watch": "gulp",
Expand Down