[Scummvm-git-logs] scummvm-web master -> b929c3781939825ed57b5e6fb50e323ccfce6aa0
Mataniko
mataniko at gmail.com
Tue Aug 4 11:35:53 UTC 2020
This automated email contains information about 9 new commits which have been
pushed to the 'scummvm-web' repo located at https://github.com/scummvm/scummvm-web .
Summary:
7034f9aef3 CSS: Refactor & fix screenshot cards
4e4ab142dd WEB: Add Sponsors template, data and images
2a2b6a198c BUILD: Add sass dev dependency
e1e3b0eee4 WEB: Remove sponsor from sidebar
c14f3c1bf2 IMAGES: Make hex-rays image transparent
f24c69aad3 CSS: Card color tweaks
01ec10c5c2 CSS: Responsive layout adjustments
3509fcd9ad CSS: Additional fixes to responsive layout
b929c37819 DATA: Disable potential sponsor
Commit: 7034f9aef346eaf8032f0f975341eb48289bda78
https://github.com/scummvm/scummvm-web/commit/7034f9aef346eaf8032f0f975341eb48289bda78
Author: mataniko (mataniko at gmail.com)
Date: 2020-08-04T07:35:46-04:00
Commit Message:
CSS: Refactor & fix screenshot cards
Changed paths:
A scss/components/_article.scss
A scss/components/_card.scss
scss/components/_box.scss
scss/layout/_grid.scss
scss/main.scss
scss/pages/_screenshots.scss
templates/pages/screenshots_category.tpl
diff --git a/scss/components/_article.scss b/scss/components/_article.scss
new file mode 100644
index 00000000..749561a0
--- /dev/null
+++ b/scss/components/_article.scss
@@ -0,0 +1,18 @@
+article {
+ .news-date {
+ font-weight: normal;
+ }
+ .news-author {
+ color: $gray;
+ font-style: italic;
+ margin: 0px 0px -8px 0px;
+ position: relative;
+ text-align: right;
+ top: -8px;
+ }
+ img {
+ float: right;
+ margin: 0 10px 10px 10px;
+ max-width: 100%;
+ }
+}
diff --git a/scss/components/_box.scss b/scss/components/_box.scss
index b9d93867..713ec5b6 100644
--- a/scss/components/_box.scss
+++ b/scss/components/_box.scss
@@ -12,26 +12,10 @@
text-decoration: none;
color: $theme-container-title;
}
- .news-date {
- font-weight: normal;
- }
}
> .content {
background: $theme-container-background;
padding: 8px;
- .news-author {
- color: $gray;
- font-style: italic;
- margin: 0px 0px -8px 0px;
- position: relative;
- text-align: right;
- top: -8px;
- }
- img {
- float: right;
- margin: 0 10px 10px 10px;
- max-width: 100%;
- }
}
.intro {
background: $theme-container-navigation-background;
diff --git a/scss/components/_card.scss b/scss/components/_card.scss
new file mode 100644
index 00000000..b44cf8f6
--- /dev/null
+++ b/scss/components/_card.scss
@@ -0,0 +1,35 @@
+.card {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ justify-content: center;
+ margin-bottom: 20px;
+ padding: 10px;
+ box-shadow: 0 4px 6px 0 rgba(0, 0, 0, 0.2);
+ transition: 0.2s;
+ height: auto;
+ width: 100%;
+ background: #ccc;
+
+ &:hover{
+ box-shadow: 0 4px 12px 0 rgba(0, 0, 0, 0.2);
+ }
+ .image {
+ align-self: flex-end;
+ & img {
+ max-width: 100%;
+ &.pixelated {
+ image-rendering: pixelated;
+ }
+ }
+
+ }
+
+ .caption {
+ align-self: flex-end;
+ }
+
+ &.sponsor {
+ min-height: 300px;
+ }
+}
diff --git a/scss/layout/_grid.scss b/scss/layout/_grid.scss
index 8cd7e954..7c87d302 100644
--- a/scss/layout/_grid.scss
+++ b/scss/layout/_grid.scss
@@ -25,6 +25,10 @@
width: 33.33%;
}
+.col-1-4 {
+ width: 25%;
+}
+
.col-2-3 {
width: 66.66%;
}
@@ -39,7 +43,11 @@
[class*='col-'] {
float: left;
- padding-right: 8px;
+ padding-right: 12px;
+
+ &:last-child {
+ margin-right:0%;
+ }
}
.row:after {
@@ -80,7 +88,7 @@
}
.col-md-1 {
width: 100%;
- }
+ }
}
@include respond-to('medium') {
diff --git a/scss/main.scss b/scss/main.scss
index 09703c96..25131fd2 100644
--- a/scss/main.scss
+++ b/scss/main.scss
@@ -17,6 +17,8 @@
@import 'components/roundbox';
@import 'components/toc';
@import 'components/cookie';
+ at import 'components/card';
+ at import 'components/article';
@import 'pages/chart';
@import 'pages/compatibility';
diff --git a/scss/pages/_screenshots.scss b/scss/pages/_screenshots.scss
index 5bdcf7e3..2fa1b6ec 100644
--- a/scss/pages/_screenshots.scss
+++ b/scss/pages/_screenshots.scss
@@ -8,24 +8,9 @@
padding-left: 20px;
}
-.screenshot {
- display: inline-block;
- margin-top: 10px;
- padding: 10px;
- margin: 4px;
- width: 215px;
- height: auto;
- background: #ccc;
- img {
- width: 100%;
- height: auto;
- image-rendering: pixelated;
- }
-}
-
.gallery {
text-align: center;
-
+
.caption {
text-overflow: ellipsis;
overflow: hidden;
diff --git a/templates/pages/screenshots_category.tpl b/templates/pages/screenshots_category.tpl
index 462b9797..65603cb0 100644
--- a/templates/pages/screenshots_category.tpl
+++ b/templates/pages/screenshots_category.tpl
@@ -1,21 +1,25 @@
{* List all screenshots for an entry or category. *}
-{capture "content"}
+{capture "content"}
{foreach from=$screenshots.games item=g name=cat_loop}
{if $game and $game != $g->getCategory()}
{continue}
{/if}
<div class="gallery">
- <h3 class="subhead"><a href="/screenshots/{$category}/{$g->getCategory()}/">{$g->getName()}</a></h3>
- {foreach from=$g->getFiles() item=fdata name=game_loop}
- <div class="screenshot">
- <a href="{$smarty.const.DIR_SCREENSHOTS}/{$fdata.filename}-full.png" title="{$fdata.caption}">
- <img src="{$smarty.const.DIR_SCREENSHOTS}/{$fdata.filename}.jpg" alt="{$g->getName()} screenshot #{$smarty.foreach.cat_loop.iteration}">
- </a>
- <div class="caption">{$fdata.caption}</div>
- </div>
- {/foreach}
+ <div class="row">
+ <h3 class="subhead"><a href="/screenshots/{$category}/{$g->getCategory()}/">{$g->getName()}</a></h3>
+ {foreach from=$g->getFiles() item=fdata name=game_loop}
+ <div class="col-1-4">
+ <div class="card">
+ <a href="{$smarty.const.DIR_SCREENSHOTS}/{$fdata.filename}-full.png" title="{$fdata.caption}">
+ <img class="pixelated" src="{$smarty.const.DIR_SCREENSHOTS}/{$fdata.filename}.jpg" alt="{$g->getName()} screenshot #{$smarty.foreach.cat_loop.iteration}">
+ </a>
+ <div class="caption">{$fdata.caption}</div>
+ </div>
+ </div>
+ {/foreach}
+ </div>
</div>
- {if $game and $game == $g->getCategory()}
+ {if $game and $game == $g->getCategory()}
{break}
{/if}
{/foreach}
Commit: 4e4ab142ddf95a40f40e3dc39c09359abe6e65b1
https://github.com/scummvm/scummvm-web/commit/4e4ab142ddf95a40f40e3dc39c09359abe6e65b1
Author: mataniko (mataniko at gmail.com)
Date: 2020-08-04T07:35:46-04:00
Commit Message:
WEB: Add Sponsors template, data and images
Changed paths:
A data/sponsors.yaml
A include/Models/SponsorModel.php
A include/Objects/Sponsor.php
A include/Pages/SponsorsPage.php
A public_html/images/sponsors/fastly.png
A public_html/images/sponsors/hex-rays.png
A public_html/images/sponsors/jetbrains.png
A public_html/images/sponsors/manitu.png
A templates/pages/sponsors.tpl
data/menus.yaml
lang/i18n/lang.en.json
public_html/index.php
diff --git a/data/menus.yaml b/data/menus.yaml
index ffbc6b95..d95f343b 100644
--- a/data/menus.yaml
+++ b/data/menus.yaml
@@ -49,6 +49,8 @@ groups:
- name: "{#menuHeaderMisc#}"
class: "menu-misc"
links:
+ - name: "Sponsors"
+ href: "/sponsors/"
- name: "{#menuMiscSubprojects#}"
href: "/subprojects/"
- name: "{#menuMiscDemos#}"
@@ -58,4 +60,4 @@ groups:
- name: "{#menuMiscContact#}"
href: "/contact/"
- name: "{#menuMiscLinks#}"
- href: "/links/"
\ No newline at end of file
+ href: "/links/"
diff --git a/data/sponsors.yaml b/data/sponsors.yaml
new file mode 100644
index 00000000..b5c3b12e
--- /dev/null
+++ b/data/sponsors.yaml
@@ -0,0 +1,20 @@
+sponsors:
+ - name: "Fastly"
+ link: "https://www.fastly.com"
+ image: "images/sponsors/fastly.png"
+ description: CDN Provider
+
+ - name: "Manitu"
+ link: "https://www.manitu.de"
+ image: "images/sponsors/manitu.png"
+ description: Server & Hosting
+
+ - name: "Hex Rays"
+ link: "https://www.hex-rays.com"
+ image: "images/sponsors/hex-rays.png"
+ description: Developer Tools
+
+ - name: "Jetbrains"
+ link: "https://www.jetbrains.com"
+ image: "images/sponsors/jetbrains.png"
+ description: Developer Tools
diff --git a/include/Models/SponsorModel.php b/include/Models/SponsorModel.php
new file mode 100644
index 00000000..6c1d10a8
--- /dev/null
+++ b/include/Models/SponsorModel.php
@@ -0,0 +1,22 @@
+<?php
+namespace ScummVM\Models;
+
+use ScummVM\Objects\Sponsor;
+
+/**
+ * The SponsorModel class will generate Sponsor objects.
+ */
+abstract class SponsorModel extends BasicModel
+{
+ /* Get all Sponsors. */
+ public static function getAllSponsors()
+ {
+ $fname = DIR_DATA . '/sponsors.yaml';
+ $parsedData = \yaml_parse_file($fname);
+ $entries = array();
+ foreach (array_values($parsedData['sponsors']) as $value) {
+ $entries[] = new Sponsor($value);
+ }
+ return $entries;
+ }
+}
diff --git a/include/Objects/Sponsor.php b/include/Objects/Sponsor.php
new file mode 100644
index 00000000..96b46b1c
--- /dev/null
+++ b/include/Objects/Sponsor.php
@@ -0,0 +1,32 @@
+<?php
+namespace ScummVM\Objects;
+
+/**
+ * The article class represents a link on the website to an article covering
+ * ScummVM in some way.
+ */
+class Sponsor extends BasicObject
+{
+ private $link;
+ private $image;
+
+ /* Article object constructor. */
+ public function __construct($data)
+ {
+ parent::__construct($data);
+ $this->link = $data['link'];
+ $this->image = $data['image'];
+ }
+
+ /* Get the sponsor link. */
+ public function getLink()
+ {
+ return $this->link;
+ }
+
+ /* Get the sponsor image */
+ public function getImage()
+ {
+ return $this->image;
+ }
+}
diff --git a/include/Pages/SponsorsPage.php b/include/Pages/SponsorsPage.php
new file mode 100644
index 00000000..5c2fdeaf
--- /dev/null
+++ b/include/Pages/SponsorsPage.php
@@ -0,0 +1,30 @@
+<?php
+namespace ScummVM\Pages;
+
+use ScummVM\Controller;
+use ScummVM\Models\SponsorModel;
+
+class SponsorsPage extends Controller
+{
+
+
+ /* Constructor. */
+ public function __construct()
+ {
+ parent::__construct();
+ $this->template = 'pages/sponsors.tpl';
+ }
+
+ /* Display the index page. */
+ public function index()
+ {
+ $sponsors = SponsorModel::getAllSponsors();
+ return $this->renderPage(
+ array(
+ 'title' => $this->getConfigVars('sponsorsTitle'),
+ 'content_title' => $this->getConfigVars('sponsorsContentTitle'),
+ 'sponsors' => $sponsors,
+ )
+ );
+ }
+}
diff --git a/lang/i18n/lang.en.json b/lang/i18n/lang.en.json
index d16f9a7c..1f457408 100644
--- a/lang/i18n/lang.en.json
+++ b/lang/i18n/lang.en.json
@@ -177,6 +177,10 @@
"screenshotsViewerPrevious": "Previous",
"screenshotsViewerNext": "Next",
"screenshotsViewerBack": "Back",
+ "sponsorsTitle": "Sponsors",
+ "sponsorsContentTitle": "Sponsors",
+ "sponsorsHeading": "ScummVM Sponsors",
+ "sponsorsIntro": "The following companies have graciously provided their assistance to the ScummVM project",
"subprojectsTitle": "Subprojects",
"subprojectsContentTitle": "Subprojects",
"subprojectsIntroP1": "The ScummVM team occasionally works on various subprojects, separate from the main ScummVM program. These projects are generally reasonably stagnant and not given a high priority. Regardless, this page is here to inform you of them, in the vague hope of attracting more developers to help maintain these side-programs.",
diff --git a/public_html/images/sponsors/fastly.png b/public_html/images/sponsors/fastly.png
new file mode 100644
index 00000000..db23f058
Binary files /dev/null and b/public_html/images/sponsors/fastly.png differ
diff --git a/public_html/images/sponsors/hex-rays.png b/public_html/images/sponsors/hex-rays.png
new file mode 100644
index 00000000..ecfe9d3b
Binary files /dev/null and b/public_html/images/sponsors/hex-rays.png differ
diff --git a/public_html/images/sponsors/jetbrains.png b/public_html/images/sponsors/jetbrains.png
new file mode 100644
index 00000000..ccceb958
Binary files /dev/null and b/public_html/images/sponsors/jetbrains.png differ
diff --git a/public_html/images/sponsors/manitu.png b/public_html/images/sponsors/manitu.png
new file mode 100644
index 00000000..e6e5b586
Binary files /dev/null and b/public_html/images/sponsors/manitu.png differ
diff --git a/public_html/index.php b/public_html/index.php
index 81549b82..de35de8a 100644
--- a/public_html/index.php
+++ b/public_html/index.php
@@ -98,6 +98,7 @@ $pages = array(
'/screenshots/[a:category]' => '\ScummVM\Pages\ScreenshotsPage',
'/screenshots/[a:category]/[:game]' => '\ScummVM\Pages\ScreenshotsPage',
'/subprojects' => '\ScummVM\Pages\SubprojectsPage',
+ '/sponsors' => '\ScummVM\Pages\SponsorsPage',
);
$router = new \AltoRouter();
diff --git a/templates/pages/sponsors.tpl b/templates/pages/sponsors.tpl
new file mode 100644
index 00000000..1ecaba82
--- /dev/null
+++ b/templates/pages/sponsors.tpl
@@ -0,0 +1,24 @@
+{capture "intro"}
+ <p>{#sponsorsIntro#}</p>
+{/capture}
+
+{capture "content"}
+ <div class="gallery">
+ <div class="row">
+ {foreach from=$sponsors item=sponsor}
+ <div class="col-1-3">
+ <div class="sponsor card">
+ <div class="image">
+ <a href="{$sponsor->getLink()}" title="{$sponsor->getName()}">
+ <img src="{$sponsor->getImage()}" alt="{$sponsor->getName()}">
+ </a>
+ </div>
+ <div class="caption">{$sponsor->getDescription()}</div>
+ </div>
+ </div>
+ {/foreach}
+ </div>
+ </div>
+{/capture}
+
+{include file="components/box.tpl" head=#sponsorsHeading# intro=$smarty.capture.intro content=$smarty.capture.content}
Commit: 2a2b6a198c376fe5e3789308d5d37f38ec52beb3
https://github.com/scummvm/scummvm-web/commit/2a2b6a198c376fe5e3789308d5d37f38ec52beb3
Author: mataniko (mataniko at gmail.com)
Date: 2020-08-04T07:35:46-04:00
Commit Message:
BUILD: Add sass dev dependency
Adds a npm script to monitor SASS changes in realtime
Changed paths:
package.json
diff --git a/package.json b/package.json
index 4e35f259..4644910c 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,11 @@
"autoprefixer": "^9.5.1",
"postcss-cli": "^6.1.2"
},
+ "devDependencies": {
+ "sass": "1.26.10"
+ },
"scripts": {
- "postinstall": "postcss ./public_html/css/*.css --use autoprefixer --no-map -r"
+ "postinstall": "postcss ./public_html/css/*.css --use autoprefixer --no-map -r",
+ "sass": "sass --watch ./scss:./public_html/css"
}
}
Commit: e1e3b0eee493e49839efdc653c4d7a6f36239ee9
https://github.com/scummvm/scummvm-web/commit/e1e3b0eee493e49839efdc653c4d7a6f36239ee9
Author: mataniko (mataniko at gmail.com)
Date: 2020-08-04T07:35:46-04:00
Commit Message:
WEB: Remove sponsor from sidebar
Sponsors now have their own proper page and do not need to fit on the sidebar anymore.
Changed paths:
R public_html/images/manitu_hostedby.png
templates/components/banners.tpl
diff --git a/public_html/images/manitu_hostedby.png b/public_html/images/manitu_hostedby.png
deleted file mode 100644
index 28dddd87..00000000
Binary files a/public_html/images/manitu_hostedby.png and /dev/null differ
diff --git a/templates/components/banners.tpl b/templates/components/banners.tpl
index 916de97d..06d17026 100644
--- a/templates/components/banners.tpl
+++ b/templates/components/banners.tpl
@@ -6,10 +6,6 @@
<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
</form>
- <a href="https://www.manitu.de/" target="_blank">
- <img src="/images/manitu_hostedby.png" style="width: 88px; height: auto;" alt="{#indexHostedby#}">
- </a>
-
<a href="https://www.gog.com/?pp=22d200f8670dbdb3e253a90eee5098477c95c23d">
<img src="/images/GOG_button_small.png" width="88" height="32" alt="{#indexGOG#}">
</a>
Commit: c14f3c1bf2cfe4d69b6aa42484251a3cb5d4f6ea
https://github.com/scummvm/scummvm-web/commit/c14f3c1bf2cfe4d69b6aa42484251a3cb5d4f6ea
Author: mataniko (mataniko at gmail.com)
Date: 2020-08-04T07:35:46-04:00
Commit Message:
IMAGES: Make hex-rays image transparent
Changed paths:
public_html/images/sponsors/hex-rays.png
diff --git a/public_html/images/sponsors/hex-rays.png b/public_html/images/sponsors/hex-rays.png
index ecfe9d3b..9541e1c3 100644
Binary files a/public_html/images/sponsors/hex-rays.png and b/public_html/images/sponsors/hex-rays.png differ
Commit: f24c69aad31173354ed27ac3007508b9c80dad8d
https://github.com/scummvm/scummvm-web/commit/f24c69aad31173354ed27ac3007508b9c80dad8d
Author: mataniko (mataniko at gmail.com)
Date: 2020-08-04T07:35:46-04:00
Commit Message:
CSS: Card color tweaks
Changed paths:
scss/components/_card.scss
diff --git a/scss/components/_card.scss b/scss/components/_card.scss
index b44cf8f6..32e4bead 100644
--- a/scss/components/_card.scss
+++ b/scss/components/_card.scss
@@ -5,14 +5,14 @@
justify-content: center;
margin-bottom: 20px;
padding: 10px;
- box-shadow: 0 4px 6px 0 rgba(0, 0, 0, 0.2);
+ box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
transition: 0.2s;
height: auto;
width: 100%;
- background: #ccc;
+ background: #fff;
&:hover{
- box-shadow: 0 4px 12px 0 rgba(0, 0, 0, 0.2);
+ box-shadow: 0 4px 16px 0 rgba(0, 0, 0, 0.2);
}
.image {
align-self: flex-end;
Commit: 01ec10c5c24588e6139551c1c37799ecb1cfec13
https://github.com/scummvm/scummvm-web/commit/01ec10c5c24588e6139551c1c37799ecb1cfec13
Author: mataniko (mataniko at gmail.com)
Date: 2020-08-04T07:35:46-04:00
Commit Message:
CSS: Responsive layout adjustments
Changed paths:
scss/components/_card.scss
scss/layout/_grid.scss
templates/base/base.tpl
templates/layout/footer.tpl
templates/layout/header.tpl
templates/pages/downloads.tpl
templates/pages/game_demos.tpl
templates/pages/games.tpl
templates/pages/index.tpl
templates/pages/screenshots.tpl
templates/pages/screenshots_category.tpl
templates/pages/sponsors.tpl
diff --git a/scss/components/_card.scss b/scss/components/_card.scss
index 32e4bead..b3663c30 100644
--- a/scss/components/_card.scss
+++ b/scss/components/_card.scss
@@ -22,7 +22,6 @@
image-rendering: pixelated;
}
}
-
}
.caption {
diff --git a/scss/layout/_grid.scss b/scss/layout/_grid.scss
index 7c87d302..474dd792 100644
--- a/scss/layout/_grid.scss
+++ b/scss/layout/_grid.scss
@@ -66,36 +66,26 @@
@include respond-to('small') {
.col-1-2 {
clear: left;
- width: 100%;
}
[class*='col-'] {
padding-right: 0;
}
- .col-1-5 {
- width: 100%;
- }
- .col-4-5 {
- width: 100%;
- }
.hide-small {
display: none;
}
.col-sm-1 {
width: 100%;
}
- .col-md-2 {
- width: 50%;
- }
- .col-md-1 {
- width: 100%;
- }
}
@include respond-to('medium') {
/* CSS Rules targeting most tablets in vertical orientation */
.hide-medium {
display: none;
- }
+ }
+ .col-md-3 {
+ width: 33%;
+ }
.col-md-2 {
width: 50%;
}
diff --git a/templates/base/base.tpl b/templates/base/base.tpl
index 2d50a06e..446f74ab 100644
--- a/templates/base/base.tpl
+++ b/templates/base/base.tpl
@@ -19,11 +19,11 @@
{block name=header}{/block}
<div class="container row">
- <div class="col-4-5">
+ <div class="col-4-5 col-sm-1">
{block name=content}{/block}
</div>
- <div class="col-1-5">
+ <div class="col-1-5 col-sm-1">
{block name=menu}{/block}
</div>
</div>
diff --git a/templates/layout/footer.tpl b/templates/layout/footer.tpl
index 74180cd4..2516ae1d 100644
--- a/templates/layout/footer.tpl
+++ b/templates/layout/footer.tpl
@@ -1,5 +1,5 @@
<footer class="row">
- <div class="col-4-5">
+ <div class="col-4-5 col-sm-1">
{#indexLegal#}
</div>
<div class="col-1-5 hide-small">
diff --git a/templates/layout/header.tpl b/templates/layout/header.tpl
index 7fc61164..516d49b0 100644
--- a/templates/layout/header.tpl
+++ b/templates/layout/header.tpl
@@ -5,7 +5,7 @@
</div>
</div>
<div class="row topper">
- <div class="col-1-2">
+ <div class="col-1-2 col-sm-1">
<img class="logo maniac hide-small" src="/images/maniac-half.png" alt="Maniac Mansion kids">
<a href="{$baseurl}"><img class="logo" src="/images/scummvm_logo.png" alt="{#indexLogo#}"></a>
</div>
diff --git a/templates/pages/downloads.tpl b/templates/pages/downloads.tpl
index 47d3adee..b90332fa 100644
--- a/templates/pages/downloads.tpl
+++ b/templates/pages/downloads.tpl
@@ -1,6 +1,6 @@
{capture "intro"}
<div class="row">
- <div class="navigation col-1-2">
+ <div class="navigation col-1-2 col-md-1">
<h4 class="subhead">{#downloadsHeader#}</h4>
<ul>
{foreach from=$sections item=arr}
@@ -8,7 +8,7 @@
{/foreach}
</ul>
</div>
- <div class="text col-1-2">
+ <div class="text col-1-2 col-md-1">
<p>{'/\x7brelease\x7d/'|preg_replace:$release:#downloadsContentP1#}</p>
<ul>
<li>{'/\x7brelease\x7d/'|preg_replace:$release:#downloadsContentP2#}</li>
diff --git a/templates/pages/game_demos.tpl b/templates/pages/game_demos.tpl
index 940618ff..fab20982 100644
--- a/templates/pages/game_demos.tpl
+++ b/templates/pages/game_demos.tpl
@@ -2,7 +2,7 @@
{capture "intro"}
<div class="row">
- <div class="navigation col-1-2">
+ <div class="navigation col-1-2 col-md-1">
<h4 class="subhead">{#gamesDemosHeading#}</h4>
<ul>
{foreach $demos $group}
@@ -10,7 +10,7 @@
{/foreach}
</ul>
</div>
- <div class="text col-1-2">
+ <div class="text col-1-2 col-md-1">
<p>
{#gamesDemosContentP1#}
</p>
diff --git a/templates/pages/games.tpl b/templates/pages/games.tpl
index 097cd620..5a7eb85b 100644
--- a/templates/pages/games.tpl
+++ b/templates/pages/games.tpl
@@ -1,6 +1,6 @@
{capture "intro"}
<div class="row">
- <div class="navigation col-1-2">
+ <div class="navigation col-1-2 col-md-1">
<h4 class="subhead">{#gamesHeader#}</h4>
<ul>
{foreach from=$sections item=arr}
@@ -8,7 +8,7 @@
{/foreach}
</ul>
</div>
- <div class="text col-1-2">
+ <div class="text col-1-2 col-md-1">
<ul>
<li>{#gamesContentP1#}</li>
<li>{#gamesContentP2#}</li>
diff --git a/templates/pages/index.tpl b/templates/pages/index.tpl
index aad37f43..9e7fb585 100644
--- a/templates/pages/index.tpl
+++ b/templates/pages/index.tpl
@@ -82,7 +82,7 @@
{* Content *}
<div class="container row">
- <div class="col-4-5">
+ <div class="col-4-5 col-sm-1">
<div class="content">
{* Introduction text and screenshot viewer. *}
{if isset($show_intro) && $show_intro}
@@ -95,12 +95,12 @@
</div>
{* Menu. *}
- <div class="col-1-5">
+ <div class="col-1-5 col-sm-1">
{include file='layout/menu.tpl'}
</div>
</div>
<footer class="row">
- <div class="col-4-5">
+ <div class="col-4-5 col-sm-1">
{#indexLegal#}
</div>
<div class="col-1-5 hide-small">
diff --git a/templates/pages/screenshots.tpl b/templates/pages/screenshots.tpl
index 1ae093f9..d4c08b3b 100644
--- a/templates/pages/screenshots.tpl
+++ b/templates/pages/screenshots.tpl
@@ -1,6 +1,6 @@
{capture "intro"}
<div class="row">
- <div class="navigation col-1-2">
+ <div class="navigation col-1-2 col-md-1">
<h4 class="subhead">{#screenshotsNavigation#}</h4>
<ul>
{foreach from=$screenshots item=arr}
@@ -8,13 +8,13 @@
{/foreach}
</ul>
</div>
- <div class="text col-1-2">
+ <div class="text col-1-2 col-md-1">
{include file='components/random_screenshot.tpl'}
</div>
</div>
{/capture}
-{capture "content"}
+{capture "content"}
{foreach from=$screenshots item=arr}
<div class="subhead" id="{$arr.category}">
<a href="/screenshots/{$arr.category}/">{$arr.title}</a>
diff --git a/templates/pages/screenshots_category.tpl b/templates/pages/screenshots_category.tpl
index 65603cb0..f04b9dab 100644
--- a/templates/pages/screenshots_category.tpl
+++ b/templates/pages/screenshots_category.tpl
@@ -8,11 +8,13 @@
<div class="row">
<h3 class="subhead"><a href="/screenshots/{$category}/{$g->getCategory()}/">{$g->getName()}</a></h3>
{foreach from=$g->getFiles() item=fdata name=game_loop}
- <div class="col-1-4">
+ <div class="col-1-4 col-md-1">
<div class="card">
- <a href="{$smarty.const.DIR_SCREENSHOTS}/{$fdata.filename}-full.png" title="{$fdata.caption}">
- <img class="pixelated" src="{$smarty.const.DIR_SCREENSHOTS}/{$fdata.filename}.jpg" alt="{$g->getName()} screenshot #{$smarty.foreach.cat_loop.iteration}">
- </a>
+ <div class="image">
+ <a href="{$smarty.const.DIR_SCREENSHOTS}/{$fdata.filename}-full.png" title="{$fdata.caption}">
+ <img class="pixelated" src="{$smarty.const.DIR_SCREENSHOTS}/{$fdata.filename}.jpg" alt="{$g->getName()} screenshot #{$smarty.foreach.cat_loop.iteration}">
+ </a>
+ </div>
<div class="caption">{$fdata.caption}</div>
</div>
</div>
diff --git a/templates/pages/sponsors.tpl b/templates/pages/sponsors.tpl
index 1ecaba82..3830978a 100644
--- a/templates/pages/sponsors.tpl
+++ b/templates/pages/sponsors.tpl
@@ -6,7 +6,7 @@
<div class="gallery">
<div class="row">
{foreach from=$sponsors item=sponsor}
- <div class="col-1-3">
+ <div class="col-1-3 col-md-1">
<div class="sponsor card">
<div class="image">
<a href="{$sponsor->getLink()}" title="{$sponsor->getName()}">
Commit: 3509fcd9ad6e2aec7614c176e0b2c42c50468543
https://github.com/scummvm/scummvm-web/commit/3509fcd9ad6e2aec7614c176e0b2c42c50468543
Author: mataniko (mataniko at gmail.com)
Date: 2020-08-04T07:35:46-04:00
Commit Message:
CSS: Additional fixes to responsive layout
Changed paths:
scss/components/_card.scss
scss/pages/_screenshots.scss
diff --git a/scss/components/_card.scss b/scss/components/_card.scss
index b3663c30..8ecb0523 100644
--- a/scss/components/_card.scss
+++ b/scss/components/_card.scss
@@ -1,6 +1,6 @@
.card {
display: flex;
- flex-wrap: wrap;
+ flex-direction: column;
align-items: center;
justify-content: center;
margin-bottom: 20px;
@@ -15,9 +15,13 @@
box-shadow: 0 4px 16px 0 rgba(0, 0, 0, 0.2);
}
.image {
- align-self: flex-end;
+ display: flex;
+ flex: 1;
+ align-items: center;
& img {
max-width: 100%;
+ height: auto;
+ max-height: 250px;
&.pixelated {
image-rendering: pixelated;
}
@@ -25,7 +29,9 @@
}
.caption {
- align-self: flex-end;
+ display: flex;
+ align-items: center;
+ height: 10%;
}
&.sponsor {
diff --git a/scss/pages/_screenshots.scss b/scss/pages/_screenshots.scss
index 2fa1b6ec..964181fb 100644
--- a/scss/pages/_screenshots.scss
+++ b/scss/pages/_screenshots.scss
@@ -15,5 +15,8 @@
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
+ display: inline-block;
+ text-align: center;
+ width: 100%;
}
}
Commit: b929c3781939825ed57b5e6fb50e323ccfce6aa0
https://github.com/scummvm/scummvm-web/commit/b929c3781939825ed57b5e6fb50e323ccfce6aa0
Author: mataniko (mataniko at gmail.com)
Date: 2020-08-04T07:35:46-04:00
Commit Message:
DATA: Disable potential sponsor
Changed paths:
data/sponsors.yaml
diff --git a/data/sponsors.yaml b/data/sponsors.yaml
index b5c3b12e..184dccf1 100644
--- a/data/sponsors.yaml
+++ b/data/sponsors.yaml
@@ -1,8 +1,8 @@
sponsors:
- - name: "Fastly"
- link: "https://www.fastly.com"
- image: "images/sponsors/fastly.png"
- description: CDN Provider
+ # - name: "Fastly"
+ # link: "https://www.fastly.com"
+ # image: "images/sponsors/fastly.png"
+ # description: CDN Provider
- name: "Manitu"
link: "https://www.manitu.de"
More information about the Scummvm-git-logs
mailing list