made CSS for popup templates theme agnostic, resolves #595

DamnWidget · Jan 21, 2017 · ab2fad5 · ab2fad5
1 parent 442b217
commit ab2fad5
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 60 deletions.
diff --git a/Anaconda.sublime-settings b/Anaconda.sublime-settings
@@ -9,11 +9,9 @@
         runs in a ST3 installation equal to or newer than build 3070, it
         can be configured to show tooltips for documentation and signatures.
 
-        The options below set how the tooltip is shown. Set the theme
-        as dark if you are using a dark theme or light if you are using
-        a light one.
+        The options below set how the tooltip looks.
     */
-    "anaconda_tooltip_theme": "dark",  // possible options: "light" or "dark"
+    "anaconda_tooltip_theme": "popup",
 
     /*
         If you set the following option as true, anaconda will display the
@@ -648,3 +646,5 @@
     */
     "auto_unload_conflictive_plugins": true
 }
+
+// vim: set ft=javascript:
diff --git a/anaconda_lib/linting/anaconda_pylint.py b/anaconda_lib/linting/anaconda_pylint.py
@@ -74,7 +74,7 @@ def parse_errors(self):
         for error in data.splitlines():
             if '************* Module ' in error:
                 _, module = error.split('************* Module ')
-                if not module in self.filename:
+                if module not in self.filename:
                     continue
             else:
                 offset = None

diff --git a/anaconda_lib/tooltips.py b/anaconda_lib/tooltips.py
@@ -57,7 +57,7 @@ def _generate(self, tooltip: str, content: Dict[str, str]) -> Union[Dict[str, st
 
         try:
             t = self.theme
-            theme = self.themes[t] if t in self.themes else self.themes['dark']
+            theme = self.themes[t] if t in self.themes else self.themes['popup']  # noqa
             context = {'css': theme}
             context.update(content)
             data = self.tooltips[tooltip].safe_substitute(context)

diff --git a/commands/doc.py b/commands/doc.py
@@ -37,8 +37,8 @@ def run(self, edit: sublime.Edit) -> None:
             except Exception as error:
                 print(error)
         else:
-            if (get_settings(self.view, 'enable_docstrings_tooltip', False)
-                    and int(sublime.version()) >= 3070):
+            if get_settings(self.view, 'enable_docstrings_tooltip', False) \
+               and int(sublime.version()) >= 3070:
                 self.print_popup(edit)
             else:
                 self.print_doc(edit)
@@ -90,7 +90,7 @@ def print_popup(self, edit) -> None:
         docstring = ''.join(dlines[1:])
         content = {'name': name, 'content': docstring}
         self.documentation = None
-        css = get_settings(self.view, 'anaconda_tooltip_theme', 'dark')
+        css = get_settings(self.view, 'anaconda_tooltip_theme', 'popup')
         Tooltip(css).show_tooltip(
             self.view, 'doc', content, partial(self.print_doc, edit))
 

diff --git a/css/dark.css b/css/dark.css
diff --git a/css/light.css b/css/light.css
diff --git a/css/popup.css b/css/popup.css
@@ -0,0 +1,21 @@
+html, body { padding: 0; margin: 0; }
+
+div.anaconda {
+    background-color: color(var(--background) blend(gray 80%));
+    display:  block;
+    padding:  0.5rem;
+}
+
+.anaconda h3 {
+    font-weight: bold;
+    font-size: 1.05rem;
+}
+
+.anaconda .signature {
+    font-weight: bold;
+}
+
+.anaconda .doc_signature {
+    font-weight: bold;
+    font-size: 1.05em;
+}
diff --git a/listeners/signatures.py b/listeners/signatures.py
@@ -114,7 +114,7 @@ def _show_popup(self, view: sublime.View) -> None:
             content = {'signature': self.signature, 'doc': self.doc}
             display_tooltip = 'signature_doc'
 
-        css = get_settings(view, 'anaconda_tooltip_theme', 'dark')
+        css = get_settings(view, 'anaconda_tooltip_theme', 'popup')
         Tooltip(css).show_tooltip(
             view, display_tooltip, content, partial(self._show_status, view))
 

diff --git a/templates/tooltips/doc.tpl b/templates/tooltips/doc.tpl
@@ -1,4 +1,6 @@
-<div class="doc">
-    <h3>Docstring for <em>${name}</em>:</h3>
-    <p class="content">${content}</p>
+<div class="anaconda">
+    <div class="doc">
+        <h3>Docstring for <em>${name}</em>:</h3>
+        <p class="content">${content}</p>
+    </div>
 </div>
diff --git a/templates/tooltips/signature.tpl b/templates/tooltips/signature.tpl
@@ -1 +1,3 @@
-<div class="signature">${content}</div>
+<div class="anaconda">
+    <div class="signature">${content}</div>
+</div>
diff --git a/templates/tooltips/signature_doc.tpl b/templates/tooltips/signature_doc.tpl
@@ -1,4 +1,6 @@
-<div class="doc_signature">${signature}</div>
-<div class="doc_signature_doc">
-    <p class="content">${doc}</p>
+<div class="anaconda">
+    <div class="doc_signature">${signature}</div>
+    <div class="doc_signature_doc">
+        <p class="content">${doc}</p>
+    </div>
 </div>