Skip to content

Commit

Permalink
merge results
Browse files Browse the repository at this point in the history
  • Loading branch information
ysmoradi committed Oct 24, 2024
2 parents 1a5f04e + c1396ba commit 2c0e035
Show file tree
Hide file tree
Showing 64 changed files with 185 additions and 145 deletions.
2 changes: 1 addition & 1 deletion src/Besql/Bit.Besql/wwwroot/bit-besql.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var BitBesql = BitBesql || {};
BitBesql.version = window['bit-besql version'] = '8.12.0-pre-05';
BitBesql.version = window['bit-besql version'] = '8.12.0-pre-06';

async function synchronizeDbWithCache(file) {

Expand Down
4 changes: 2 additions & 2 deletions src/Bit.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

<ReleaseVersion>8.12.0</ReleaseVersion>

<PackageReleaseNotes>https://github.com/bitfoundation/bitplatform/releases/tag/v-$(ReleaseVersion)-pre-05</PackageReleaseNotes>
<PackageVersion>$(ReleaseVersion)-pre-05</PackageVersion>
<PackageReleaseNotes>https://github.com/bitfoundation/bitplatform/releases/tag/v-$(ReleaseVersion)-pre-06</PackageReleaseNotes>
<PackageVersion>$(ReleaseVersion)-pre-06</PackageVersion>

<!-- Version -->
<Version Condition=" '$(Configuration)' == 'Release' ">$(ReleaseVersion).$([System.DateTime]::Now.ToString(HHmm))</Version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<div id="@_calloutId"
style="@Styles?.Callout"
class="bit-mnb-cal @Classes?.Callout">
<ul role="presentation" class="bit-mnb-cul">
<ul role="presentation" style="@Styles?.CalloutContainer" class="bit-mnb-cul @Classes?.CalloutContainer">
@foreach (TItem item in _items)
{
if (Sticky && item == SelectedItem) continue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,15 @@ public class BitMenuButtonClassStyles
public string? OperatorButtonText { get; set; }

/// <summary>
/// Custom CSS classes/styles for the callout container of the BitMenuButton.
/// Custom CSS classes/styles for the callout of the BitMenuButton.
/// </summary>
public string? Callout { get; set; }

/// <summary>
/// Custom CSS classes/styles for the callout container of the BitMenuButton.
/// </summary>
public string? CalloutContainer { get; set; }

/// <summary>
/// Custom CSS classes/styles for the chevron down button of the BitMenuButton.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
@namespace Bit.BlazorUI
@inherits BitComponentBase

@{
var presentationIcon = GetPresentationIcon();
}

<div @ref="RootElement" @attributes="HtmlAttributes"
id="@_Id"
style="@StyleBuilder.Value"
class="@ClassBuilder.Value"
dir="@Dir?.ToString().ToLower()">

<div style="@Styles?.CoinContainer" class="bit-prs-cin @Classes?.CoinContainer" role="presentation">
@{
var presentationIcon = GetPresentationIcon();
}

@if (Size is BitPersonaSize.Size8)
{
if (Presence is BitPersonaPresence.None)
Expand Down Expand Up @@ -49,7 +49,7 @@

if ((ShowInitialsUntilImageLoads && _isLoaded is false) || _hasError)
{
<span style="@Styles?.Initials" class="@Classes?.Initials">
<span style="@Styles?.Initials" class="bit-prs-ini @Classes?.Initials">
@GetInitials()
</span>
}
Expand All @@ -62,7 +62,7 @@
{
if (_hasError is false)
{
string dimension = GetPersonaImageDimension();
var dimension = GetPersonaImageDimension();

<img src="@ImageUrl"
style="display:@(_isLoaded ? "unset": "none");@Styles?.Image"
Expand All @@ -77,7 +77,9 @@
}
else
{
@GetInitials()
<span style="@Styles?.Initials" class="bit-prs-ini @Classes?.Initials">
@GetInitials()
</span>
}
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@
background-color: var(--bit-prs-coin-clr-bg);
}

.bit-prs-ini {
text-transform: uppercase;
}

.bit-prs-img {
opacity: 1;
width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion src/BlazorUI/Bit.BlazorUI/Scripts/general.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(BitBlazorUI as any).version = (window as any)['bit-blazorui version'] = '8.12.0-pre-05';
(BitBlazorUI as any).version = (window as any)['bit-blazorui version'] = '8.12.0-pre-06';

interface DotNetObject {
invokeMethod<T>(methodIdentifier: string, ...args: any[]): T;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-05">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-06">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-05">
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-06">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-05">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-06">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-05">
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-06">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
<Content Remove="appsettings.json" />
<EmbeddedResource Include="appsettings.json" />

<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-05">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-06">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-05">
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-06">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,13 @@ public partial class BitMenuButtonDemo
Name = "Callout",
Type = "string?",
DefaultValue = "null",
Description = "Custom CSS classes/styles for the callout of the BitMenuButton."
},
new()
{
Name = "CalloutContainer",
Type = "string?",
DefaultValue = "null",
Description = "Custom CSS classes/styles for the callout container of the BitMenuButton."
},
new()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-05">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-06">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.5" />
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-05">
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-06">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Bit.Bswup" Version="8.12.0-pre-05" />
<PackageReference Include="Bit.Bswup" Version="8.12.0-pre-06" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-05">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-06">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-05">
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-06">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.12.0-pre-05
// bit version: 8.12.0-pre-06
// https://github.com/bitfoundation/bitplatform/tree/develop/src/Bswup

self.assetsInclude = [];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<Using Include="Bit.BlazorUI.Demo.Client.Core.Services.Contracts" />
<Using Include="Bit.BlazorUI.Demo.Client.Core.Services" />

<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-05">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-06">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-05">
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-06">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion src/BlazorUI/Demo/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Generated by bit-bp template v-8.12.0-pre-05 -->
<!-- Generated by bit-bp template v-8.12.0-pre-06 -->
<Project>
<PropertyGroup>
<LangVersion>12.0</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.12.0-pre-05
// bit version: 8.12.0-pre-06

self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
self.caseInsensitiveUrl = true;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.12.0-pre-05
// bit version: 8.12.0-pre-06

self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
self.caseInsensitiveUrl = true;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.12.0-pre-05
// bit version: 8.12.0-pre-06

// In development, always fetch from the network and do not enable offline support.
// This is because caching would make development more difficult (changes would not
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.12.0-pre-05
// bit version: 8.12.0-pre-06

self.assetsInclude = [];
self.assetsExclude = [
Expand Down
2 changes: 1 addition & 1 deletion src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
window['bit-bswup.progress version'] = '8.12.0-pre-05';
window['bit-bswup.progress version'] = '8.12.0-pre-06';

; (function () {
(window as any).startBswupProgress = (autoReload: boolean,
Expand Down
2 changes: 1 addition & 1 deletion src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
self['bit-bswup.sw version'] = '8.12.0-pre-05';
self['bit-bswup.sw version'] = '8.12.0-pre-06';

interface Window {
clients: any
Expand Down
2 changes: 1 addition & 1 deletion src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const BitBswup = {} as any;
BitBswup.version = window['bit-bswup version'] = '8.12.0-pre-05';
BitBswup.version = window['bit-bswup version'] = '8.12.0-pre-06';

declare const Blazor: any;

Expand Down
2 changes: 1 addition & 1 deletion src/Bswup/FullDemo/Client/wwwroot/service-worker.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.12.0-pre-05
// bit version: 8.12.0-pre-06

// In development, always fetch from the network and do not enable offline support.
// This is because caching would make development more difficult (changes would not
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// bit version: 8.12.0-pre-05
// bit version: 8.12.0-pre-06

self.assetsInclude = [];
self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
Expand Down
2 changes: 1 addition & 1 deletion src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
window['bit-bup.progress version'] = '8.12.0-pre-05';
window['bit-bup.progress version'] = '8.12.0-pre-06';

; (function () {
(window as any).startBupProgress = (showLogs: boolean, showAssets: boolean, appContainerSelector: string, hideApp: boolean, autoHide: boolean) => {
Expand Down
2 changes: 1 addition & 1 deletion src/Bup/Bit.Bup/Scripts/bit-bup.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var BitBup = BitBup || {};
BitBup.version = window['bit-bup version'] = '8.12.0-pre-05';
BitBup.version = window['bit-bup version'] = '8.12.0-pre-06';

declare const Blazor: any;

Expand Down
2 changes: 1 addition & 1 deletion src/Butil/Bit.Butil/Scripts/butil.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
var BitButil = BitButil || {};
BitButil.version = window['bit-butil version'] = '8.12.0-pre-05';
BitButil.version = window['bit-butil version'] = '8.12.0-pre-06';
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Generated by bit-empty template v-8.12.0-pre-05 -->
<!-- Generated by bit-empty template v-8.12.0-pre-06 -->

<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

Expand All @@ -17,14 +17,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Bit.BlazorUI" Version="8.12.0-pre-05" />
<PackageReference Include="Bit.BlazorUI" Version="8.12.0-pre-06" />

<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-05">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-06">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-05">
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-06">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Generated by bit-empty template v-8.12.0-pre-05 -->
<!-- Generated by bit-empty template v-8.12.0-pre-06 -->

<Project Sdk="Microsoft.NET.Sdk.Web">

Expand All @@ -19,14 +19,14 @@
<!--#endif -->

<ItemGroup>
<PackageReference Include="Bit.BlazorUI" Version="8.12.0-pre-05" />
<PackageReference Include="Bit.BlazorUI" Version="8.12.0-pre-06" />

<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-05">
<PackageReference Include="Bit.CodeAnalyzers" Version="8.12.0-pre-06">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-05">
<PackageReference Include="Bit.SourceGenerators" Version="8.12.0-pre-06">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<PackageReference Include="Bit.BlazorUI.Icons" />
<PackageReference Include="Bit.BlazorUI.Assets" />
<!--/+:msbuild-conditional:noEmit -->
<PackageReference Condition=" '$(appInsights)' == 'true' OR '$(appInsights)' == '' " Include="BlazorApplicationInsights" />
<PackageReference Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" />
<PackageReference Condition=" '$(signalr)' == 'true' OR '$(signalr)' == ''" Include="Microsoft.AspNetCore.SignalR.Client" />
<PackageReference Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Microsoft.EntityFrameworkCore.Sqlite" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Color="BitColor.SecondaryBackground"
IconName="@BitIconName.CollapseMenu" />

<BitStack AutoSize VerticalAlign="BitAlignment.Center" Gap="0.5rem" Style="height:4rem">
<BitStack AutoSize VerticalAlign="BitAlignment.Center" Gap="0">
<BitText Typography="BitTypography.H5">
@pageTitle
</BitText>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ header {
z-index: 1;
width: 100%;
position: sticky;
padding-block: 0.5rem;
background-color: $bit-color-background-primary;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
OnClick="CreateCategory">
@Localizer[nameof(AppStrings.AddCategory)]
</BitButton>
<div style="overflow:auto;width:100%">
<BitStack Gap="0" FillContent Style="min-width:fit-content">
<BitStack Gap="0" FillContent>
<div style="overflow:auto">
<BitDataGrid @ref="dataGrid"
Class="categories-grid"
TGridItem="CategoryDto"
Expand Down Expand Up @@ -65,9 +65,9 @@
OnClick="WrapHandled(() => { isDeleteDialogOpen = true; deletingCategory = category; })" />
</BitDataGridTemplateColumn>
</BitDataGrid>
<BitDataGridPaginator Value="pagination" />
</BitStack>
</div>
</div>
<BitDataGridPaginator Value="pagination" />
</BitStack>
</BitStack>
</section>

Expand Down
Loading

0 comments on commit 2c0e035

Please sign in to comment.