1.0.0-preview7-05

Author: chanan

BlazorPrettyCode.sln

@@ -11,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerSideSample", "src\Ser
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SamplePages", "src\SamplePages\SamplePages.csproj", "{36CE32DC-CBEA-4394-AB73-BADB5D7F821F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorStyled", "..\BlazorStyled\src\BlazorStyled\BlazorStyled.csproj", "{D23A0EFB-7A28-4FF4-AE6C-A8124DB779A9}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -35,10 +33,6 @@ Global
 		{36CE32DC-CBEA-4394-AB73-BADB5D7F821F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{36CE32DC-CBEA-4394-AB73-BADB5D7F821F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{36CE32DC-CBEA-4394-AB73-BADB5D7F821F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D23A0EFB-7A28-4FF4-AE6C-A8124DB779A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D23A0EFB-7A28-4FF4-AE6C-A8124DB779A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D23A0EFB-7A28-4FF4-AE6C-A8124DB779A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D23A0EFB-7A28-4FF4-AE6C-A8124DB779A9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

docs/_framework/_bin/BlazorPrettyCode.dll

@@ -1 +1 @@
-{"main":"ClientSideSample.dll","entryPoint":"Sample.Program::Main","assemblyReferences":["BlazorPrettyCode.dll","BlazorStyled.dll","CSHTMLTokenizer.dll","Microsoft.AspNetCore.Authorization.dll","Microsoft.AspNetCore.Blazor.dll","Microsoft.AspNetCore.Components.Browser.dll","Microsoft.AspNetCore.Components.dll","Microsoft.AspNetCore.Metadata.dll","Microsoft.Bcl.AsyncInterfaces.dll","Microsoft.Extensions.DependencyInjection.Abstractions.dll","Microsoft.Extensions.DependencyInjection.dll","Microsoft.Extensions.Logging.Abstractions.dll","Microsoft.Extensions.Options.dll","Microsoft.Extensions.Primitives.dll","Microsoft.JSInterop.dll","Mono.Security.dll","Mono.WebAssembly.Interop.dll","mscorlib.dll","Newtonsoft.Json.dll","Polished.net.dll","SamplePages.dll","Stateless.dll","System.Buffers.dll","System.ComponentModel.Annotations.dll","System.Core.dll","System.Data.dll","System.dll","System.Memory.dll","System.Net.Http.dll","System.Numerics.dll","System.Numerics.Vectors.dll","System.Runtime.CompilerServices.Unsafe.dll","System.Runtime.Serialization.dll","System.Text.Json.dll","System.Threading.Tasks.Extensions.dll","System.Xml.dll","System.Xml.Linq.dll","BlazorPrettyCode.pdb","ClientSideSample.pdb","SamplePages.pdb"],"cssReferences":[],"jsReferences":[],"linkerEnabled":true}
+{"main":"ClientSideSample.dll","entryPoint":"Sample.Program::Main","assemblyReferences":["BlazorPrettyCode.dll","BlazorStyled.dll","BlazorTypography.dll","CSHTMLTokenizer.dll","Microsoft.AspNetCore.Authorization.dll","Microsoft.AspNetCore.Blazor.dll","Microsoft.AspNetCore.Components.Browser.dll","Microsoft.AspNetCore.Components.dll","Microsoft.AspNetCore.Metadata.dll","Microsoft.Bcl.AsyncInterfaces.dll","Microsoft.Extensions.DependencyInjection.Abstractions.dll","Microsoft.Extensions.DependencyInjection.dll","Microsoft.Extensions.Logging.Abstractions.dll","Microsoft.Extensions.Options.dll","Microsoft.Extensions.Primitives.dll","Microsoft.JSInterop.dll","Mono.Security.dll","Mono.WebAssembly.Interop.dll","mscorlib.dll","Newtonsoft.Json.dll","Polished.net.dll","SamplePages.dll","Stateless.dll","System.Buffers.dll","System.ComponentModel.Annotations.dll","System.Core.dll","System.Data.dll","System.dll","System.Memory.dll","System.Net.Http.dll","System.Numerics.dll","System.Numerics.Vectors.dll","System.Runtime.CompilerServices.Unsafe.dll","System.Runtime.Serialization.dll","System.Text.Json.dll","System.Threading.Tasks.Extensions.dll","System.Xml.dll","System.Xml.Linq.dll","BlazorPrettyCode.pdb","ClientSideSample.pdb","SamplePages.pdb"],"cssReferences":[],"jsReferences":[],"linkerEnabled":true}

docs/_framework/_bin/BlazorPrettyCode.pdb

@@ -11,7 +11,7 @@
     <RazorLangVersion>3.0</RazorLangVersion>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <PackageId>BlazorPrettyCode</PackageId>
-    <Version>1.0.0-preview7-03</Version>
+    <Version>1.0.0-preview7-05</Version>
     <Authors>Chanan Braunstein</Authors>
     <Title>Blazor PrettyCode</Title>
     <Description>Razor Code Display Component</Description>
@@ -20,7 +20,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CSHTMLTokenizer" Version="0.7.3" />
+    <PackageReference Include="BlazorStyled" Version="1.0.0-preview7-04" />
+    <PackageReference Include="CSHTMLTokenizer" Version="0.7.4" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="3.0.0-preview7.19365.7" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
   </ItemGroup>
@@ -31,9 +32,5 @@
     <EmbeddedResource Include="wwwroot\**\*.css" LogicalName="blazor:css:%(RecursiveDir)%(Filename)%(Extension)" />
     <EmbeddedResource Include="wwwroot\**" Exclude="**\*.js;**\*.css" LogicalName="blazor:file:%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
-  
-    <ItemGroup>
-      <ProjectReference Include="..\..\..\BlazorStyled\src\BlazorStyled\BlazorStyled.csproj" />
-    </ItemGroup>
 
 </Project>

docs/_framework/_bin/BlazorStyled.dll

@@ -296,6 +296,12 @@ @media only screen and (min-width: 320px) and (max-width: 480px) {
             _baseCodeCell = _styled.Css(@"
                 display: table-cell;
                 padding-left: 1em;
+                @media only screen and (min-width: 320px) and (max-width: 480px) {
+                    font-size: 50%;
+                }
+                @media (min-width: 481px) and (max-width: 1223px) {
+                    font-size: 80%;
+                }
             ");
 
             //Title Row
@@ -673,7 +679,7 @@ private void BuildRenderCSLine(RenderTreeBuilder builder, CSLine csLine)
             builder.CloseElement();
 
             builder.OpenElement(Next(), "span");
-            //builder.AddAttribute(Next(), "class", _textClass);
+            builder.AddAttribute(Next(), "class", _themeTextClass);
             builder.AddContent(Next(), csLine.Line);
             builder.CloseElement();
         }

docs/_framework/_bin/BlazorTypography.dll

@@ -14,7 +14,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview7.19365.7" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview7.19365.7" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview7.19365.7" PrivateAssets="all" />
-    <PackageReference Include="Polished" Version="1.0.0-preview-02" />
   </ItemGroup>
 
   <ItemGroup>

docs/_framework/_bin/CSHTMLTokenizer.dll

@@ -1,7 +1,7 @@
 using BlazorPrettyCode;
+using BlazorTypography;
 using Microsoft.AspNetCore.Components.Builder;
 using Microsoft.Extensions.DependencyInjection;
-using Polished;
 using SamplePages;
 
 namespace Sample
@@ -11,8 +11,7 @@ public class Startup
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddBlazorPrettyCode();
-            services.AddSingleton<IMixins, Mixins>();
-            services.AddSingleton<IShorthand, Shorthand>();
+            services.AddTypography();
         }
 
         public void Configure(IComponentsApplicationBuilder app)

docs/_framework/_bin/ClientSideSample.dll

@@ -76,8 +76,8 @@
 </p>
 
 <PrettyCode CodeFile="https://raw.githubusercontent.com/chanan/BlazorStyled/master/src/SampleCore/Pages/Basic.razor"
-            CodeFileLineNumbers="2,14"
-            CodeSectionFileLineNumbers="46,49-52" />
+            CodeFileLineNumbers="2,28"
+            CodeSectionFileLineNumbers="50-56" />
 
 <p>is created by:</p>
 

docs/_framework/_bin/ClientSideSample.pdb

@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BlazorStyled" Version="1.0.0-preview7-03" />
-    <PackageReference Include="Polished" Version="1.0.0-preview-02" />
+    <PackageReference Include="BlazorStyled" Version="1.0.0-preview7-04" />
+    <PackageReference Include="BlazorTypography" Version="1.0.0-preview7-04" />
   </ItemGroup>
 
   <ItemGroup>

docs/_framework/_bin/Mono.Security.dll

@@ -1,6 +1,10 @@
 @inherits LayoutComponentBase
-@inject IStyled Styled
-@inject IMixins Mixins
+@inject ITypography Typography
+
+<Styled @bind-Classname="@main">
+    max-width: 1200px;
+    margin: 0 auto;
+</Styled>
 
 <div class="@main">
     @Body
@@ -11,11 +15,7 @@
 
     protected override void OnInit()
     {
-        Styled.Css(Mixins.Normalize());
-
-        main = Styled.Css(@"
-        max-width: 1200px;
-        margin: 0 auto;
-    ");
+        DefaultTypographyOptions defaultTheme = new DefaultTypographyOptions();
+        Typography.ApplyTypography(defaultTheme);
     }
 }

docs/_framework/_bin/SamplePages.dll

@@ -5,7 +5,6 @@
 @using Microsoft.JSInterop
 @using SamplePages
 @using SamplePages.Shared
-@using Polished;
-@using BlazorStyled;
-@using BlazorPrettyCode;
-
+@using BlazorStyled
+@using BlazorPrettyCode
+@using BlazorTypography