Browse Source

custom fonts

pull/8/head
Andrew Marcuse 3 years ago
parent
commit
920198436f
  1. 1
      .github/workflows/deploy-heroku.yaml
  2. 1
      .gitignore
  3. 3
      README.md
  4. 2
      package.json
  5. 20
      partials/above.hbs
  6. 71
      scss/common.scss
  7. 11
      scss/iconsearch.scss
  8. 11
      scss/logosearch.scss
  9. 20
      scss/style.scss
  10. 7809
      static/css/style.css
  11. 7
      static/css/style.css.map
  12. 5
      yarn.lock

1
.github/workflows/deploy-heroku.yaml

@ -10,6 +10,7 @@ on:
- '.github/workflows/update-data.yaml'
- '.vscode/*'
- '.devcontainer'
workflow_dispatch:
jobs:
deploy:

1
.gitignore

@ -7,5 +7,6 @@ dist/
*.log
*.mmdb
node_modules/
.sass-cache/
tmp/
*.tmp

3
README.md

@ -43,9 +43,12 @@ This code is licensed under the [GNU Affero General Public License v3.0](LICENSE
[![npm](https://www.vectorlogo.zone/logos/npmjs/npmjs-ar21.svg)](https://www.npmjs.com/ "JS Package Management")
[![pino](https://www.vectorlogo.zone/logos/getpinoio/getpinoio-ar21.svg)](https://www.getpino.io/ "Logging")
[![Python](https://www.vectorlogo.zone/logos/python/python-ar21.svg)](https://www.python.org/ "data load script")
[![Sass](https://www.vectorlogo.zone/logos/sass-lang/sass-lang-ar21.svg)](https://sass-lang.com/ "CSS builder")
[![TypeScript](https://www.vectorlogo.zone/logos/typescriptlang/typescriptlang-ar21.svg)](https://www.typescriptlang.org/ "Programming Language")
[![yarn](https://www.vectorlogo.zone/logos/yarnpkg/yarnpkg-ar21.svg)](https://yarnpkg.com/en/ "Node.JS Package Management")
* Bitter by Sol Matas for [Huerta Tipográfica](https://www.huertatipografica.com/en)
* Open Sans by [Steve Mattison](https://twitter.com/SteveMatteson1)
* Twitter banner photo by [Enrapture Captivating Media](https://unsplash.com/@enrapture)
* Additional geolocation sources are credited on the [geolocation test page](https://resolve.rs/ip/geolocation.html)

2
package.json

@ -1,6 +1,7 @@
{
"dependencies": {
"axios": "^0.19.0",
"bootstrap": "^4.5.3",
"convict": "^5.1.0",
"handlebars": "^4.7.3",
"is-ip": "^3.1.0",
@ -64,6 +65,7 @@
},
"scripts": {
"build": "tsc",
"css": "sass scss/style.scss:static/css/style.css",
"run": "nodemon",
"start": "node dist/server.js",
"test": "echo \"Error: no test specified\" && exit 1"

20
partials/above.hbs

@ -1,19 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>{{#if h1}}{{ title }}{{else}}{{ title }} - Resolve.rs{{/if}}</title>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="stylesheet" href="/css/bootstrap.min.css" />
<script src="/js/jquery-3.5.1.min.js"></script>
<script src="/js/popper.min.js"></script>
<script src="/js/bootstrap.min.js"></script>
<style>
.social-footer {
max-height: 20pt;
margin: 4pt;
}
</style>
<meta charset="utf-8">
<title>{{#if h1}}{{ title }}{{else}}{{ title }} - Resolve.rs{{/if}}</title>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="stylesheet" href="/css/style.css" />
<script src="/js/jquery-3.5.1.min.js"></script>
<script src="/js/popper.min.js"></script>
<script src="/js/bootstrap.min.js"></script>
{{#if rootMeta}}<script type="application/ld+json">
{
"@context": "https://schema.org",

71
scss/common.scss

@ -0,0 +1,71 @@
.navbar-logo {
height: 2.5rem;
margin-top: -12px;
padding-right: 8px;
}
/* faded border around logos in lists */
.logo-container img {
box-shadow: 0 0 5px #1d1d1d;
border: solid #ccc 1px;
margin: 6px;
}
.navbar-brand {
font-family: $headings-font-family;
font-weight: 700;
font-style: italic;
font-size: 1.65rem;
padding-top: 0;
padding-bottom: 0;
}
.nav-link {
font-weight: bold;
}
.navbar-dark .navbar-nav .nav-link {
color: white;
}
h1 {
margin-top: 21px;
}
/* optional padding on visual inventory */
.padded { padding: 5px; }
.maxsize { max-width: 120px; max-height: 120px; }
/* hide outline on a clicked tab */
.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
outline: 0;
}
.navbar {
background: #f2f2f2;
}
.social-footer {
height: 20pt;
padding-left: 5pt;
padding-right: 5pt;
}
.boxedlogo {
max-width: 350px;
max-height: 100px;
height: 100px;
margin: 10px;
padding: 5px;
}
.gridbg {
background-color: #aaa;
}
img.noscript-loading {
background: transparent url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1MCA1MCIvPg==') center no-repeat;
width: 100px;
}
img.loading {
background: transparent url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJzdmctem9uZS1zcGlubmVyIiB2aWV3Qm94PSIwIDAgNTAgNTAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiPgoJPGcgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWNhcD0icm91bmQiPgoJCTxwYXRoIG9wYWNpdHk9Ii4zIiBkPSJNMjkgMTguMDcxNzk3IEwzMywgMTEuMTQzNTk0Ii8+CgkJPHBhdGggb3BhY2l0eT0iLjMiICBkPSJNMzEuOTI4MjAzIDIxIEwzOC44NTY0MDYgMTciIC8+CgkJPHBhdGggb3BhY2l0eT0iLjMiIGQ9Ik0yNSAzMyBMMjUgNDEiIC8+CgkJPHBhdGggb3BhY2l0eT0iLjMiIGQ9Ik0zMS45MjgyMDMgMjkgTDM4Ljg1NjQwNiAzMywgIi8+CgkJPHBhdGggb3BhY2l0eT0iLjMiICBkPSJNMjkgMzEuOTI4MjAzIEwzMywgMzguODU2NDA2Ii8+CgkJPHBhdGggb3BhY2l0eT0iLjMiIGQ9Ik0zMyAyNSBMNDEgMjUiIC8+CgkJPHBhdGggb3BhY2l0eT0iLjMiICBkPSJNMjEgMzEuOTI4MjAzIEwxNywgMzguODU2NDA2Ii8+CgkJPHBhdGggb3BhY2l0eT0iLjQ0IiAgZD0iTTE4LjA3MTc5NyAyOSBMMTEuMTQzNTk0IDMzIiAvPgoJCTxwYXRoIG9wYWNpdHk9Ii42NSIgZD0iTTE3IDI1IEw5IDI1IiAvPgoJCTxwYXRoIG9wYWNpdHk9Ii44NiIgIGQ9Ik0xOC4wNzE3OTcgMjEgTDExLjE0MzU5NCAxNywgIi8+CgkJPHBhdGggb3BhY2l0eT0iLjkzIiAgZD0iTTIxIDE4LjA3MTc5NyBMMTcsIDExLjE0MzU5NCIvPgoJCTxwYXRoIG9wYWNpdHk9IjEuMCIgZD0iTTI1IDE3IEwyNSA5IiAvPgoJCTxhbmltYXRlVHJhbnNmb3JtIGF0dHJpYnV0ZVR5cGU9InhtbCIKCQkJCQkJICBhdHRyaWJ1dGVOYW1lPSJ0cmFuc2Zvcm0iCgkJCQkJCSAgdHlwZT0icm90YXRlIgoJCQkJCQkgIHZhbHVlcz0iMCAyNSAyNTsgMzAgMjUgMjU7IDYwIDI1IDI1OyA5MCAyNSAyNTsgMTIwIDI1IDI1OyAxNTAgMjUgMjU7IDE4MCAyNSAyNTsgMjEwIDI1IDI1OyAyNDAgMjUgMjU7IDI3MCAyNSAyNTsgMzAwIDI1IDI1OyAzMzAgMjUgMjUiCgkJCQkJCSAgY2FsY01vZGU9ImRpc2NyZXRlIgoJCQkJCQkgIGR1cj0iMS4wcyIKCQkJCQkJICByZXBlYXRDb3VudD0iaW5kZWZpbml0ZSIvPgoJPC9nPgo8L3N2Zz4K') center no-repeat;
width: 100px;
}

11
scss/iconsearch.scss

@ -0,0 +1,11 @@
$enable-responsive-font-sizes: false;
$font-family-sans-serif: "Open Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
$headings-font-family: "Noticia Text", serif;
$headings-font-weight: 700;
// Bootstrap and its default variables
@import "../node_modules/bootstrap/scss/bootstrap";
@import "common";

11
scss/logosearch.scss

@ -0,0 +1,11 @@
$enable-responsive-font-sizes: false;
$font-family-sans-serif: Lato, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
$headings-font-family: Sansita, sans-serif;
$headings-font-weight: 700;
// Bootstrap and its default variables
@import "../node_modules/bootstrap/scss/bootstrap";
@import "common";

20
scss/style.scss

@ -0,0 +1,20 @@
$enable-responsive-font-sizes: false;
$font-family-sans-serif: "Open Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
$headings-font-family: "Bitter", serif;
$headings-font-weight: 600;
// Bootstrap and its default variables
@import "../node_modules/bootstrap/scss/bootstrap";
@import url('https://fonts.googleapis.com/css2?family=Bitter:ital,wght@0,400;0,600;0,700;1,400;1,600;1,700&family=Open+Sans:ital,wght@0,400;0,600;1,400;1,600&display=swap');
.social-footer {
max-height: 20pt;
margin: 4pt;
}
.navbar-brand {
font-family: $headings-font-family;
font-weight: 600;
font-style: italic;
}

7809
static/css/style.css
File diff suppressed because it is too large
View File

7
static/css/style.css.map
File diff suppressed because it is too large
View File

5
yarn.lock

@ -371,6 +371,11 @@ bluebird@^3.1.1:
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
bootstrap@^4.5.3:
version "4.5.3"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.3.tgz#c6a72b355aaf323920be800246a6e4ef30997fe6"
integrity sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ==
boxen@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64"

Loading…
Cancel
Save