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.

Sign up for GitHub

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

Jump to bottom

OSOE-93: Fixing style lint error custom-property-empty-line-before #17

Merged
merged 4 commits into from
May 30, 2022
Merged

OSOE-93: Fixing style lint error custom-property-empty-line-before #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08af5fc
Fixing style lint error: Unexpected empty line before custom property…
dministro May 17, 2022
f1a2dee
updating manifest version
dministro May 18, 2022
9bc8372
Merge branch 'dev' of https://github.com/Lombiq/Orchard-Base-Theme in…
dministro May 26, 2022
f25f758
Merge branch 'dev' of https://github.com/Lombiq/Orchard-Base-Theme in…
dministro May 26, 2022
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
2 changes: 1 addition & 1 deletion Lombiq.BaseTheme.Samples/Manifest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[assembly: Theme(
Name = "Lombiq Base Theme - Samples",
Author = "Lombiq Technologies",
Version = "1.0.1",
Version = "1.0.2-alpha",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Next time don't skip a minor version when publishing an alpha (the current version at the time was 1.0.0 so this should have been 1.0.1-alpha): https://lombiq.atlassian.net/wiki/spaces/DEV/pages/786857987/Managing+releases+of+open-source+projects#:~:text=When%20publishing%20a%20pre%2Drelease%20version%20for%20something%20temporary%20you%20do%20under%20an%20issue%2C%20then%20always%20use%20the%20next%20patch%20version%20with%20a%20suffix.%20E.g.%20if%20the%20current%20latest%20released%20version%20if%201.2.3%20then%20publish%201.2.4%2Dalpha.0.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When I made this, there was a 1.0.1-alpha already on nuget, and it was @DAud-IcI version

image

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll clarify the docs but it refers to the latest released version. (All this is important for proper releases on GitHub.)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps it would be a good idea to include the issue code in the version code, such as 1.0.1-alpha.osoe-93.1 or something along the lines, so it won't be confusing when two branches need to make independent pre-releases. What do you think @Piedone ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That did occur to me but it didn't seem like a polite thing to do on NuGet, to mix in our issues. But I suppose these pre-releases are adding some pollution anyway, we can try.

Website = "https://github.com/Lombiq/Orchard-Base-Theme",
Description = "A sample theme that builds on Lombiq Base Theme.",
// A base theme is another theme project. Orchard Core Display Management first searches your theme and then the
Expand Down
3 changes: 1 addition & 2 deletions Lombiq.BaseTheme/Assets/Styles/abstracts/_native-variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// --------------------------------------------------------------------------------------------------------------------
// --------------------------------------------------------------------------------------------------------------------
// Application-wide CSS variables
// ==============================
// You don't need to import this in any other Sass file except in the site.scss which renders these variables globally
Expand All @@ -10,7 +10,6 @@
// Fonts
--font-default: var(--bs-body-font-family);
--font-header: var(--bs-font-sans-serif);

--color-foreground-body: black;
--color-background-body: white;

Expand Down
2 changes: 1 addition & 1 deletion Lombiq.BaseTheme/Manifest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[assembly: Theme(
Name = "Lombiq Base Theme",
Author = "Lombiq Technologies",
Version = "1.0.1",
Version = "1.0.2-alpha",
Website = "https://github.com/Lombiq/Orchard-Base-Theme",
Description = "The base frontend theme for shared content that are not specific to a specific project's theme."
)]
2 changes: 1 addition & 1 deletion Lombiq.BaseTheme/wwwroot/css/site.css.map
View file
Open in desktop

Large diffs are not rendered by default.