Skip to content

Commit

Permalink
Merge pull request #1268 from matks/rebranding-2024-xmas
Browse files Browse the repository at this point in the history
Apply new PS rebranding to blog
  • Loading branch information
kpodemski committed Dec 21, 2023
2 parents ac15330 + 51db0c7 commit 0682c70
Show file tree
Hide file tree
Showing 16 changed files with 76 additions and 13 deletions.
1 change: 1 addition & 0 deletions static/assets/ext/arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/assets/images/authors/prestashop-team.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions static/assets/images/theme/2024-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/assets/images/theme/banner-core-monthly-wide.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/assets/images/theme/banner-core-monthly.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/assets/images/theme/favicon.ico
Binary file not shown.
Binary file added static/favicon.ico
Binary file not shown.
Binary file removed static/favicon.png
Binary file not shown.
32 changes: 30 additions & 2 deletions themes/build/assets/_sass/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ ul.post-list {
width: 32px;
text-align: center;
font-size: 70%;
font-weight: bold;
margin: 6px 0 0 -40px;
position: absolute;
color: $grey-color;
Expand All @@ -226,13 +227,22 @@ ul.post-list {
margin: ($spacing-unit / 4) 0 0 0;
color: $brand-color-2;
font-size: 75%;
text-transform: uppercase;
font-weight: 600;
}
p {
margin-top: $spacing-unit / 2;
}
}
.post-date {
color: #65bbcf;
font-weight: bold;
}
.post-link {
font-family: Arial, Helvetica, sans-serif;
}
.post-summary {
font-family: Arial, Helvetica, sans-serif;
}
.post-divider {
height: 0px;
margin: $spacing-unit 0 100px 0;
Expand Down Expand Up @@ -779,9 +789,27 @@ footer.site-footer {
}

.read-more {
font-size: 0.7em;
font-size: 15px;
text-align: right;
display: block;
margin-right: 0;
margin-left: auto;
background-color: #000000;
color: #ffffff !important;
text-transform: uppercase;
font-family: IBMPlexSans, Arial;
box-sizing: border-box;
padding-bottom: 10px;
padding-left: 15px;
padding-right: 15px;
padding-top: 10px;
width: 200px;
}

.arrow-svg {
filter: invert(1);
width: 10px;
padding-bottom: 4px;
}

.pager {
Expand Down
5 changes: 3 additions & 2 deletions themes/build/assets/_sass/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ $white-text-color: #f9f9f9;
$background-color: #ffffff;
$dark-background-color: #333333;
$brand-color: #2a7ae2;
$brand-color-2: #df0067;
$brand-color-3: #1da6c2;
$brand-color-2: #000000;
$brand-color-3: #ffffff;
$brand-success: #000;
$code-bg-color: #fafaff;
$border-color: #000000;

Expand Down
12 changes: 5 additions & 7 deletions themes/build/layouts/_default/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,18 @@ <h1>{{ .Title }}</h1>
</div>

<h2>
{{ if .Params.Icon }}
<i class="fa {{ .Params.Icon }}"></i>
{{ else }}
<i class="icon-anchor"></i>
{{ end }}
<a class="post-link" href="{{ .Permalink }}">{{ .Title }}</a>
</h2>

{{ if .Params.Subtitle }}
<h4>{{ .Params.Subtitle }}</h4>
{{ end }}

<p>{{ partial "partials/post-summary" . }}</p>
<a class="read-more" href="{{ .Permalink }}">Continue reading &rarr;</a>
<p class="post-summary">{{ partial "partials/post-summary" . }}</p>
<a class="read-more" href="{{ .Permalink }}">
Continue reading
<img src="/assets/ext/arrow.svg" class="arrow-svg" alt="Arrow">
</a>
</li>

{{ end }}
Expand Down
2 changes: 1 addition & 1 deletion themes/build/layouts/partials/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{{- $style := resources.Get "_sass/main.scss" | resources.ToCSS (dict "targetPath" "style.css" "outputStyle" "compressed" "enableSourceMap" true) }}
<link href="{{ $style.RelPermalink }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">

<link rel="shortcut icon" type="image/png" href="/favicon.png" />
<link rel="shortcut icon" type="image/png" href="/favicon.ico" />

<meta name="viewport" content="width=device-width initial-scale=1" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand Down
2 changes: 1 addition & 1 deletion themes/build/layouts/partials/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<h1 class="sr-only">{{ .Site.Title }}</h1>
{{ end }}
<a href="{{ .Site.BaseURL }}">
<img src="/assets/images/theme/new-logo.png" alt="{{ .Site.Title }} Logo">
<img src="/assets/images/theme/2024-logo.svg" alt="{{ .Site.Title }} Logo">
</a>
</div>

Expand Down

0 comments on commit 0682c70

Please sign in to comment.