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

Beta/colors of deps #331

Merged
merged 2 commits into from
Apr 7, 2024
Merged

Beta/colors of deps #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ee777b
colors
dimmik Apr 7, 2024
fb1bb50
lighter grey
dimmik Apr 7, 2024
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
6 changes: 3 additions & 3 deletions TCBlazor/Client/Components/TourPersonsComponent.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
if (string.IsNullOrWhiteSpace(p.ParentId)){
return GetFamilyStyle(p.FamilyId);
} else {
return $"background-color: #eeeeee";
return $"background-color: #cccccc";
}
//return "";
})
Expand Down Expand Up @@ -145,8 +145,8 @@


private string GetFamilyStyle(string familyId){
if (string.IsNullOrWhiteSpace(familyId)) return "background-color: #ffffff";
return "background-color: mintcream";
if (string.IsNullOrWhiteSpace(familyId)) return "background-color: white";
return "background-color: #98FB98";
}

protected override async Task OnInitializedAsync()
Expand Down
42 changes: 23 additions & 19 deletions TCBlazor/Server/inmemory-tours.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@
],
"ParentId": null,
"GroupId": "17975426c811495c8495c677bf33baa5",
"FamilyId": "",
"Metadata": "",
"GUID": "k47ppfq",
"Order": 0,
Expand Down Expand Up @@ -394,8 +395,9 @@
"Type": "Common"
}
],
"ParentId": null,
"ParentId": "2jkqhfy",
"GroupId": "b1be085d4a1244b6a808d748efb3e682",
"FamilyId": "",
"Metadata": "",
"GUID": "smfp7fq",
"Order": 0,
Expand Down Expand Up @@ -428,6 +430,7 @@
],
"ParentId": null,
"GroupId": "885924ae90db455dbe39c08e19e50cd3",
"FamilyId": "",
"Metadata": "",
"GUID": "2jkqhfy",
"Order": 0,
Expand Down Expand Up @@ -477,6 +480,7 @@
],
"ParentId": null,
"GroupId": "cd99dad8977b4de4b3a627dd1db592aa",
"FamilyId": "",
"Metadata": "",
"GUID": "mrxq3fy",
"Order": 0,
Expand Down Expand Up @@ -518,16 +522,16 @@
"DateCreated": "2023-11-26T13:10:12.458Z"
},
{
"FromGuid": "k47ppfq",
"FromGuid": "smfp7fq",
"ToGuid": [
"mrxq3fy"
"2jkqhfy"
],
"AmountInCents": 1000,
"Weighted": true,
"IsPartialWeighted": false,
"ToAll": false,
"Planned": true,
"Description": "X 'а' -> '_банк'",
"Description": "Family 'б' -> 'в'",
"Type": "",
"Currency": {
"Id": "EUR",
Expand All @@ -538,24 +542,24 @@
"IsDryRun": false,
"IncludeDryRunInCalc": false,
"Color": "",
"SpendingDate": "2023-11-26T13:11:35.201Z",
"SpendingDate": "2024-04-07T15:12:50.4324319+02:00",
"Metadata": null,
"GUID": "68911641F0D0CCE9E427CF84209970FF",
"GUID": "381170EA5C60CF86583EE2C06DF2F028",
"Order": 0,
"IsChanged": true,
"DateCreated": "2023-11-26T13:11:35.201Z"
"DateCreated": "2024-04-07T15:12:50.4324319+02:00"
},
{
"FromGuid": "smfp7fq",
"FromGuid": "2jkqhfy",
"ToGuid": [
"mrxq3fy"
],
"AmountInCents": 1000,
"AmountInCents": 2000,
"Weighted": true,
"IsPartialWeighted": false,
"ToAll": false,
"Planned": true,
"Description": "X 'б' -> '_банк'",
"Description": "X 'в' -> '_банк'",
"Type": "",
"Currency": {
"Id": "EUR",
Expand All @@ -566,15 +570,15 @@
"IsDryRun": false,
"IncludeDryRunInCalc": false,
"Color": "",
"SpendingDate": "2023-11-26T13:11:35.201Z",
"SpendingDate": "2024-04-07T15:12:50.4364837+02:00",
"Metadata": null,
"GUID": "A11064B907C79789BFF15C866A572452",
"GUID": "2D216D88F778E673984BBE8C0316136D",
"Order": 0,
"IsChanged": true,
"DateCreated": "2023-11-26T13:11:35.201Z"
"DateCreated": "2024-04-07T15:12:50.4364837+02:00"
},
{
"FromGuid": "2jkqhfy",
"FromGuid": "k47ppfq",
"ToGuid": [
"mrxq3fy"
],
Expand All @@ -583,7 +587,7 @@
"IsPartialWeighted": false,
"ToAll": false,
"Planned": true,
"Description": "X 'в' -> '_банк'",
"Description": "X 'а' -> '_банк'",
"Type": "",
"Currency": {
"Id": "EUR",
Expand All @@ -594,12 +598,12 @@
"IsDryRun": false,
"IncludeDryRunInCalc": false,
"Color": "",
"SpendingDate": "2023-11-26T13:11:35.201Z",
"SpendingDate": "2024-04-07T15:12:50.4365942+02:00",
"Metadata": null,
"GUID": "FE0B0FD5ACEFA7FC8F6666621024659B",
"GUID": "68911641F0D0CCE9E427CF84209970FF",
"Order": 0,
"IsChanged": true,
"DateCreated": "2023-11-26T13:11:35.201Z"
"DateCreated": "2024-04-07T15:12:50.4365942+02:00"
}
],
"Name": "тест мультив",
Expand All @@ -611,7 +615,7 @@
"VersionComment": "",
"IsArchived": false,
"IsFinalizing": false,
"StateGUID": "2023-11-26 16:11:47.ecb541de-580a-49bb-b0a8-83ef7cfefd22",
"StateGUID": "2024-04-07 16:12:50.e329692c-870c-42cf-b813-726cf29b6071",
"Currencies": [
{
"Id": "EUR",
Expand Down
Loading