Bundle fonts with pgAdmin so we have a standard set for all platforms.

Research by Shirley at Pivotal.
pull/6/head
Atul Sharma 2017-09-13 16:01:14 +01:00 committed by Dave Page
parent e819465e38
commit 788f7f3a69
22 changed files with 73 additions and 42 deletions

View File

@ -34,3 +34,5 @@ Natural Sort 9565816 MIT https://github.com/javve/natural
SlickGrid 2.3.7-8ff6814 MIT https://github.com/6pac/SlickGrid SlickGrid 2.3.7-8ff6814 MIT https://github.com/6pac/SlickGrid
jQuery-UI 1.11.3 MIT https://jqueryui.com/ jQuery-UI 1.11.3 MIT https://jqueryui.com/
BigNumber 3.0.1 MIT http://mikemcl.github.io/bignumber.js BigNumber 3.0.1 MIT http://mikemcl.github.io/bignumber.js
Source Code Pro 1.1 SIL OFL https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700
Open Sans 2.0 AL https://fonts.googleapis.com/css?family=Open+Sans:400,400i,600,700

View File

@ -49,3 +49,16 @@
.aciTree .aciTreeLi div.aciTreeLine { .aciTree .aciTreeLi div.aciTreeLine {
display: table !important; display: table !important;
} }
code,
kbd,
pre,
samp,
.CodeMirror pre {
font-family: 'Source Code Pro';
}
.sql-editor-grid-container {
font-family: 'Open Sans' !important;
}

View File

@ -28,7 +28,7 @@
} }
.ajs-bg-bgprocess > .pg-bg-bgprocess > .pg-bg-notify-body { .ajs-bg-bgprocess > .pg-bg-bgprocess > .pg-bg-notify-body {
font-family: monospace; font-family: "Source Code Pro";
white-space: nowrap; white-space: nowrap;
} }

View File

@ -76,7 +76,7 @@
} }
.fileinfo table#contents tr td p { .fileinfo table#contents tr td p {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Open Sans";
} }
.fileinfo > h1 { .fileinfo > h1 {

View File

@ -1,5 +1,5 @@
.aciTree .aciTreeText { .aciTree .aciTreeText {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: 'Open Sans';
font-size: 12px; font-size: 12px;
} }

View File

@ -2,6 +2,7 @@
/* Ensure simple forms don't hit the top of the screen */ /* Ensure simple forms don't hit the top of the screen */
body { body {
font-family: 'Open Sans';
padding-top: 50px; padding-top: 50px;
padding-bottom: 20px; padding-bottom: 20px;
} }
@ -1005,7 +1006,7 @@ ul.nav.nav-tabs {
} }
span.button-label { span.button-label {
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; font-family: 'Open Sans';
font-size: initial; font-size: initial;
} }
@ -1015,7 +1016,7 @@ span.button-label {
border-radius: 3px; border-radius: 3px;
color: #333; color: #333;
display: block; display: block;
font-family: Menlo,Monaco,Consolas,"Courier New",monospace; font-family: 'Source Code Pro';
font-size: 12px; font-size: 12px;
line-height: 1.42857; line-height: 1.42857;
margin: 0 0 10px; margin: 0 0 10px;

View File

@ -48,7 +48,7 @@
/* Codemirror buttons */ /* Codemirror buttons */
.CodeMirror-dialog button { .CodeMirror-dialog button {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: 'Open Sans';
color: white; color: white;
font-size: 70%; font-size: 70%;
background-image: -webkit-linear-gradient(top, #337ab7 0%, #265a88 100%); background-image: -webkit-linear-gradient(top, #337ab7 0%, #265a88 100%);

View File

@ -813,3 +813,18 @@ lgg-el-container[el=md] .pg-el-lg-8,
.Resizer.disabled:hover { .Resizer.disabled:hover {
border-color: transparent; border-color: transparent;
} }
@font-face {
font-family: 'Open Sans';
src: url('../fonts/OpenSans-Regular.ttf');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Source Code Pro';
src: url('../fonts/SourceCodePro-Regular.ttf');
font-weight: normal;
font-style: normal;
}

View File

@ -57,19 +57,19 @@
font-weight: bold; } font-weight: bold; }
.text-14 { .text-14 {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: 'Open Sans';
font-size: 14px; } font-size: 14px; }
.text-13 { .text-13 {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: 'Open Sans';
font-size: 13px; } font-size: 13px; }
.text-12 { .text-12 {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: 'Open Sans';
font-size: 12px; } font-size: 12px; }
.text-11 { .text-11 {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: 'Open Sans';
font-size: 11px; } font-size: 11px; }
.bg-primary-blue { .bg-primary-blue {

View File

@ -285,7 +285,7 @@
right: 5px; right: 5px;
} }
.context-menu-list { .context-menu-list {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: 'Open Sans';;
font-size: 13px; font-size: 13px;
} }
@ -300,7 +300,7 @@ font-size: 13px;
.context-menu-item { .context-menu-item {
display:block; display:block;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: 'Open Sans';
font-size: 13px; font-size: 13px;
font-weight: normal; font-weight: normal;
} }

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -42,7 +42,7 @@
padding: 0 12px 0 10px; padding: 0 12px 0 10px;
align-self: center; align-self: center;
// To make sure IE picks up the correct font // To make sure IE picks up the correct font
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: 'Open Sans';
} }
.alert-info { .alert-info {

View File

@ -143,7 +143,7 @@
} }
button.pg-alertify-button { button.pg-alertify-button {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: 'Open Sans';
font-size: 14px; font-size: 14px;
-webkit-font-smoothing: auto; -webkit-font-smoothing: auto;
} }

View File

@ -1,4 +1,4 @@
$font-family-1: "Helvetica Neue", Arial, sans-serif; $font-family-1: "Open Sans";
.text-bold { .text-bold {
font-weight: bold; font-weight: bold;

View File

@ -7,7 +7,7 @@
.entry { .entry {
@extend .text-14; @extend .text-14;
@extend .bg-white-1; @extend .bg-white-1;
font-family: monospace; font-family: 'Source Code Pro';
border: 2px solid transparent; border: 2px solid transparent;
margin-left: 1px; margin-left: 1px;
padding: 0 8px 0 5px; padding: 0 8px 0 5px;
@ -15,7 +15,7 @@
.other-info { .other-info {
@extend .text-13; @extend .text-13;
@extend .font-gray-4; @extend .font-gray-4;
font-family: monospace; font-family: 'Source Code Pro';
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
@ -34,7 +34,7 @@
} }
.date-label { .date-label {
font-family: monospace; font-family: 'Source Code Pro';
background: #e8e8e8; background: #e8e8e8;
padding: 2px 9px; padding: 2px 9px;
font-size: 11px; font-size: 11px;
@ -183,7 +183,7 @@
.content-value { .content-value {
@extend .bg-white-1; @extend .bg-white-1;
@extend .text-13; @extend .text-13;
font-family: Menlo, Monaco, Consolas, "Courier New", monospace; font-family: 'Source Code Pro';
border: 0; border: 0;
padding-left: 0; padding-left: 0;
position: absolute; position: absolute;

View File

@ -42,7 +42,7 @@
.CodeMirror-foldmarker { .CodeMirror-foldmarker {
color: blue; color: blue;
text-shadow: #b9f 1px 1px 2px, #b9f -1px -1px 2px, #b9f 1px -1px 2px, #b9f -1px 1px 2px; text-shadow: #b9f 1px 1px 2px, #b9f -1px -1px 2px, #b9f 1px -1px 2px, #b9f -1px 1px 2px;
font-family: arial; font-family: "Open Sans";
line-height: .3; line-height: .3;
cursor: pointer; cursor: pointer;
} }
@ -71,7 +71,7 @@
/* To make font same as Query tool in messages tab */ /* To make font same as Query tool in messages tab */
.messages { .messages {
white-space: pre-wrap; white-space: pre-wrap;
font-family: monospace; font-family: "Source Code Pro";
padding-top: 5px; padding-top: 5px;
padding-left: 10px; padding-left: 10px;
overflow: auto; overflow: auto;

View File

@ -99,7 +99,7 @@
.sql-editor-message { .sql-editor-message {
white-space:pre-wrap; white-space:pre-wrap;
font-family: monospace; font-family: "Source Code Pro";
padding-top: 5px; padding-top: 5px;
padding-left: 10px; padding-left: 10px;
overflow: auto; overflow: auto;
@ -151,7 +151,7 @@
.CodeMirror-foldmarker { .CodeMirror-foldmarker {
color: blue; color: blue;
text-shadow: #b9f 1px 1px 2px, #b9f -1px -1px 2px, #b9f 1px -1px 2px, #b9f -1px 1px 2px; text-shadow: #b9f 1px 1px 2px, #b9f -1px -1px 2px, #b9f 1px -1px 2px, #b9f -1px 1px 2px;
font-family: arial; font-family: "Open Sans";
line-height: .3; line-height: .3;
cursor: pointer; cursor: pointer;
} }
@ -206,7 +206,7 @@
background: white; background: white;
font-size: 90%; font-size: 90%;
font-family: monospace; font-family: "Source Code Pro";
max-height: 20em; max-height: 20em;
overflow-y: auto; overflow-y: auto;