Skip to content

Commit 2a62994

Browse files
Daniel127Daniel127
authored
Merge pull request #9 from Daniel127/develop
Merge from develop
2 parents 32ec0fc + 3d58c80 commit 2a62994

34 files changed

+9391
-122
lines changed

‎.azure/workflows/azure-ci-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ steps:
2727
version: '2.2.402'
2828
- task: DotNetCoreInstaller@1
2929
inputs:
30-
version: '3.0.100-preview9-014004'
30+
version: '3.0.100-rc1-014190'
3131

3232
# SonarCloud Prepare Analysis
3333
- task: SonarCloudPrepare@1

‎.github/workflows/ci-release.yml renamed to ‎.github/workflows/ci-release.yml.backup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ jobs:
1212
- name: Setup .NET Core
1313
uses: actions/setup-dotnet@v1
1414
with:
15-
dotnet-version: 3.0.100-preview9-014004
15+
dotnet-version: 3.0.100-rc1-014190
1616
- name: Build with dotnet
1717
run: dotnet build --configuration Release

‎QD.Components.Semantic.Demo/Pages/Buttons.razor

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@page "/buttons"
22
@using QD.Components.Semantic.Enums
3+
@using QD.Components.Semantic.Enums.Button
34

45
<h1>Buttons</h1>
56

@@ -11,15 +12,15 @@
1112
<Button secondary>Secondary</Button>
1213

1314
<h2>Animated Button</h2>
14-
<Button animated="@ButtonAnimation.Horizontal">
15+
<Button animated="@Animation.Horizontal">
1516
<ButtonContent visible>1</ButtonContent>
1617
<ButtonContent hidden>2</ButtonContent>
1718
</Button>
18-
<Button animated="@ButtonAnimation.Vertical" primary>
19+
<Button animated="@Animation.Vertical" primary>
1920
<ButtonContent visible>1</ButtonContent>
2021
<ButtonContent hidden>2</ButtonContent>
2122
</Button>
22-
<Button animated="@ButtonAnimation.Fade" secondary>
23+
<Button animated="@Animation.Fade" secondary>
2324
<ButtonContent visible>1</ButtonContent>
2425
<ButtonContent hidden>2</ButtonContent>
2526
</Button>

‎QD.Components.Semantic.Demo/Pages/Containers.razor

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
@page "/containers"
2+
@using QD.Components.Semantic.Enums.Container
3+
4+
<h1>Containers</h1>
5+
6+
<h2>Standard Container</h2>
7+
<Container>
8+
<p>
9+
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo
10+
ligula eget dolor. Aenean massa strong. Cum sociis natoque penatibus et
11+
magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis,
12+
ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa
13+
quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget,
14+
arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo.
15+
Nullam dictum felis eu pede link mollis pretium. Integer tincidunt. Cras
16+
dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus.
17+
Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim.
18+
Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus
19+
viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet.
20+
Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi.
21+
</p>
22+
</Container>
23+
24+
<h2>Text Container</h2>
25+
<Container text>
26+
<h2 class="ui header">Header</h2>
27+
<p>
28+
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo
29+
ligula eget dolor. Aenean massa strong. Cum sociis natoque penatibus et
30+
magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis,
31+
ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa
32+
quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget,
33+
arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo.
34+
Nullam dictum felis eu pede link mollis pretium. Integer tincidunt. Cras
35+
dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus.
36+
Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim.
37+
Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus
38+
viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet.
39+
Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi.
40+
</p>
41+
<p>
42+
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo
43+
ligula eget dolor. Aenean massa strong. Cum sociis natoque penatibus et
44+
magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis,
45+
ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa
46+
quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget,
47+
arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo.
48+
Nullam dictum felis eu pede link mollis pretium. Integer tincidunt. Cras
49+
dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus.
50+
Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim.
51+
Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus
52+
viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet.
53+
Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi.
54+
</p>
55+
</Container>
56+
57+
<h2>Text alignment</h2>
58+
<div>
59+
<Container textAlign="@TextAlign.Left">Left Aligned</Container>
60+
<Container textAlign="@TextAlign.Center">Center Aligned</Container>
61+
<Container textAlign="@TextAlign.Right">Right Aligned</Container>
62+
<Container textAlign="@TextAlign.Justified">
63+
<b>Justified</b>
64+
<div class="ui divider"></div>
65+
<p>
66+
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo
67+
ligula eget dolor. Aenean massa strong. Cum sociis natoque penatibus et
68+
magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis,
69+
ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa
70+
quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget,
71+
arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo.
72+
Nullam dictum felis eu pede link mollis pretium. Integer tincidunt. Cras
73+
dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend
74+
tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac,
75+
enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus.
76+
Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean
77+
imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper
78+
ultricies nisi.
79+
</p>
80+
<p>
81+
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo
82+
ligula eget dolor. Aenean massa strong. Cum sociis natoque penatibus et
83+
magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis,
84+
ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa
85+
quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget,
86+
arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo.
87+
Nullam dictum felis eu pede link mollis pretium. Integer tincidunt. Cras
88+
dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend
89+
tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac,
90+
enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus.
91+
Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean
92+
imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper
93+
ultricies nisi.
94+
</p>
95+
</Container>
96+
</div>
97+
98+
<h2>Fluid</h2>
99+
<div>
100+
<Container fluid>
101+
<h2 class="ui header">Dogs Roles with Humans</h2>
102+
<p>
103+
Domestic dogs inherited complex behaviors, such as bite inhibition, from
104+
their wolf ancestors, which would have been pack hunters with complex
105+
body language. These sophisticated forms of social cognition and
106+
communication may account for their trainability, playfulness, and
107+
ability to fit into human households and social situations, and these
108+
attributes have given dogs a relationship with humans that has enabled
109+
them to become one of the most successful species on the planet today.
110+
</p>
111+
<p>
112+
The dogs' value to early human hunter-gatherers led to them quickly
113+
becoming ubiquitous across world cultures. Dogs perform many roles for
114+
people, such as hunting, herding, pulling loads, protection, assisting
115+
police and military, companionship, and, more recently, aiding
116+
handicapped individuals. This impact on human society has given them the
117+
nickname "man's best friend" in the Western world. In some cultures,
118+
however, dogs are also a source of meat.
119+
</p>
120+
</Container>
121+
</div>

‎QD.Components.Semantic.Demo/Pages/Flags.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@page "/flags"
2-
@using Flag = QD.Components.Semantic.Enums.Flag
2+
@using Flag = QD.Components.Semantic.Enums.Elements.Flag
33

44
<h1>Flags</h1>
55

‎QD.Components.Semantic.Demo/Pages/Icons.razor

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@page "/icons"
22
@using QD.Components.Semantic.Enums
3-
@using Icon = QD.Components.Semantic.Enums.Icon
3+
@using QD.Components.Semantic.Enums.Icon
4+
@using Icon = QD.Components.Semantic.Enums.Elements.Icon
45

56
<h1>Icons</h1>
67

@@ -50,14 +51,14 @@
5051

5152
<h2>Flipped</h2>
5253
<div>
53-
<Icon flipped="@IconFlipDirection.Horizontally" name="@Icon.Cloud" />
54-
<Icon flipped="@IconFlipDirection.Vertically" name="@Icon.Cloud" />
54+
<Icon flipped="@FlipDirection.Horizontally" name="@Icon.Cloud" />
55+
<Icon flipped="@FlipDirection.Vertically" name="@Icon.Cloud" />
5556
</div>
5657

5758
<h2>Rotated</h2>
5859
<div>
59-
<Icon rotated="@IconRotation.Clockwise" name="@Icon.Cloud" />
60-
<Icon rotated="@IconRotation.Counterclockwise" name="@Icon.Cloud" />
60+
<Icon rotated="@Rotation.Clockwise" name="@Icon.Cloud" />
61+
<Icon rotated="@Rotation.Counterclockwise" name="@Icon.Cloud" />
6162
</div>
6263

6364
<h2>Circular</h2>
@@ -133,35 +134,35 @@
133134
<h2>Corner icon</h2>
134135
<IconGroup size="@Size.Huge">
135136
<Icon name="@Icon.Puzzle" />
136-
<Icon corner="@IconCorner.Default" name="@Icon.Add" />
137+
<Icon corner="@Corner.Default" name="@Icon.Add" />
137138
</IconGroup>
138139

139140
<div>
140141
<IconGroup size="@Size.Huge">
141142
<Icon name="@Icon.Puzzle" />
142-
<Icon corner="@IconCorner.TopLeft" name="@Icon.Add" />
143+
<Icon corner="@Corner.TopLeft" name="@Icon.Add" />
143144
</IconGroup>
144145

145146
<IconGroup size="@Size.Huge">
146147
<Icon name="@Icon.Puzzle" />
147-
<Icon corner="@IconCorner.TopRight" name="@Icon.Add" />
148+
<Icon corner="@Corner.TopRight" name="@Icon.Add" />
148149
</IconGroup>
149150

150151
<IconGroup size="@Size.Huge">
151152
<Icon name="@Icon.Puzzle" />
152-
<Icon corner="@IconCorner.BottomLeft" name="@Icon.Add" />
153+
<Icon corner="@Corner.BottomLeft" name="@Icon.Add" />
153154
</IconGroup>
154155

155156
<IconGroup size="@Size.Huge">
156157
<Icon name="@Icon.Puzzle" />
157-
<Icon corner="@IconCorner.BottomRight" name="@Icon.Add" />
158+
<Icon corner="@Corner.BottomRight" name="@Icon.Add" />
158159
</IconGroup>
159160
</div>
160161

161162
<h2 class="ui header">
162163
<IconGroup size="@Size.Large">
163164
<Icon name="@Icon.Twitter" />
164-
<Icon corner="@IconCorner.Default" name="@Icon.Add" />
165+
<Icon corner="@Corner.Default" name="@Icon.Add" />
165166
</IconGroup>
166167
Add on Twitter
167168
</h2>

‎QD.Components.Semantic.Demo/Program.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
namespace QD.Components.Semantic.Demo
44
{
5-
public class Program
5+
public static class Program
66
{
7-
public static void Main(string[] args)
7+
public static void Main()
88
{
9-
CreateHostBuilder(args).Build().Run();
9+
CreateHostBuilder().Build().Run();
1010
}
1111

12-
public static IWebAssemblyHostBuilder CreateHostBuilder(string[] args) =>
12+
public static IWebAssemblyHostBuilder CreateHostBuilder() =>
1313
BlazorWebAssemblyHost.CreateDefaultBuilder()
1414
.UseBlazorStartup<Startup>();
1515
}

‎QD.Components.Semantic.Demo/QD.Components.Semantic.Demo.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview9.19424.4" />
12-
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview9.19424.4" PrivateAssets="all" />
13-
<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.0.0-preview9.19424.4" />
14-
<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview9.19424.4" PrivateAssets="all" />
11+
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview9.19457.4" />
12+
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview9.19457.4" PrivateAssets="all" />
13+
<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.0.0-preview9.19457.4" />
14+
<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview9.19457.4" PrivateAssets="all" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎QD.Components.Semantic.Demo/Shared/NavMenu.razor

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,10 @@
2424
<span class="oi oi-plus" aria-hidden="true"></span> Icons
2525
</NavLink>
2626
</li>
27+
<li class="nav-item">
28+
<NavLink class="" href="containers">
29+
<span class="oi oi-plus" aria-hidden="true"></span> Containers
30+
</NavLink>
31+
</li>
2732
</ul>
2833
</div>

‎QD.Components.Semantic.Demo/Startup.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ public class Startup
77
{
88
public void ConfigureServices(IServiceCollection services)
99
{
10+
// Do nothing because don't have services.
1011
}
1112

1213
public void Configure(IComponentsApplicationBuilder app)

‎QD.Components.Semantic.Demo/wwwroot/css/site.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ body {
88
margin: 0;
99
}
1010

11-
app {
11+
.app {
1212
position: relative;
1313
display: flex;
1414
flex-direction: column;
@@ -113,7 +113,7 @@ app {
113113
}
114114

115115
@media (min-width: 768px) {
116-
app {
116+
.app {
117117
flex-direction: row;
118118
}
119119

‎QD.Components.Semantic.Demo/wwwroot/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html>
2+
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
55
<meta name="viewport" content="width=device-width" />
@@ -9,7 +9,7 @@
99
<link href="css/site.css" rel="stylesheet" />
1010
</head>
1111
<body>
12-
<app>Loading...</app>
12+
<app class="app">Loading...</app>
1313

1414
<script src="_framework/blazor.webassembly.js"></script>
1515
</body>

0 commit comments

Comments
 (0)