aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.WinForms/Applications/Shiftnet.cs
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-02-02 10:39:48 -0500
committerMichael <[email protected]>2017-02-02 10:39:48 -0500
commitce47589ce3f96b6674a1eecec14117536475db1e (patch)
tree026cb967c87f3cc85167661242d645370472fb71 /ShiftOS.WinForms/Applications/Shiftnet.cs
parentbbe37edb68f9e7535216bff80ba3e6b16cbca398 (diff)
downloadshiftos_thereturn-ce47589ce3f96b6674a1eecec14117536475db1e.tar.gz
shiftos_thereturn-ce47589ce3f96b6674a1eecec14117536475db1e.tar.bz2
shiftos_thereturn-ce47589ce3f96b6674a1eecec14117536475db1e.zip
Shiftnet style fixes
Diffstat (limited to 'ShiftOS.WinForms/Applications/Shiftnet.cs')
-rw-r--r--ShiftOS.WinForms/Applications/Shiftnet.cs11
1 files changed, 5 insertions, 6 deletions
diff --git a/ShiftOS.WinForms/Applications/Shiftnet.cs b/ShiftOS.WinForms/Applications/Shiftnet.cs
index d4183a4..2822948 100644
--- a/ShiftOS.WinForms/Applications/Shiftnet.cs
+++ b/ShiftOS.WinForms/Applications/Shiftnet.cs
@@ -43,27 +43,26 @@ namespace ShiftOS.WinForms.Applications
string html = $@"<html>
<head>
<style>
- <!-- Skin the web page -->
body {{
background-color: rgb({LoadedSkin.ControlColor.R}, {LoadedSkin.ControlColor.G}, {LoadedSkin.ControlColor.B});
color: rgb({LoadedSkin.ControlTextColor.R}, {LoadedSkin.ControlTextColor.G}, {LoadedSkin.ControlTextColor.B});
font-family: ""{LoadedSkin.MainFont.Name}"";
- font-size: {LoadedSkin.MainFont.Size}em;
+ font-size: {LoadedSkin.MainFont.SizeInPoints}pt;
}}
h1 {{
font-family: ""{LoadedSkin.HeaderFont.Name}"";
- font-size: {LoadedSkin.HeaderFont.Size}em;
+ font-size: {LoadedSkin.HeaderFont.SizeInPoints}pt;
}}
h2 {{
font-family: ""{LoadedSkin.Header2Font.Name}"";
- font-size: {LoadedSkin.Header2Font.Size}em;
+ font-size: {LoadedSkin.Header2Font.SizeInPoints}pt;
}}
h3 {{
font-family: ""{LoadedSkin.Header3Font.Name}"";
- font-size: {LoadedSkin.Header3Font.Size}em;
+ font-size: {LoadedSkin.Header3Font.SizeInPoints}pt;
}}
</style>
@@ -84,7 +83,7 @@ namespace ShiftOS.WinForms.Applications
private void wbcanvas_Navigating(object sender, WebBrowserNavigatingEventArgs e)
{
- if (CurrentUrl != e.Url.ToString())
+ if (CurrentUrl != e.Url.ToString() && !e.Url.ToString().StartsWith("about:"))
{
e.Cancel = true;
Future.Clear();