fix(fonts): update fonts and styles

asa1230 · Oct 2, 2015 · 85eb94b · 85eb94b
1 parent e1d337d
commit 85eb94b
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,7 @@ docs/output
 docs/includes
 spec/fixtures/evil-files/
 yoursway-create-dmg
-private_packages
+*nylas-private-*
 
 !spec-nylas/fixtures/packages/package-with-incompatible-native-module/node_modules
 

diff --git a/internal_packages/ui-light/CONTRIBUTING.md b/internal_packages/ui-light/CONTRIBUTING.md
diff --git a/internal_packages/ui-light/LICENSE.md b/internal_packages/ui-light/LICENSE.md
diff --git a/internal_packages/ui-light/README.md b/internal_packages/ui-light/README.md
diff --git a/src/package-manager.coffee b/src/package-manager.coffee
@@ -291,7 +291,7 @@ class PackageManager
         try
           {windowTypes} = Package.loadMetadata(packagePath) ? {}
           if windowTypes
-            return windowTypes[windowType]?
+            return windowTypes[windowType]? or windowTypes["all"]?
           else if loadPackagesWhenNoTypesSpecified
             return true
           return false

diff --git a/static/variables/ui-variables.less b/static/variables/ui-variables.less
@@ -86,8 +86,8 @@
 @text-color-error:       @error-color;
 @text-color-destructive: @danger-color;
 
-@font-family-sans-serif:  "Nylas-Pro", "Helvetica", 'Lucida Grande', 'Segoe UI', sans-serif;
-@font-family-smallcap:    "Proxima Nova Regular Small Cap", "sans-serif";
+@font-family-sans-serif:  "Nylas-Pro", "Helvetica", sans-serif;
+@font-family-sans-serif:  "Nylas-Pro", "Helvetica", sans-serif;
 @font-family-serif:       Georgia, "Times New Roman", Times, serif;
 @font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;