Skip to content
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

(#424) Convert blog to Astro #431

Merged
merged 3 commits into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
129 changes: 68 additions & 61 deletions CREDITS.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Chocolatey choco-theme 0.8.1
# Chocolatey choco-theme 0.8.2

**NOTE: This project is used on Chocolatey websites and is being released for the benefit of the community. While we endeavour to help and fix issues, it will be limited to GitHub issues, discussions and pull requests when we are able to.**

Expand Down
15 changes: 0 additions & 15 deletions build/choco-theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -287,21 +287,6 @@ const init = async () => {
}));
console.log('✅ Copying of choco-theme complete');

// If blog repository, update Program.cs
if (repository.name === repositoryConfig.blog.name) {
console.log('🚀 Updating Program.cs with AlertText.html...');
await updateContent({
destination: `${repositoryConfig.theme.root}partials/`,
targetFile: 'Program.cs',
targetFileDestination: repository.root,
targetFileContentToReplace: '"TopNoticeText", ""',
replaceWithContent: 'AlertText.html',
replacementContentIsFile: true,
replacementTemplate: '"TopNoticeText", "{0}"'
});
console.log('✅ Program.cs updated');
}

// Change CSS content
// Font Awesome
if (repository.name === repositoryConfig.portal.name || repository.name === repositoryConfig.ccm.name || repository.language === 'astro') {
Expand Down
4 changes: 2 additions & 2 deletions build/data/preview-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ export const folderMapping: FolderMapping = {
'--blog': {
folder: 'blog',
port: 5082,
isStatiq: true,
isAstro: false
isStatiq: false,
isAstro: true
},
'--ccm': {
folder: 'choco-licensed-management-ui',
Expand Down
5 changes: 3 additions & 2 deletions build/data/repository-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export const astroRepositoryConfig = {
'src/**/*.mdx',
'src/**/*.js',
'src/**/*.ts',
'src/**/*.json',
'public/**/*.js',
'node_modules/choco-astro/src/**/*.astro',
'node_modules/choco-astro/src/**/*.ts'
Expand All @@ -91,9 +92,9 @@ export const astroRepositoryConfig = {

export const repositoryConfig: Record<string, RepositoryConfig> = {
blog: {
...defaultRepositoryConfig,
...astroRepositoryConfig,
name: 'blog',
language: 'hbs'
playwright: 'src/tests/'
},
boxstarter: {
...defaultRepositoryConfig,
Expand Down
2 changes: 1 addition & 1 deletion build/esbuild.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const init = async () => {
const minify = process.argv.includes('--minify');

const banner: string = `/*!
* choco-theme v0.8.1 (https://github.com/chocolatey/choco-theme#readme)
* choco-theme v0.8.2 (https://github.com/chocolatey/choco-theme#readme)
* Copyright 2020-2024 Chocolatey Software
* Licensed under MIT (https://github.com/chocolatey/choco-theme/blob/main/LICENSE)
*/`;
Expand Down
18 changes: 16 additions & 2 deletions dist/css/atcb-overrides.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* Style: Default
*
* Version: 2.6.21
* Version: 2.7.3
* Creator: Jens Kuerschner (https://jekuer.com)
* Project: https://github.com/add2cal/add-to-calendar-button
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
Expand Down Expand Up @@ -740,6 +740,7 @@ a.atcb-modal-btn:not([disabled]):hover {
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: var(--date-btn-headline-line-clamp);
line-clamp: var(--date-btn-headline-line-clamp);
-webkit-box-orient: vertical;
}

Expand All @@ -759,6 +760,7 @@ a.atcb-modal-btn:not([disabled]):hover {
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 1;
line-clamp: 1;
-webkit-box-orient: vertical;
word-break: break-all;
}
Expand Down Expand Up @@ -1236,6 +1238,17 @@ a.atcb-modal-btn:not([disabled]):hover {
min-width: 150px;
}

.pro-form-fine {
font-size: 0.8em;
margin: 0.5em auto 1em;
opacity: 0.5;
text-align: center;
}

.pro-form.form-error .pro-form-fine {
opacity: 0;
}

.pro-waiting {
background-color: var(--modal-btn-background);
border: 1px solid var(--modal-btn-border);
Expand Down Expand Up @@ -1306,7 +1319,7 @@ a.atcb-modal-btn:not([disabled]):hover {
color: inherit;
}

.atcb-modal-content .pro p {
.atcb-modal-content .pro p:not(.pro-form-fine) {
margin: 0;
}

Expand Down Expand Up @@ -1354,6 +1367,7 @@ a.atcb-modal-btn:not([disabled]):hover {

#atcb-reference.atcb-dropup {
position: absolute;
margin-top: -1px;
}

.atcb-modal-host-initialized #atcb-reference.atcb-dropup {
Expand Down
2 changes: 1 addition & 1 deletion dist/css/atcb-overrides.min.css

Large diffs are not rendered by default.

Loading
Loading