Browse Source

Merge pull request #111 from bliker/unified-fonts

Simplified font definitions
Steven Silvester 8 years ago
parent
commit
60dbfe25c5

+ 1 - 2
src/default-theme/about.css

@@ -1,4 +1,3 @@
 #about-jupyterlab {
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    padding: 2em;    
+    padding: 2em;
 }

+ 0 - 1
src/default-theme/commandpalette.css

@@ -8,7 +8,6 @@
   padding-bottom: 0px;
   color: #757575;
   background: #FAFAFA;
-  font-family: "Helvetica Neue", Helvetica;
 }
 
 

+ 5 - 5
src/default-theme/index.css

@@ -17,6 +17,7 @@ body {
   padding: 0;
   background: #E0E0E0;
   overflow: hidden;
+  font-family: sans-serif;
 }
 
 
@@ -57,7 +58,6 @@ body {
   min-width: 36px;
   max-width: 36px;
   font-size: 13px;
-  font-family: "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
   color: #777777;
   background: #EEEEEE;
 }
@@ -159,7 +159,7 @@ body {
   max-height: 28px;
   color: #777777;
   background: #F5F5F5;
-  font: 12px Helvetica, Arial, sans-serif;
+  font-size: 12px;
 }
 
 
@@ -250,7 +250,7 @@ body {
   background: white;
   border: 1px solid #BDBDBD;
   border-top: 1px solid #F27624;
-  font: 12px Helvetica, Arial, sans-serif;
+  font-size: 12px;
   box-shadow: 1px 1px 2px rgba(0, 0, 1, 0.1);
   transform: translateX(-40%) translateY(-58%);
 }
@@ -266,7 +266,7 @@ body {
   background: #FAFAFA;
   color: rgba(0, 0, 0, 0.87);
   border-bottom: 1px solid #DDDDDD;
-  font: 13px "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
 }
 
 
@@ -315,7 +315,7 @@ body {
   background: white;
   color: rgba(0, 0, 0, 0.87);
   border: 1px solid #C0C0C0;
-  font: 12px Helvetica, Arial, sans-serif;
+  font-size: 12px;
   box-shadow: 0px 1px 6px rgba(0, 0, 0, 0.2);
 }
 

+ 6 - 6
src/dialog/theme.css

@@ -21,19 +21,19 @@
 
 .jp-Dialog-header {
   padding-bottom: 12px;
-  font: 18px Helvetica-Neue Medium, Arial, sans-serif;
+  font-size: 18px;
   color: #616161;
 }
 
 
 .jp-Dialog-body {
-  font: 15px Helvetica-Neue Regular, Arial, sans-serif;
+  font-size: 15px;
   background: #FAFAFA;
 }
 
 
 .jp-Dialog-bodyContent {
-  font: 15px Helvetica-Neue Regular, Arial, sans-serif;
+  font-size: 15px;
   outline: none;
   margin-bottom: 12px;
 }
@@ -45,7 +45,7 @@
 
 
 .jp-Dialog-button {
-  font: 15px Helvetica-Neue Medium, Arial, sans-serif;
+  font-size: 15px;
   border: none;
   min-width: 120px;
   max-width: 120px;
@@ -82,7 +82,7 @@
 
 
 .jp-Dialog-input {
-  font: 15px Helvetica-Neue Regular, Arial, sans-serif;
+  font-size: 15px;
   color: #676767;
   width: 100%;
   outline: none;
@@ -103,7 +103,7 @@
 
 
 .jp-Dialog-select {
-  font: 15px Helvetica-Neue Regular, Arial, sans-serif;
+  font-size: 15px;
   background: white;
   color: #676767;
   width: 100%;

+ 1 - 1
src/filebrowser/theme.css

@@ -6,7 +6,7 @@
   min-width: 300px;
   color: #757575;
   background: #FAFAFA;
-  font: 13px Helvetica-Neue, Arial, sans-serif;
+  font-size: 13px;
 }
 
 

+ 2 - 3
src/landing/index.css

@@ -22,10 +22,9 @@
 
 .jp-Landing-dialog {
   padding-bottom: 20px;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 16px;
   color: #757575;
-   background: #FAFAFA;
+  background: #FAFAFA;
   margin-left: auto;
   margin-right: auto;
   text-align: center;
@@ -62,7 +61,7 @@
 
 
 .jp-Landing-header {
-  
+
   padding-top: 20px;
   padding-bottom: 8px;
 }

+ 2 - 9
src/notebook/index.css

@@ -47,7 +47,6 @@
 
 
 .jp-MarkdownCell-content.p-Widget h1 {
-  font-family: "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
   font-size: 26px;
   line-height: 1.0;
   margin: 14px 0 0 0;
@@ -55,7 +54,6 @@
 
 
 .jp-MarkdownCell-content.p-Widget h2 {
-  font-family: "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
   font-size: 22px;
   line-height: 1.0;
   margin: 14px 0 0 0;
@@ -63,7 +61,6 @@
 
 
 .jp-MarkdownCell-content.p-Widget h3 {
-  font-family: "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
   font-size: 18px;
   line-height: 1.0;
   margin: 14px 0 0 0;
@@ -71,7 +68,6 @@
 
 
 .jp-MarkdownCell-content.p-Widget h4 {
-  font-family: "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
   font-size: 14px;
   line-height: 1.0;
   margin: 14px 0 0 0;
@@ -79,7 +75,6 @@
 
 
 .jp-MarkdownCell-content.p-Widget h5 {
-  font-family: "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
   font-size: 14px;
   font-style: italic;
   line-height: 1.0;
@@ -87,8 +82,7 @@
 }
 
 
-.jp-MarkdownCell-content.p-Widget h6 { 
-  font-family: "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
+.jp-MarkdownCell-content.p-Widget h6 {
   font-size: 14px;
   font-style: italic;
   line-height: 1.0;
@@ -97,11 +91,10 @@
 
 
 .jp-MarkdownCell-content.p-Widget p {
-  font-family: "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
   font-size: 14px;
   line-height: 20px;
   margin: 0 0 0 0;
-} 
+}
 
 
 .jp-MarkdownCell-content.p-Widget li {

+ 0 - 7
src/notebook/theme.css

@@ -151,12 +151,6 @@
   outline: none;
 }
 
-
-.jp-MarkdownCell {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-
 .jp-NBToolbar {
     display: flex;
     flex-direction: row;
@@ -175,7 +169,6 @@
     font-size: 13px;
     color: #616161;
     line-height: 23px;
-    font-family: "Helvetica Neue";
 }