Skip to content

Commit

Permalink
Merge pull request #275 from st3phhays/release/0.1.8
Browse files Browse the repository at this point in the history
(#272)(#273)(#274) Events, Social Links, and Alert Banner
  • Loading branch information
st3phhays authored Nov 17, 2022
2 parents 9a45c03 + 6348410 commit a1934ca
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 8 deletions.
2 changes: 1 addition & 1 deletion getting-started/_package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"homepage": "https://github.com/chocolatey/chocolatey.org#readme",
"devDependencies": {
"choco-theme": "0.1.7"
"choco-theme": "0.1.8"
},
"resolutions": {
"glob-parent": "^6.0.1",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "choco-theme",
"version": "0.1.7",
"version": "0.1.8",
"description": "The global theme for Chocolatey Software.",
"repository": {
"type": "git",
Expand Down
1 change: 1 addition & 0 deletions partials/AlertText.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<a class='text-dark' href='https://status.chocolatey.org/issues/2022-11-16-scheduled-maintenance-chocolatey-community-repository-and-website/' target='_blank' rel='noreferrer'>We will be performing scheduled maintenance on the Chocolatey Community Repository (community.chocolatey.org) on Sunday 27th November 2022, between 20:00 and 23:59 UTC.</a>
45 changes: 40 additions & 5 deletions partials/CollapsingRightSidebarContent.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<a href="https://chocolatey.org/events/chocolatey-community-coffee-break" rel="noreferrer" target="_blank">
<img class="border mb-3" src="https://img.chocolatey.org/events/01-15-2.jpg" alt="Chocolatey Community Coffee Break" />
</a>
<p class="convert-utc-to-local fw-bold" data-event-utc="2022-11-17T17:00:00Z" data-event-include-break="true"></p>
<p class="convert-utc-to-local fw-bold" data-event-utc="2022-12-15T17:00:00Z" data-event-include-break="true"></p>
<p class="text-start">Join the Chocolatey Team on our regular monthly stream where we discuss all things Community, what we do, how you can get involved and answer your Chocolatey questions.</p>
<div class="d-flex align-items-center justify-content-center flex-wrap">
<a href="https://chocolatey.org/events/chocolatey-community-coffee-break" rel="noreferrer" target="_blank" class="btn btn-outline-primary mt-2 mx-1">Learn More</a>
Expand All @@ -50,10 +50,10 @@
"name":"Chocolatey Community Coffee Break",
"description":"Join the Chocolatey Team on our regular monthly stream where we discuss all things Community, what we do, how you can get involved and answer your Chocolatey questions.",
"location":"https://chocolatey.org/events/chocolatey-community-coffee-break",
"startDate":"2022-11-17",
"endDate":"2022-11-17",
"startTime":"16:00",
"endTime":"17:00",
"startDate":"2022-12-15",
"endDate":"2022-12-15",
"startTime":"17:00",
"endTime":"18:00",
"options":[
"Apple",
"Google",
Expand All @@ -71,6 +71,41 @@
</div>
</div>
<hr />
<div class="text-center">
<a href="https://chocolatey.org/events/chocolatey-coding-livestream" rel="noreferrer" target="_blank">
<img class="border mb-3" src="https://img.chocolatey.org/events/01-21.jpg" alt="Chocolatey Coding Livestream" />
</a>
<p class="convert-utc-to-local fw-bold" data-event-utc="2022-11-29T20:00:00Z" data-event-include-break="true"></p>
<p class="text-start">Join Josh as he adds the ability to manage Chocolatey GUI config and features with the Chocolatey Ansible Collection.</p>
<div class="d-flex align-items-center justify-content-center flex-wrap">
<a href="https://chocolatey.org/events/chocolatey-coding-livestream" rel="noreferrer" target="_blank" class="btn btn-outline-primary mt-2 mx-1">Learn More</a>
<div class="mt-2 mx-1">
<div class="atcb" style="display:none;">
{
"name":"Chocolatey Coding Livestream",
"description":"Join Josh as he adds the ability to manage Chocolatey GUI config and features with the Chocolatey Ansible Collection.",
"location":"https://chocolatey.org/events/chocolatey-coding-livestream",
"startDate":"2022-11-29",
"endDate":"2022-11-29",
"startTime":"20:00",
"endTime":"21:00",
"options":[
"Apple",
"Google",
"iCal",
"Microsoft365",
"Outlook.com",
"Yahoo"
],
"trigger":"click",
"inline":true,
"iCalFileName":"chocolatey-coding-livestream"
}
</div>
</div>
</div>
</div>
<hr />
<div class="shuffle">
<div class="text-center">
<a href="https://chocolatey.org/events/announcing-chocolatey-central-management-0-10-0" rel="noreferrer" target="_blank">
Expand Down
7 changes: 7 additions & 0 deletions partials/socialmedia.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,11 @@
</div>
</a>
</li>
<li class="list-inline-item">
<a href="https://fosstodon.org/@@chocolatey" target="_blank" rel="me" aria-label="Connect with Chocolatey on Mastodon" title="Connect with Chocolatey on Mastodon">
<div class="bg-mastodon circle" aria-hidden="true">
<i class="fa-brands fa-mastodon"></i>
</div>
</a>
</li>
</ul>
4 changes: 3 additions & 1 deletion scss/variables/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ $rss: $orange;
$chat: #5865f2;
$google: #4285F4;
$website: $gray-600;
$mastodon: #6364ff;

// Palette
$primary-50: tint-color($primary, 90%);
Expand Down Expand Up @@ -211,7 +212,8 @@ $socialmedia-colors: (
rss: $rss,
chat: $chat,
google: $google,
website: $website
website: $website,
mastodon: $mastodon
);

$palette-colors: (
Expand Down

0 comments on commit a1934ca

Please sign in to comment.