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

OSOE-415: Orchard-Base-Theme shouldn't lock on every page load #52

Merged
merged 23 commits into from
Dec 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
9821b1a
Rewrite RemoveBootstrap5 to only lock when there is actually anything…
sarahelsaig Dec 8, 2022
41a7bcc
Make it a middleware instead.
sarahelsaig Dec 9, 2022
d161f2a
Don't async when done.
sarahelsaig Dec 9, 2022
0857456
Elaborate the xmldoc.
sarahelsaig Dec 9, 2022
6910f09
Update Lombiq.BaseTheme/Middlewares/RemoveBootstrapMiddleware.cs
sarahelsaig Dec 11, 2022
f9e2c45
Merge remote-tracking branch 'origin/dev' into issue/OSOE-415
sarahelsaig Dec 18, 2022
e85ffbe
Update site.css.map.
sarahelsaig Dec 18, 2022
500414b
Remove _done, because of false positive in multi-tenancy.
sarahelsaig Dec 18, 2022
5d4f6d0
Add notes about tenants.
sarahelsaig Dec 18, 2022
bd0a862
Add version to the bootstrap script so it doesn't break BehaviorChart…
sarahelsaig Dec 18, 2022
2c41be1
Apply suggestions from code review
sarahelsaig Dec 19, 2022
795417d
Remove only V5.
sarahelsaig Dec 19, 2022
f48a11e
Fix InvalidOperationException.
sarahelsaig Dec 19, 2022
3926f5b
Keep the latest version of script.
sarahelsaig Dec 20, 2022
c1f3f1f
simplify
sarahelsaig Dec 20, 2022
5217fd2
Upgrade bootstrap to 5.2.3.
sarahelsaig Dec 20, 2022
b67b2ac
Update wwwroot.
sarahelsaig Dec 20, 2022
2095f43
Fix BS 5.2 navbar breaking change.
sarahelsaig Dec 20, 2022
e07e84b
Update bootstrap version in samples project too.
sarahelsaig Dec 20, 2022
39964c7
Fix bug with RemoveBootstrapMiddleware.
sarahelsaig Dec 20, 2022
22235a8
Use the JS bundle (contains popper).
sarahelsaig Dec 20, 2022
effdaaa
Add comment in GetResourcesToClear.
sarahelsaig Dec 20, 2022
c76f164
Tighten relationship between references to NPM BS version.
sarahelsaig Dec 20, 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
4 changes: 3 additions & 1 deletion Lombiq.BaseTheme.Samples/Views/Widget-LayoutInjection.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
from the Layout.cshtml would prevent adding content to a zone with the tag helper, if the zone already contained
anything (like a conventional OC widget). By making this a widget, you can safely insert zones and resources. *@
<zone name="@ZoneNames.Header">
<div class="navbar-brand">@Site.SiteName</div>
<div class="navbar">
<div class="navbar-brand">@Site.SiteName</div>
</div>
<p class="zoneInsertionExample_header">
@T["Here you can easily inject shapes into the zones, kind of like always enabled widgets."]
</p>
Expand Down
2 changes: 1 addition & 1 deletion Lombiq.BaseTheme.Samples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dotnet-postclean": "gulp clean"
},
"dependencies": {
"bootstrap": "^5.1.3"
"bootstrap": "5.2.3"
}
}
10 changes: 5 additions & 5 deletions Lombiq.BaseTheme.Samples/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Loading