Change default font sizes to 9pt on Mac, 10pt on Windows. Tighten up …

…line leading.
rstudio · Apr 1, 2011 · 4b53885 · 4b53885
1 parent 07ea3c0
commit 4b53885
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 24 deletions.
diff --git a/src/gwt/src/org/rstudio/core/client/widget/FontSizer.css b/src/gwt/src/org/rstudio/core/client/widget/FontSizer.css
@@ -1,25 +1,3 @@
-@external pt10, pt12, pt14, pt16, pt18;
-
 .normalSize, .normalSize td, .normalSize pre {
-   line-height: 1.5;
-}
-
-body.pt10 .normalSize, body.pt10 .normalSize td, body.pt10 .normalSize pre {
-   font-size: 10pt;
-}
-
-body.pt12 .normalSize, body.pt12 .normalSize td, body.pt12 .normalSize pre {
-   font-size: 12pt;
-}
-
-body.pt14 .normalSize, body.pt14 .normalSize td, body.pt14 .normalSize pre {
-   font-size: 14pt;
-}
-
-body.pt16 .normalSize, body.pt16 .normalSize td, body.pt16 .normalSize pre {
-   font-size: 16pt;
-}
-
-body.pt18 .normalSize, body.pt18 .normalSize td, body.pt18 .normalSize pre {
-   font-size: 18pt;
+   line-height: 1.45;
 }
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/prefs/model/UIPrefs.java b/src/gwt/src/org/rstudio/studio/client/workbench/prefs/model/UIPrefs.java
@@ -2,6 +2,7 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import org.rstudio.core.client.BrowseCap;
 import org.rstudio.studio.client.workbench.model.Session;
 import org.rstudio.studio.client.workbench.ui.PaneConfig;
 
@@ -66,7 +67,7 @@ public PrefValue<Boolean> softWrapRFiles()
 
    public PrefValue<Integer> fontSize()
    {
-      return integer("font_size_points", 9);
+      return integer("font_size_points", BrowseCap.hasMetaKey() ? 9 : 10);
    }
 
    public PrefValue<String> theme()