fix: Fix popupCss and phantomCss conflicts

material-theme · Jul 30, 2016 · 460f3f6 · 460f3f6
1 parent 80fba45
commit 460f3f6
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 3 deletions.
diff --git a/.src/schemes/scheme.YAML-tmTheme b/.src/schemes/scheme.YAML-tmTheme
@@ -31,6 +31,7 @@ settings:
     a {
       color: <%= scheme.base.paleblue %>;
       display: block;
+      line-height: 16px;
     }
     .error, .deleted {
       color: <%= scheme.base.red %>;
@@ -42,6 +43,11 @@ settings:
       color: <%= scheme.base.yellow %>;
     }
     ]]>"
+    phantomCss: "<![CDATA[
+    html {
+      position: relative;
+    }
+    ]]>"
 
 # >> General
 

diff --git a/schemes/Material-Theme-Darker.YAML-tmTheme b/schemes/Material-Theme-Darker.YAML-tmTheme
@@ -31,6 +31,7 @@ settings:
     a {
       color: #B2CCD6;
       display: block;
+      line-height: 16px;
     }
     .error, .deleted {
       color: #FF5370;
@@ -42,6 +43,11 @@ settings:
       color: #FFCB6B;
     }
     ]]>"
+    phantomCss: "<![CDATA[
+    html {
+      position: relative;
+    }
+    ]]>"
 
 # >> General
 

diff --git a/schemes/Material-Theme-Darker.tmTheme b/schemes/Material-Theme-Darker.tmTheme
@@ -31,8 +31,10 @@
 				<string>#65737e</string>
 				<key>lineHighlight</key>
 				<string>#00000050</string>
+				<key>phantomCss</key>
+				<string><![CDATA[ html { position: relative; } ]]></string>
 				<key>popupCss</key>
-				<string><![CDATA[ html { background-color: #212121; color: #eeffffff; padding: 16px; } a { color: #B2CCD6; display: block; } .error, .deleted { color: #FF5370; } .success, .inserted { color: #C3E88D; } .warning, .modified { color: #FFCB6B; } ]]></string>
+				<string><![CDATA[ html { background-color: #212121; color: #eeffffff; padding: 16px; } a { color: #B2CCD6; display: block; line-height: 1; } .error, .deleted { color: #FF5370; } .success, .inserted { color: #C3E88D; } .warning, .modified { color: #FFCB6B; } ]]></string>
 				<key>selection</key>
 				<string>#61616150</string>
 				<key>selectionBorder</key>

diff --git a/schemes/Material-Theme-Lighter.YAML-tmTheme b/schemes/Material-Theme-Lighter.YAML-tmTheme
@@ -31,6 +31,7 @@ settings:
     a {
       color: #8796B0;
       display: block;
+      line-height: 16px;
     }
     .error, .deleted {
       color: #E53935;
@@ -42,6 +43,11 @@ settings:
       color: #FFC000;
     }
     ]]>"
+    phantomCss: "<![CDATA[
+    html {
+      position: relative;
+    }
+    ]]>"
 
 # >> General
 

diff --git a/schemes/Material-Theme-Lighter.tmTheme b/schemes/Material-Theme-Lighter.tmTheme
@@ -31,8 +31,10 @@
 				<string>#E7EAEC</string>
 				<key>lineHighlight</key>
 				<string>#90A4AE20</string>
+				<key>phantomCss</key>
+				<string><![CDATA[ html { position: relative; } ]]></string>
 				<key>popupCss</key>
-				<string><![CDATA[ html { background-color: #fafafa; color: #80CBC4; padding: 16px; } a { color: #8796B0; display: block; } .error, .deleted { color: #E53935; } .success, .inserted { color: #91B859; } .warning, .modified { color: #FFC000; } ]]></string>
+				<string><![CDATA[ html { background-color: #fafafa; color: #80CBC4; padding: 16px; } a { color: #8796B0; display: block; line-height: 16px; } .error, .deleted { color: #E53935; } .success, .inserted { color: #91B859; } .warning, .modified { color: #FFC000; } ]]></string>
 				<key>selection</key>
 				<string>#80CBC440</string>
 				<key>selectionBorder</key>

diff --git a/schemes/Material-Theme.YAML-tmTheme b/schemes/Material-Theme.YAML-tmTheme
@@ -31,6 +31,7 @@ settings:
     a {
       color: #B2CCD6;
       display: block;
+      line-height: 16px;
     }
     .error, .deleted {
       color: #FF5370;
@@ -42,6 +43,11 @@ settings:
       color: #FFCB6B;
     }
     ]]>"
+    phantomCss: "<![CDATA[
+    html {
+      position: relative;
+    }
+    ]]>"
 
 # >> General
 

diff --git a/schemes/Material-Theme.tmTheme b/schemes/Material-Theme.tmTheme
@@ -31,8 +31,10 @@
 				<string>#65737e</string>
 				<key>lineHighlight</key>
 				<string>#00000050</string>
+				<key>phantomCss</key>
+				<string><![CDATA[ html { position: relative; } ]]></string>
 				<key>popupCss</key>
-				<string>&lt;![CDATA[ html { background-color: #263238; color: #eeffff; padding: 16px; } a { color: #B2CCD6; display: block; } .error, .deleted { color: #FF5370; } .success, .inserted { color: #C3E88D; } .warning, .modified { color: #FFCB6B; } ]]&gt;</string>
+				<string><![CDATA[ html { background-color: #263238; color: #eeffff; padding: 16px; } a { color: #B2CCD6; display: block; line-height: 16px; } .error, .deleted { color: #FF5370; } .success, .inserted { color: #C3E88D; } .warning, .modified { color: #FFCB6B; } ]]></string>
 				<key>selection</key>
 				<string>#80CBC420</string>
 				<key>selectionBorder</key>