Skip to content

Commit

Permalink
Merge pull request #2 from linchpin/merge-test
Browse files Browse the repository at this point in the history
Merge test
  • Loading branch information
maxinacube authored Sep 23, 2022
2 parents 218ecbf + b0f09a9 commit 96baa13
Show file tree
Hide file tree
Showing 107 changed files with 8,010 additions and 106 deletions.
27 changes: 27 additions & 0 deletions assets/fonts/gilmer-bold.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
Font: Gilmer
Style: Bold
URL: https://www.youworkforthem.com/font/T9758/gilmer
Foundry: Piotr Lapa
Foundry: https://www.youworkforthem.com/designer/1166/piotr-lapa
Copyright: Copyright © 2018 by Piotr _apa. All rights reserved.
Version: 17
Created: August 17, 2018
License: https://www.youworkforthem.com/font-license
License: The WebFont(s) listed in this document must follow the YouWorkForThem
WebFont license rules. All other parties are strictly restricted
from using the WebFonts(s) listed without a purchased license.
All details above must always remain unaltered and visible in your CSS.
*/

@font-face {
font-family: 'Gilmer-Bold';
src: url('gilmer-bold.eot');
src: url('gilmer-bold.eot?#iefix') format('embedded-opentype'),
url('gilmer-bold.woff2') format('woff2'),
url('gilmer-bold.woff') format('woff'),
url('gilmer-bold.ttf') format('truetype'),
url('gilmer-bold.svg#youworkforthem') format('svg');
font-weight: normal;
font-style: normal;
}
Binary file added assets/fonts/gilmer-bold.eot
Binary file not shown.
4 changes: 4 additions & 0 deletions assets/fonts/gilmer-bold.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/fonts/gilmer-bold.ttf
Binary file not shown.
Binary file added assets/fonts/gilmer-bold.woff
Binary file not shown.
Binary file added assets/fonts/gilmer-bold.woff2
Binary file not shown.
27 changes: 27 additions & 0 deletions assets/fonts/gilmer-heavy.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
Font: Gilmer
Style: Heavy
URL: https://www.youworkforthem.com/font/T9758/gilmer
Foundry: Piotr Lapa
Foundry: https://www.youworkforthem.com/designer/1166/piotr-lapa
Copyright: Copyright © 2018 by Piotr _apa. All rights reserved.
Version: 17
Created: August 17, 2018
License: https://www.youworkforthem.com/font-license
License: The WebFont(s) listed in this document must follow the YouWorkForThem
WebFont license rules. All other parties are strictly restricted
from using the WebFonts(s) listed without a purchased license.
All details above must always remain unaltered and visible in your CSS.
*/

@font-face {
font-family: 'Gilmer-Heavy';
src: url('gilmer-heavy.eot');
src: url('gilmer-heavy.eot?#iefix') format('embedded-opentype'),
url('gilmer-heavy.woff2') format('woff2'),
url('gilmer-heavy.woff') format('woff'),
url('gilmer-heavy.ttf') format('truetype'),
url('gilmer-heavy.svg#youworkforthem') format('svg');
font-weight: normal;
font-style: normal;
}
Binary file added assets/fonts/gilmer-heavy.eot
Binary file not shown.
4 changes: 4 additions & 0 deletions assets/fonts/gilmer-heavy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/fonts/gilmer-heavy.ttf
Binary file not shown.
Binary file added assets/fonts/gilmer-heavy.woff
Binary file not shown.
Binary file added assets/fonts/gilmer-heavy.woff2
Binary file not shown.
27 changes: 27 additions & 0 deletions assets/fonts/gilmer-light.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
Font: Gilmer
Style: Light
URL: https://www.youworkforthem.com/font/T9758/gilmer
Foundry: Piotr Lapa
Foundry: https://www.youworkforthem.com/designer/1166/piotr-lapa
Copyright: Copyright © 2018 by Piotr _apa. All rights reserved.
Version: 17
Created: August 17, 2018
License: https://www.youworkforthem.com/font-license
License: The WebFont(s) listed in this document must follow the YouWorkForThem
WebFont license rules. All other parties are strictly restricted
from using the WebFonts(s) listed without a purchased license.
All details above must always remain unaltered and visible in your CSS.
*/

@font-face {
font-family: 'Gilmer-Light';
src: url('gilmer-light.eot');
src: url('gilmer-light.eot?#iefix') format('embedded-opentype'),
url('gilmer-light.woff2') format('woff2'),
url('gilmer-light.woff') format('woff'),
url('gilmer-light.ttf') format('truetype'),
url('gilmer-light.svg#youworkforthem') format('svg');
font-weight: normal;
font-style: normal;
}
Binary file added assets/fonts/gilmer-light.eot
Binary file not shown.
4 changes: 4 additions & 0 deletions assets/fonts/gilmer-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/fonts/gilmer-light.ttf
Binary file not shown.
Binary file added assets/fonts/gilmer-light.woff
Binary file not shown.
Binary file added assets/fonts/gilmer-light.woff2
Binary file not shown.
27 changes: 27 additions & 0 deletions assets/fonts/gilmer-medium.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
Font: Gilmer
Style: Medium
URL: https://www.youworkforthem.com/font/T9758/gilmer
Foundry: Piotr Lapa
Foundry: https://www.youworkforthem.com/designer/1166/piotr-lapa
Copyright: Copyright © 2018 by Piotr _apa. All rights reserved.
Version: 17
Created: August 17, 2018
License: https://www.youworkforthem.com/font-license
License: The WebFont(s) listed in this document must follow the YouWorkForThem
WebFont license rules. All other parties are strictly restricted
from using the WebFonts(s) listed without a purchased license.
All details above must always remain unaltered and visible in your CSS.
*/

@font-face {
font-family: 'Gilmer-Medium';
src: url('gilmer-medium.eot');
src: url('gilmer-medium.eot?#iefix') format('embedded-opentype'),
url('gilmer-medium.woff2') format('woff2'),
url('gilmer-medium.woff') format('woff'),
url('gilmer-medium.ttf') format('truetype'),
url('gilmer-medium.svg#youworkforthem') format('svg');
font-weight: normal;
font-style: normal;
}
Binary file added assets/fonts/gilmer-medium.eot
Binary file not shown.
4 changes: 4 additions & 0 deletions assets/fonts/gilmer-medium.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/fonts/gilmer-medium.ttf
Binary file not shown.
Binary file added assets/fonts/gilmer-medium.woff
Binary file not shown.
Binary file added assets/fonts/gilmer-medium.woff2
Binary file not shown.
27 changes: 27 additions & 0 deletions assets/fonts/gilmer-outline.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
Font: Gilmer
Style: Outline
URL: https://www.youworkforthem.com/font/T9758/gilmer
Foundry: Piotr Lapa
Foundry: https://www.youworkforthem.com/designer/1166/piotr-lapa
Copyright: Copyright © 2018 by Piotr _apa. All rights reserved.
Version: 17
Created: August 17, 2018
License: https://www.youworkforthem.com/font-license
License: The WebFont(s) listed in this document must follow the YouWorkForThem
WebFont license rules. All other parties are strictly restricted
from using the WebFonts(s) listed without a purchased license.
All details above must always remain unaltered and visible in your CSS.
*/

@font-face {
font-family: 'Gilmer-Outline';
src: url('gilmer-outline.eot');
src: url('gilmer-outline.eot?#iefix') format('embedded-opentype'),
url('gilmer-outline.woff2') format('woff2'),
url('gilmer-outline.woff') format('woff'),
url('gilmer-outline.ttf') format('truetype'),
url('gilmer-outline.svg#youworkforthem') format('svg');
font-weight: normal;
font-style: normal;
}
Binary file added assets/fonts/gilmer-outline.eot
Binary file not shown.
4 changes: 4 additions & 0 deletions assets/fonts/gilmer-outline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/fonts/gilmer-outline.ttf
Binary file not shown.
Binary file added assets/fonts/gilmer-outline.woff
Binary file not shown.
Binary file added assets/fonts/gilmer-outline.woff2
Binary file not shown.
27 changes: 27 additions & 0 deletions assets/fonts/gilmer-regular.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
Font: Gilmer
Style: Regular
URL: https://www.youworkforthem.com/font/T9758/gilmer
Foundry: Piotr Lapa
Foundry: https://www.youworkforthem.com/designer/1166/piotr-lapa
Copyright: Copyright © 2018 by Piotr _apa. All rights reserved.
Version: 17
Created: August 17, 2018
License: https://www.youworkforthem.com/font-license
License: The WebFont(s) listed in this document must follow the YouWorkForThem
WebFont license rules. All other parties are strictly restricted
from using the WebFonts(s) listed without a purchased license.
All details above must always remain unaltered and visible in your CSS.
*/

@font-face {
font-family: 'Gilmer-Regular';
src: url('gilmer-regular.eot');
src: url('gilmer-regular.eot?#iefix') format('embedded-opentype'),
url('gilmer-regular.woff2') format('woff2'),
url('gilmer-regular.woff') format('woff'),
url('gilmer-regular.ttf') format('truetype'),
url('gilmer-regular.svg#youworkforthem') format('svg');
font-weight: normal;
font-style: normal;
}
Binary file added assets/fonts/gilmer-regular.eot
Binary file not shown.
4 changes: 4 additions & 0 deletions assets/fonts/gilmer-regular.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/fonts/gilmer-regular.ttf
Binary file not shown.
Binary file added assets/fonts/gilmer-regular.woff
Binary file not shown.
Binary file added assets/fonts/gilmer-regular.woff2
Binary file not shown.
Empty file added assets/js/ash.js
Empty file.
Loading

0 comments on commit 96baa13

Please sign in to comment.