From 5d49dd2bf4817e0adeb7b05307917c9d60d28ef2 Mon Sep 17 00:00:00 2001
From: "Matt@MBP-PC.Home" <unknown@kiln.example.com>
Date: Thu, 5 Jul 2012 11:09:51 -0100
Subject: [PATCH] Excluded global.asax file, as not strictly needed Added
 TinyMCE styling rule when in live editing as toolbar was appearing out of
 place

---
 src/umbraco.presentation/umbraco.presentation.csproj       | 7 -------
 .../umbraco/LiveEditing/Css/LiveEditing.css                | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/umbraco.presentation/umbraco.presentation.csproj b/src/umbraco.presentation/umbraco.presentation.csproj
index b83f83aed2..61221ff74c 100644
--- a/src/umbraco.presentation/umbraco.presentation.csproj
+++ b/src/umbraco.presentation/umbraco.presentation.csproj
@@ -298,10 +298,6 @@
     <Compile Include="default.aspx.designer.cs">
       <DependentUpon>default.aspx</DependentUpon>
     </Compile>
-    <Compile Include="Global.asax.cs">
-      <DependentUpon>Global.asax</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="helper.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -2471,9 +2467,6 @@
     <Content Include="umbraco_client\Tree\Themes\default\icons.png" />
     <Content Include="umbraco_client\Tree\Themes\umbraco\icons.png" />
     <Content Include="default.aspx" />
-    <Content Include="Global.asax">
-      <SubType>Component</SubType>
-    </Content>
     <Content Include="install\default.aspx" />
     <Content Include="install\steps\license.ascx" />
     <Content Include="umbraco\actions\delete.aspx" />
diff --git a/src/umbraco.presentation/umbraco/LiveEditing/Css/LiveEditing.css b/src/umbraco.presentation/umbraco/LiveEditing/Css/LiveEditing.css
index 9b1a6ea069..f2dc632e6d 100644
--- a/src/umbraco.presentation/umbraco/LiveEditing/Css/LiveEditing.css
+++ b/src/umbraco.presentation/umbraco/LiveEditing/Css/LiveEditing.css
@@ -166,6 +166,7 @@ html {
 #LiveEditingClientToolbar .mceToolbarExternal table {
 	display: inline !important;
 	background: none !important;
+    margin: 0 !important;
 }
 
 #LiveEditingClientToolbar .mceToolbarExternal {