From a79ba591fe39fcf9fee25ab5bd347de03f2eb765 Mon Sep 17 00:00:00 2001 From: Leigh Pointer Date: Wed, 28 Apr 2021 07:01:39 +0200 Subject: [PATCH 1/3] Make container fluid to fill the pane --- Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor b/Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor index 0f1dcafe..b90d8c32 100644 --- a/Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor +++ b/Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor @@ -17,7 +17,7 @@ }
-
+
@@ -27,7 +27,7 @@ public override string Name => "Customizable Container"; private bool _title = true; - private string _classes = "container"; + private string _classes = "container-fluid"; protected override void OnParametersSet() { From cad5ce51fc387a21dca041db230592101032560f Mon Sep 17 00:00:00 2001 From: Leigh Pointer Date: Wed, 28 Apr 2021 09:17:01 +0200 Subject: [PATCH 2/3] Fix NuGet Warning NU5048 Icon URL is deprecated in favor of embedding the icon inside the NuGet package. --- Oqtane.Server/Oqtane.Server.csproj | 3 +++ .../Package/[Owner].[Module].Package.csproj | 9 ++++++++- .../External/Package/[Owner].[Module].nuspec | 7 ++++--- .../Modules/Templates/External/Package/icon.png | Bin 0 -> 5235 bytes .../Package/[Owner].[Theme].Package.csproj | 11 +++++++++-- .../External/Package/[Owner].[Theme].nuspec | 7 ++++--- .../Themes/Templates/External/Package/icon.png | Bin 0 -> 5235 bytes 7 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 Oqtane.Server/wwwroot/Modules/Templates/External/Package/icon.png create mode 100644 Oqtane.Server/wwwroot/Themes/Templates/External/Package/icon.png diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj index 37f69666..df9fba63 100644 --- a/Oqtane.Server/Oqtane.Server.csproj +++ b/Oqtane.Server/Oqtane.Server.csproj @@ -59,6 +59,9 @@ + + + diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj index cef85f51..41dd5da4 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj @@ -1,10 +1,17 @@ - + net5.0 false + + + True + + + + diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec index df6e4997..a202b302 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec @@ -1,4 +1,4 @@ - + [Owner].[Module] @@ -11,7 +11,7 @@ false MIT https://github.com/oqtane/oqtane.framework - https://www.oqtane.org/Portals/0/icon.jpg + icon.png oqtane module @@ -26,6 +26,7 @@ - + + \ No newline at end of file diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/icon.png b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..026f566b72e337a824210fbc2f33109545ba47eb GIT binary patch literal 5235 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 literal 0 HcmV?d00001 diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].Package.csproj b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].Package.csproj index 30043010..35a85019 100644 --- a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].Package.csproj +++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].Package.csproj @@ -1,10 +1,17 @@ - + net5.0 false - + + + + True + + + + diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].nuspec b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].nuspec index e73d4618..ab3f76ea 100644 --- a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].nuspec +++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].nuspec @@ -1,4 +1,4 @@ - + [Owner].[Theme] @@ -11,7 +11,7 @@ false MIT https://github.com/oqtane/oqtane.framework - https://www.oqtane.org/Portals/0/icon.jpg + icon.png oqtane module @@ -22,6 +22,7 @@ - + + \ No newline at end of file diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/icon.png b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..026f566b72e337a824210fbc2f33109545ba47eb GIT binary patch literal 5235 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 literal 0 HcmV?d00001 From 6ae5777e1cc10a141f73487281aa0b3fca7d7855 Mon Sep 17 00:00:00 2001 From: Leigh Pointer Date: Wed, 28 Apr 2021 20:31:52 +0200 Subject: [PATCH 3/3] Revert "Fix NuGet Warning NU5048" This reverts commit cad5ce51fc387a21dca041db230592101032560f. --- Oqtane.Server/Oqtane.Server.csproj | 3 --- .../Package/[Owner].[Module].Package.csproj | 9 +-------- .../External/Package/[Owner].[Module].nuspec | 7 +++---- .../Modules/Templates/External/Package/icon.png | Bin 5235 -> 0 bytes .../Package/[Owner].[Theme].Package.csproj | 11 ++--------- .../External/Package/[Owner].[Theme].nuspec | 7 +++---- .../Themes/Templates/External/Package/icon.png | Bin 5235 -> 0 bytes 7 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 Oqtane.Server/wwwroot/Modules/Templates/External/Package/icon.png delete mode 100644 Oqtane.Server/wwwroot/Themes/Templates/External/Package/icon.png diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj index df9fba63..37f69666 100644 --- a/Oqtane.Server/Oqtane.Server.csproj +++ b/Oqtane.Server/Oqtane.Server.csproj @@ -59,9 +59,6 @@ - - - diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj index 41dd5da4..cef85f51 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj @@ -1,17 +1,10 @@ - + net5.0 false - - - True - - - - diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec index a202b302..df6e4997 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec @@ -1,4 +1,4 @@ - + [Owner].[Module] @@ -11,7 +11,7 @@ false MIT https://github.com/oqtane/oqtane.framework - icon.png + https://www.oqtane.org/Portals/0/icon.jpg oqtane module @@ -26,7 +26,6 @@ - - + \ No newline at end of file diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/icon.png b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/icon.png deleted file mode 100644 index 026f566b72e337a824210fbc2f33109545ba47eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5235 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 diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].Package.csproj b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].Package.csproj index 35a85019..30043010 100644 --- a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].Package.csproj +++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].Package.csproj @@ -1,17 +1,10 @@ - + net5.0 false - - - - True - - - - + diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].nuspec b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].nuspec index ab3f76ea..e73d4618 100644 --- a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].nuspec +++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].nuspec @@ -1,4 +1,4 @@ - + [Owner].[Theme] @@ -11,7 +11,7 @@ false MIT https://github.com/oqtane/oqtane.framework - icon.png + https://www.oqtane.org/Portals/0/icon.jpg oqtane module @@ -22,7 +22,6 @@ - - + \ No newline at end of file diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/icon.png b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/icon.png deleted file mode 100644 index 026f566b72e337a824210fbc2f33109545ba47eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5235 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