ghostcms/solo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'TryGhost:main' into main

Browse Source
This commit is contained in:
Evan Wondrasek 2023-06-04 21:03:26 -07:00 committed by GitHub
commit 7965d76978
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/built/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
assets/built/main.min.js.map
View File

File diff suppressed because one or more lines are too long

2
assets/built/screen.css
View File

File diff suppressed because one or more lines are too long

2
assets/built/screen.css.map
View File

File diff suppressed because one or more lines are too long

12
assets/css/screen.css
View File

@ -1,4 +1,4 @@
@import "@tryghost/shared-theme-assets/assets/css/screen.css";
@import "@tryghost/shared-theme-assets/assets/css/v1/screen.css";
@import "fonts.css";
:root {
@ -115,7 +115,8 @@ hr {
max-height: 48px;
}
.gh-head-menu {
.gh-head-menu,
.gh-head-link {
font-weight: 700;
}
@ -129,7 +130,7 @@ hr {
}
@media (max-width: 991px) {
.is-head-open:not(.is-head-brand):not(.is-head-dark):not(.is-head-transparent) #gh-head {
.is-head-open:not(.is-head-brand):not(.is-head-dark):not(.is-head-transparent) :is(#gh-head, #gh-head .gh-head-actions) {
background-color: var(--background-color);
}
}
@ -141,6 +142,10 @@ hr {
margin-bottom: 40px;
}
.gh-about-content {
word-break: break-word;
}
.gh-about-primary {
max-width: 1200px;
font-size: clamp(3.2rem, 2.4452rem + 2.0968vw, 5.8rem);
@ -334,6 +339,7 @@ hr {
.gh-card-title {
font-weight: 800;
word-break: break-word;
}
.has-serif-font .gh-card-title {

25
default.hbs
View File

@ -51,7 +51,7 @@
{{/if}}
</a>
</div>
<button class="gh-search gh-icon-btn" data-ghost-search>{{> "icons/search"}}</button>
<button class="gh-search gh-icon-btn" aria-label="Search this site" data-ghost-search>{{> "icons/search"}}</button>
<button class="gh-burger"></button>
</div>
@ -59,7 +59,7 @@
{{navigation}}
{{#unless @site.members_enabled}}
{{#match @custom.navigation_layout "Stacked"}}
<button class="gh-search gh-icon-btn" data-ghost-search>{{> "icons/search"}}</button>
<button class="gh-search gh-icon-btn" aria-label="Search this site" data-ghost-search>{{> "icons/search"}}</button>
{{/match}}
{{/unless}}
</nav>
@ -67,19 +67,22 @@
<div class="gh-head-actions">
{{#unless @site.members_enabled}}
{{^match @custom.navigation_layout "Stacked"}}
<button class="gh-search gh-icon-btn" data-ghost-search>{{> "icons/search"}}</button>
<button class="gh-search gh-icon-btn" aria-label="Search this site" data-ghost-search>{{> "icons/search"}}</button>
{{/match}}
{{else}}
<button class="gh-search gh-icon-btn" data-ghost-search>{{> "icons/search"}}</button>
{{#unless @member}}
{{#unless @site.members_invite_only}}
<a class="gh-head-btn gh-btn gh-primary-btn" href="#/portal/signup" data-portal="signup">Subscribe</a>
<button class="gh-search gh-icon-btn" aria-label="Search this site" data-ghost-search>{{> "icons/search"}}</button>
<div class="gh-head-members">
{{#unless @member}}
{{#unless @site.members_invite_only}}
<a class="gh-head-link" href="#/portal/signin" data-portal="signin">Sign in</a>
<a class="gh-head-btn gh-btn gh-primary-btn" href="#/portal/signup" data-portal="signup">Subscribe</a>
{{else}}
<a class="gh-head-btn gh-btn gh-primary-btn" href="#/portal/signin" data-portal="signin">Sign in</a>
{{/unless}}
{{else}}
<a class="gh-head-btn gh-btn gh-primary-btn" href="#/portal/signin" data-portal="signin">Login</a>
<a class="gh-head-btn gh-btn gh-primary-btn" href="#/portal/account" data-portal="account">Account</a>
{{/unless}}
{{else}}
<a class="gh-head-btn gh-btn gh-primary-btn" href="#/portal/account" data-portal="account">Account</a>
{{/unless}}
</div>
{{/unless}}
</div>
</div>

4
gulpfile.js
View File

@ -51,8 +51,8 @@ function css(done) {
function js(done) {
pump([
src([
'node_modules/@tryghost/shared-theme-assets/assets/js/lib/**/*.js',
'node_modules/@tryghost/shared-theme-assets/assets/js/main.js',
'node_modules/@tryghost/shared-theme-assets/assets/js/v1/lib/**/*.js',
'node_modules/@tryghost/shared-theme-assets/assets/js/v1/main.js',
'assets/js/lib/*.js',
'assets/js/main.js'
], {sourcemaps: true}),

11
package.json
View File

@ -17,6 +17,7 @@
"theme",
"ghost-theme"
],
"docs": "https://solo.ghost.io/about/",
"config": {
"posts_per_page": 6,
"image_sizes": {
@ -88,18 +89,18 @@
"zip": "gulp zip"
},
"devDependencies": {
"@tryghost/shared-theme-assets": "1.3.1",
"autoprefixer": "10.4.13",
"@tryghost/shared-theme-assets": "2.1.1",
"autoprefixer": "10.4.14",
"beeper": "2.1.0",
"cssnano": "5.1.14",
"gscan": "4.34.0",
"cssnano": "6.0.1",
"gscan": "4.36.3",
"gulp": "4.0.2",
"gulp-concat": "2.6.1",
"gulp-livereload": "4.0.2",
"gulp-postcss": "9.0.1",
"gulp-uglify": "3.0.2",
"gulp-zip": "5.1.0",
"postcss": "8.4.19",
"postcss": "8.4.24",
"postcss-easy-import": "4.0.0",
"pump": "3.0.0"
}