Skip to content

Commit

Permalink
Merge branch 'release/10.0.0' into dnn10-theme
Browse files Browse the repository at this point in the history
  • Loading branch information
david-poindexter authored Dec 23, 2023
2 parents 4c64a26 + 56c6709 commit 4eaf69f
Show file tree
Hide file tree
Showing 43 changed files with 2,010 additions and 1,140 deletions.
28 changes: 28 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,31 @@ updates:
labels:
- ".NET"
- "Type: Maintenance"
groups:
MailKit:
patterns:
- "MailKit"
- "MimeKit"
- "BouncyCastle.Cryptography"
Google-Apis:
patterns:
- "Google.Apis*"
AspNet:
patterns:
- "Microsoft.AspNet.*"
SourceLink:
patterns:
- "Microsoft.SourceLink.*"
TestStack-Dossier:
patterns:
- "TestStack.Dossier"
- "AutoFixture"
- "Fare"
- "NSubstitute"
- "Castle.Core"
Cake-Issues:
patterns:
- "Cake.Issues*"
DependencyInjection:
patterns:
- "Microsoft.Extensions.DependencyInjection*"
2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
compressionLevel: mixed

nodeLinker: node-modules
4 changes: 2 additions & 2 deletions Build/Build.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<PackAsTool>true</PackAsTool>
<!-- Make sure start same folder .NET Core CLI and Visual Studio -->
<RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
Expand All @@ -16,7 +16,7 @@
<ItemGroup>
<PackageReference Include="Cake.BuildSystems.Module" Version="5.0.0" />
<PackageReference Include="Cake.FileHelpers" Version="6.1.3" />
<PackageReference Include="Cake.Frosting" Version="3.1.0" />
<PackageReference Include="Cake.Frosting" Version="4.0.0" />
<PackageReference Include="Cake.Git" Version="3.0.0" />
<PackageReference Include="Cake.Issues" Version="3.0.0" />
<PackageReference Include="Cake.Issues.MsBuild" Version="3.0.0" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN.Connectors.GoogleAnalytics4" type="Connector" isSystem="false" version="09.13.00">
<package name="DNN.Connectors.GoogleAnalytics4" type="Connector" isSystem="false" version="10.00.00">
<friendlyName>Google Analytics 4 Connector</friendlyName>
<description>Configure your site's Google Analytics 4 settings.</description>
<iconFile>~/DesktopModules/Connectors/GoogleAnalytics4/Images/GoogleAnalytics4_32X32_Standard.png</iconFile>
Expand Down
227 changes: 227 additions & 0 deletions DNN Platform/DotNetNuke.Abstractions/Portals/IPortalStyles.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,227 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information

namespace DotNetNuke.Abstractions.Portals
{
/// <summary>
/// Provides css custom properties to customize the Dnn UI in the platform, themes and modules for an overall consistent look.
/// </summary>
public interface IPortalStyles
{
/// <summary>
/// Gets or sets the main shade of the primary color.
/// </summary>
StyleColor ColorPrimary { get; set; }

/// <summary>
/// Gets or sets the light shade of the primary color.
/// </summary>
StyleColor ColorPrimaryLight { get; set; }

/// <summary>
/// Gets or sets the dark shade of the primary color.
/// </summary>
StyleColor ColorPrimaryDark { get; set; }

/// <summary>
/// Gets or sets a color that contrasts well over the primary color shades.
/// </summary>
StyleColor ColorPrimaryContrast { get; set; }

/// <summary>
/// Gets or sets the main shade of the secondary color.
/// </summary>
StyleColor ColorSecondary { get; set; }

/// <summary>
/// Gets or sets the light shade of the secondary color.
/// </summary>
StyleColor ColorSecondaryLight { get; set; }

/// <summary>
/// Gets or sets the dark shade of the secondary color.
/// </summary>
StyleColor ColorSecondaryDark { get; set; }

/// <summary>
/// Gets or sets a color that contrasts well over the secondary color shades.
/// </summary>
StyleColor ColorSecondaryContrast { get; set; }

/// <summary>
/// Gets or sets the main shade of the Tertiary color.
/// </summary>
StyleColor ColorTertiary { get; set; }

/// <summary>
/// Gets or sets the light shade of the Tertiary color.
/// </summary>
StyleColor ColorTertiaryLight { get; set; }

/// <summary>
/// Gets or sets the dark shade of the Tertiary color.
/// </summary>
StyleColor ColorTertiaryDark { get; set; }

/// <summary>
/// Gets or sets a color that contrasts well over the Tertiary color shades.
/// </summary>
StyleColor ColorTertiaryContrast { get; set; }

/// <summary>
/// Gets or sets the main shade of the Neutral color.
/// </summary>
StyleColor ColorNeutral { get; set; }

/// <summary>
/// Gets or sets the light shade of the Neutral color.
/// </summary>
StyleColor ColorNeutralLight { get; set; }

/// <summary>
/// Gets or sets the dark shade of the Neutral color.
/// </summary>
StyleColor ColorNeutralDark { get; set; }

/// <summary>
/// Gets or sets a color that contrasts well over the Neutral color shades.
/// </summary>
StyleColor ColorNeutralContrast { get; set; }

/// <summary>
/// Gets or sets the main shade of the Background color.
/// </summary>
StyleColor ColorBackground { get; set; }

/// <summary>
/// Gets or sets the light shade of the Background color.
/// </summary>
StyleColor ColorBackgroundLight { get; set; }

/// <summary>
/// Gets or sets the dark shade of the Background color.
/// </summary>
StyleColor ColorBackgroundDark { get; set; }

/// <summary>
/// Gets or sets a color that contrasts well over the Background color shades.
/// </summary>
StyleColor ColorBackgroundContrast { get; set; }

/// <summary>
/// Gets or sets the main shade of the Foreground color.
/// </summary>
StyleColor ColorForeground { get; set; }

/// <summary>
/// Gets or sets the light shade of the Foreground color.
/// </summary>
StyleColor ColorForegroundLight { get; set; }

/// <summary>
/// Gets or sets the dark shade of the Foreground color.
/// </summary>
StyleColor ColorForegroundDark { get; set; }

/// <summary>
/// Gets or sets a color that contrasts well over the Foreground color shades.
/// </summary>
StyleColor ColorForegroundContrast { get; set; }

/// <summary>
/// Gets or sets the main shade of the Info color.
/// </summary>
StyleColor ColorInfo { get; set; }

/// <summary>
/// Gets or sets the light shade of the Info color.
/// </summary>
StyleColor ColorInfoLight { get; set; }

/// <summary>
/// Gets or sets the dark shade of the Info color.
/// </summary>
StyleColor ColorInfoDark { get; set; }

/// <summary>
/// Gets or sets a color that contrasts well over the Info color shades.
/// </summary>
StyleColor ColorInfoContrast { get; set; }

/// <summary>
/// Gets or sets the main shade of the Success color.
/// </summary>
StyleColor ColorSuccess { get; set; }

/// <summary>
/// Gets or sets the light shade of the Success color.
/// </summary>
StyleColor ColorSuccessLight { get; set; }

/// <summary>
/// Gets or sets the dark shade of the Success color.
/// </summary>
StyleColor ColorSuccessDark { get; set; }

/// <summary>
/// Gets or sets a color that contrasts well over the Success color shades.
/// </summary>
StyleColor ColorSuccessContrast { get; set; }

/// <summary>
/// Gets or sets the main shade of the Warning color.
/// </summary>
StyleColor ColorWarning { get; set; }

/// <summary>
/// Gets or sets the light shade of the Warning color.
/// </summary>
StyleColor ColorWarningLight { get; set; }

/// <summary>
/// Gets or sets the dark shade of the Warning color.
/// </summary>
StyleColor ColorWarningDark { get; set; }

/// <summary>
/// Gets or sets a color that contrasts well over the Warning color shades.
/// </summary>
StyleColor ColorWarningContrast { get; set; }

/// <summary>
/// Gets or sets the main shade of the Danger color.
/// </summary>
StyleColor ColorDanger { get; set; }

/// <summary>
/// Gets or sets the light shade of the Danger color.
/// </summary>
StyleColor ColorDangerLight { get; set; }

/// <summary>
/// Gets or sets the dark shade of the Danger color.
/// </summary>
StyleColor ColorDangerDark { get; set; }

/// <summary>
/// Gets or sets a color that contrasts well over the Danger color shades.
/// </summary>
StyleColor ColorDangerContrast { get; set; }

/// <summary>
/// Gets or sets the controls border radius in pixels.
/// </summary>
double ControlsRadius { get; set; }

/// <summary>
/// Gets or sets the controls padding in pixels.
/// </summary>
double ControlsPadding { get; set; }

/// <summary>
/// Gets or sets the base font size in pixels.
/// </summary>
double BaseFontSize { get; set; }
}
}
Loading

0 comments on commit 4eaf69f

Please sign in to comment.