1
0
mirror of https://github.com/jhillyerd/inbucket.git synced 2025-12-17 17:47:03 +00:00

ui: Use OpenSans font (#178)

This commit is contained in:
James Hillyerd
2020-09-21 16:16:00 -07:00
committed by GitHub
parent 5c5b0f819b
commit 4648d8e593
7 changed files with 20 additions and 5 deletions

View File

@@ -4,6 +4,13 @@ Change Log
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/). This project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased]
### Changed
- The UI now includes the Open Sans webfont instead of relying on browser/OS
fonts
## [v3.0.0-beta3] ## [v3.0.0-beta3]
### Added ### Added

5
ui/package-lock.json generated
View File

@@ -5192,6 +5192,11 @@
"wrappy": "1" "wrappy": "1"
} }
}, },
"opensans-npm-webfont": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/opensans-npm-webfont/-/opensans-npm-webfont-1.0.0.tgz",
"integrity": "sha512-2ehgrX+NpoxLOil30tYGr0cDsDXSJn9gon6PfM1Ki0CxZF6ui9Mi6Dm5DGglKyK2QiX0gMb6Ch7VmRHwfc4M6Q=="
},
"opn": { "opn": {
"version": "5.5.0", "version": "5.5.0",
"resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz", "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",

View File

@@ -10,7 +10,9 @@
"dev": "webpack-dev-server --mode development --port 3000 --hot --watch", "dev": "webpack-dev-server --mode development --port 3000 --hot --watch",
"errors": "webpack --mode development --display-error-details" "errors": "webpack --mode development --display-error-details"
}, },
"dependencies": {}, "dependencies": {
"opensans-npm-webfont": "^1.0.0"
},
"devDependencies": { "devDependencies": {
"@babel/core": "^7.11.4", "@babel/core": "^7.11.4",
"@babel/preset-env": "^7.11.0", "@babel/preset-env": "^7.11.0",

View File

@@ -3,6 +3,7 @@ import './mailbox.css'
import './navbar.css' import './navbar.css'
import '@fortawesome/fontawesome-free/css/all.css' import '@fortawesome/fontawesome-free/css/all.css'
import '@webcomponents/webcomponentsjs/webcomponents-bundle' import '@webcomponents/webcomponentsjs/webcomponents-bundle'
import 'opensans-npm-webfont'
import { Elm } from './Main.elm' import { Elm } from './Main.elm'
import './monitorMessages' import './monitorMessages'
import './renderedHtml' import './renderedHtml'

View File

@@ -46,8 +46,9 @@ body {
} }
body, button, input, table { body, button, input, table {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Open Sans", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 14px;
font-weight: 400;
line-height: 1.43; line-height: 1.43;
color: var(--primary-color); color: var(--primary-color);
} }
@@ -245,7 +246,7 @@ h3 {
font-weight: 400; font-weight: 400;
height: 30px; height: 30px;
margin: 0; margin: 0;
padding: 5px 10px; padding: 5px 10px 6px;
text-align: center; text-align: center;
text-decoration: none; text-decoration: none;
text-shadow: 0 -1px 0 rgba(0,0,0,0.2); text-shadow: 0 -1px 0 rgba(0,0,0,0.2);

View File

@@ -25,6 +25,7 @@
.navbar-brand { .navbar-brand {
font-size: 18px; font-size: 18px;
font-weight: 600;
} }
.navbar-toggle { .navbar-toggle {

View File

@@ -35,12 +35,10 @@ module.exports = (env, argv) => {
], ],
}, },
{ {
include: [/\/src/, /\/node_modules\/@fortawesome\/fontawesome-free\/css/],
test: /\.css$/, test: /\.css$/,
loader: ['style-loader', 'css-loader'], loader: ['style-loader', 'css-loader'],
}, },
{ {
include: [/\/node_modules\/@fortawesome\/fontawesome-free\/webfonts/],
test: /\.(eot|svg|ttf|woff|woff2)$/, test: /\.(eot|svg|ttf|woff|woff2)$/,
loader: 'file-loader', loader: 'file-loader',
options: { options: {