Merge pull request #3084 from jlduran/native-font-stack

3 files changed, 28 insertions, 20 deletions

diff --git a/src/usr/local/www/css/pfSense-BETA.css b/src/usr/local/www/css/pfSense-BETA.css
index 49f2dd5..8d25f05 100644
--- a/src/usr/local/www/css/pfSense-BETA.css
+++ b/src/usr/local/www/css/pfSense-BETA.css
@@ -23,7 +23,8 @@
 /*** Experimental Changes Go Here ***/
 
 body {
-	font-size: 12px;
+    font-size: 12px;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
 }
 
 .navbar-nav {
@@ -31,7 +32,8 @@ body {
 }
 
 table[data-sortable].sortable-theme-bootstrap {
-	font-size: 12px;
+    font-size: 12px;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
 }
 
 .table>tbody>tr>td {
@@ -79,4 +81,4 @@ a.fa, i.fa {
 
 .panel-heading {
     padding: 5px 10px;
-}
\ No newline at end of file
+}
diff --git a/src/usr/local/www/css/pfSense-dark-BETA.css b/src/usr/local/www/css/pfSense-dark-BETA.css
index c227213..cb89447 100644
--- a/src/usr/local/www/css/pfSense-dark-BETA.css
+++ b/src/usr/local/www/css/pfSense-dark-BETA.css
@@ -23,7 +23,8 @@
 /*** Experimental Changes Go Here ***/
 
 body {
-	font-size: 12px;
+    font-size: 12px;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
 }
 
 .navbar-nav {
@@ -31,7 +32,8 @@ body {
 }
 
 table[data-sortable].sortable-theme-bootstrap {
-	font-size: 12px;
+    font-size: 12px;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
 }
 
 .table>tbody>tr>td {
@@ -83,4 +85,4 @@ a.fa, i.fa {
 
 .panel-heading {
     padding: 5px 10px;
-}
\ No newline at end of file
+}
diff --git a/src/usr/local/www/css/pfSense.css b/src/usr/local/www/css/pfSense.css
index 75b92c8..24e86ad 100644
--- a/src/usr/local/www/css/pfSense.css
+++ b/src/usr/local/www/css/pfSense.css
@@ -600,7 +600,7 @@ footer a {
 .widget-heading-icon
 {
     display: block;
-    float:  right;
+    float: right;
 }
 
 .widget-heading-icon .fa {
@@ -629,12 +629,12 @@ textarea
 
 ul.tree{
     width: auto;
-    padding-left : 0px;
-    margin-left : 0px;
+    padding-left: 0px;
+    margin-left: 0px;
 }
 
 ul.tree img{
-    border : none;
+    border: none;
 }
 
 ul.tree, ul.tree ul {
@@ -746,24 +746,28 @@ ul.tree div a  {
 }
 
 ul.tree li .over{
-    background-color : pink;
+    background-color: pink;
 }
 
 /*
  * End of CSS for Standard tree layout
  */
 
- table[data-sortable].sortable-theme-bootstrap thead th {
+table[data-sortable].sortable-theme-bootstrap {
+    font-family: Roboto, sans-serif;
+}
+
+table[data-sortable].sortable-theme-bootstrap thead th {
     white-space: nowrap;
- }
+}
 
 @media (max-width: 1199px) {
     .nav>li>a {
         padding: 14px 9px 10px 9px;
     }
- }
+}
 
- @media (max-width: 991px) {
+@media (max-width: 991px) {
     /* change top navbar from horizontal to vertical */
     .navbar-header {
         float: none;
@@ -805,7 +809,7 @@ ul.tree li .over{
     }
 }
 
- @media (max-width: 767px) {
+@media (max-width: 767px) {
     .header {
         margin-bottom: 5px;
     }
@@ -823,12 +827,12 @@ ul.tree li .over{
 
 /** Override text-warning with something less red. */
 .text-warning {
-	color: #ffcc00;
+    color: #ffcc00;
 }
 
 /**Suppress href links when printing */
 a[href]:after {
-    content:normal
+    content: normal;
 }
 
 /** Text color for diff display when comapring configs */
@@ -845,7 +849,7 @@ a[href]:after {
 .panel-body.collapse.in>.content>.row,
 .panel-body.collapse.in>.form-group
 {
-	margin-right:0px;
+    margin-right: 0px;
 }
 
 /* Callouts */
@@ -911,7 +915,7 @@ a[href]:after {
 /* Disable 300 ms click delay so event handlers are effective. */
 /* Makes posible for non-touch compatible features to work; e.g. double tap rule to edit. */
 body{
-	touch-action: manipulation;
+    touch-action: manipulation;
 }
 
 /* D3 Styles */