Changing primary font from "Lato" to "Source Sans Pro/Roboto"

pull/64/head
Jordan Wright 2015-09-25 19:49:40 -05:00
parent c9f5a753c8
commit 6acbac26f5
26 changed files with 17 additions and 28237 deletions

View File

@ -1,45 +1,3 @@
@font-face {
font-family: 'Lato';
src: url('../font/lato/lato-black.eot');
src: url('../font/lato/lato-black.eot?#iefix') format('embedded-opentype'), url('../font/lato/lato-black.woff') format('woff'), url('../font/lato/lato-black.ttf') format('truetype'), url('../font/lato/lato-black.svg#latoblack') format('svg');
font-weight: 900;
font-style: normal;
}
@font-face {
font-family: 'Lato';
src: url('../font/lato/lato-bold.eot');
src: url('../font/lato/lato-bold.eot?#iefix') format('embedded-opentype'), url('../font/lato/lato-bold.woff') format('woff'), url('../font/lato/lato-bold.ttf') format('truetype'), url('../font/lato/lato-bold.svg#latobold') format('svg');
font-weight: bold;
font-style: normal;
}
@font-face {
font-family: 'Lato';
src: url('../font/lato/lato-bolditalic.eot');
src: url('../font/lato/lato-bolditalic.eot?#iefix') format('embedded-opentype'), url('../font/lato/lato-bolditalic.woff') format('woff'), url('../font/lato/lato-bolditalic.ttf') format('truetype'), url('../font/lato/lato-bolditalic.svg#latobold-italic') format('svg');
font-weight: bold;
font-style: italic;
}
@font-face {
font-family: 'Lato';
src: url('../font/lato/lato-italic.eot');
src: url('../font/lato/lato-italic.eot?#iefix') format('embedded-opentype'), url('../font/lato/lato-italic.woff') format('woff'), url('../font/lato/lato-italic.ttf') format('truetype'), url('../font/lato/lato-italic.svg#latoitalic') format('svg');
font-weight: normal;
font-style: italic;
}
@font-face {
font-family: 'Lato';
src: url('../font/lato/lato-light.eot');
src: url('../font/lato/lato-light.eot?#iefix') format('embedded-opentype'), url('../font/lato/lato-light.woff') format('woff'), url('../font/lato/lato-light.ttf') format('truetype'), url('../font/lato/lato-light.svg#latolight') format('svg');
font-weight: 300;
font-style: normal;
}
@font-face {
font-family: 'Lato';
src: url('../font/lato/lato-regular.eot');
src: url('../font/lato/lato-regular.eot?#iefix') format('embedded-opentype'), url('../font/lato/lato-regular.woff') format('woff'), url('../font/lato/lato-regular.ttf') format('truetype'), url('../font/lato/lato-regular.svg#latoregular') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face { @font-face {
font-family: "Flat-UI-Icons"; font-family: "Flat-UI-Icons";
src: url('../font/flat-ui-icons-regular.eot'); src: url('../font/flat-ui-icons-regular.eot');
@ -199,7 +157,7 @@ you can use the generic selector below, but it's slower:
border-top-color: #34495e !important; border-top-color: #34495e !important;
} }
body { body {
font-family: "Lato", Helvetica, Arial, sans-serif; font-family: "Source Sans Pro", Helvetica, Arial, sans-serif;
font-size: 18px; font-size: 18px;
line-height: 1.72222; line-height: 1.72222;
color: #34495e; color: #34495e;
@ -245,6 +203,14 @@ h2,
h3, h3,
h4, h4,
h5, h5,
h6{
font-family: 'Roboto', sans-serif;
}
h1,
h2,
h3,
h4,
h5,
h6, h6,
.h1, .h1,
.h2, .h2,
@ -252,7 +218,6 @@ h6,
.h4, .h4,
.h5, .h5,
.h6 { .h6 {
font-family: inherit;
font-weight: 700; font-weight: 700;
line-height: 1.1; line-height: 1.1;
color: inherit; color: inherit;
@ -1151,7 +1116,7 @@ label {
.form-control { .form-control {
border: 1px solid #bdc3c7; border: 1px solid #bdc3c7;
color: #34495e; color: #34495e;
font-family: "Lato", Helvetica, Arial, sans-serif; font-family: "Source Sans Pro", Helvetica, Arial, sans-serif;
font-size: 15px; font-size: 15px;
line-height: 1.467; line-height: 1.467;
padding: 8px 12px; padding: 8px 12px;
@ -2185,7 +2150,7 @@ select[multiple].navbar-form .btn {
} }
.navbar-unread, .navbar-unread,
.navbar-new { .navbar-new {
font-family: "Lato", Helvetica, Arial, sans-serif; font-family: "Source Sans Pro", Helvetica, Arial, sans-serif;
background-color: #1abc9c; background-color: #1abc9c;
border-radius: 50%; border-radius: 50%;
color: #ffffff; color: #ffffff;
@ -2705,7 +2670,7 @@ fieldset[disabled] .navbar-inverse .navbar-btn.active {
background: transparent; background: transparent;
border: none; border: none;
color: #34495e; color: #34495e;
font-family: "Lato", Helvetica, Arial, sans-serif; font-family: "Source Sans Pro", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 14px;
margin: 0px; margin: 0px;
padding: 0 0 0 5px; padding: 0 0 0 5px;
@ -2777,7 +2742,7 @@ fieldset[disabled] .navbar-inverse .navbar-btn.active {
.twitter-typeahead .tt-hint { .twitter-typeahead .tt-hint {
border: 2px solid #bdc3c7; border: 2px solid #bdc3c7;
color: #34495e; color: #34495e;
font-family: "Lato", Helvetica, Arial, sans-serif; font-family: "Source Sans Pro", Helvetica, Arial, sans-serif;
font-size: 15px; font-size: 15px;
line-height: 1.467; line-height: 1.467;
padding: 8px 12px; padding: 8px 12px;
@ -3842,7 +3807,7 @@ body.vjs-full-window {
bottom: 4em; bottom: 4em;
left: 1em; left: 1em;
right: 1em; right: 1em;
font-family: "Lato", Helvetica, Arial, sans-serif; font-family: "Source Sans Pro", Helvetica, Arial, sans-serif;
} }
.video-js .vjs-text-track { .video-js .vjs-text-track {
display: none; display: none;
@ -4079,7 +4044,7 @@ body.vjs-full-window {
height: 20px; height: 20px;
width: 50px; width: 50px;
top: 16px; top: 16px;
font: 300 13px "Lato", Helvetica, Arial, sans-serif; font: 300 13px "Source Sans Pro", Helvetica, Arial, sans-serif;
} }
.vjs-current-time { .vjs-current-time {
right: 128px; right: 128px;

Binary file not shown.

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 264 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 278 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 261 KiB

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 260 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 261 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 262 KiB

Binary file not shown.

Binary file not shown.

View File

@ -22,7 +22,8 @@
<link href="/css/dataTables.bootstrap.css" rel="stylesheet"> <link href="/css/dataTables.bootstrap.css" rel="stylesheet">
<link href="/css/font-awesome.min.css" rel="stylesheet"> <link href="/css/font-awesome.min.css" rel="stylesheet">
<link href="/css/chartist.min.css" rel="stylesheet"> <link href="/css/chartist.min.css" rel="stylesheet">
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,700' rel='stylesheet' type='text/css'> <link href='https://fonts.googleapis.com/css?family=Roboto:700,500' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,300,600,700' rel='stylesheet' type='text/css'>
<script> <script>
{{if .User}} {{if .User}}
var user = { var user = {