Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Merryweather font for logo #241

Merged
merged 1 commit into from
Oct 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/components/Home/Home.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ export default class Home extends React.PureComponent {
<img src={landingIllustration} alt="" />
</section>
<section className="section has-text-centered community content">
<h1>{t('videoDebate:community')}</h1>
<h2 className="title is-2">{t('videoDebate:community')}</h2>
<Statistics />
</section>
<section className="section has-text-centered contributors content">
<h1>{t('contributors')}</h1>
<h2 className="title is-2">{t('contributors')}</h2>
<AllContributors />
<ExternalLinkNewTab className="button is-large" href="https://opencollective.com/captainfact_io">
<Icon name="external-link" />
Expand Down
1 change: 1 addition & 0 deletions app/styles/_components/App/logo.sass
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ $logo-inside-color: #d8d7d7
.logo-captain
z-index: 3
font-weight: 400
margin-left: 1px
.beta
font-size: 0.45em
color: $grey-light
Expand Down
4 changes: 2 additions & 2 deletions app/styles/_components/Pages/home_page.sass
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

.section
margin: 0
h1
h2
margin-bottom: 1em

.presentation
Expand Down Expand Up @@ -84,7 +84,7 @@
.community
background: #5abda8
color: $white
h1
h2
color: $white-bis
.columns
max-width: 500px
Expand Down
Binary file added app/styles/_fonts/Merriweather.eot
Binary file not shown.
374 changes: 374 additions & 0 deletions app/styles/_fonts/Merriweather.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 app/styles/_fonts/Merriweather.ttf
Binary file not shown.
Binary file added app/styles/_fonts/Merriweather.woff
Binary file not shown.
Binary file added app/styles/_fonts/Merriweather.woff2
Binary file not shown.
5 changes: 4 additions & 1 deletion app/styles/_global/global.sass
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,7 @@ a[disabled]

.image.is-40x40
height: 40px
width: 40px
width: 40px

h1
font-family: $family-serif
3 changes: 0 additions & 3 deletions app/styles/_global/icons.sass
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
// Icons generated with the help of https://icomoon.io/app/. Use config/icomoon_icons.json to load project

@include font-face(icomoon, "./_fonts/icomoon", normal, normal, eot woff2 woff ttf svg)


.fa
display: inline-block
/* use !important to prevent issues with browser extensions that change fonts */
Expand Down
1 change: 1 addition & 0 deletions app/styles/_global/variables.sass
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ $text-strong: $grey-darker !default
// Typography

$family-sans-serif: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen,Ubuntu,Cantarell,"Fira Sans","Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif
$family-serif: Merriweather,serif

$body-size: 14px

Expand Down
9 changes: 8 additions & 1 deletion app/styles/application.sass
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Vendors
// ---- Vendors ----
// Bulma
@import "_global/variables"
@import "bulma/sass/utilities/animations"
@import "bulma/sass/utilities/mixins"
Expand Down Expand Up @@ -40,12 +41,18 @@
@import "animate/bounceInDown"
@import "animate/flipInX"

// React-select
@import "react-select/scss/default"

// ---- Home made ----
// Mixins
@import "_mixins/font_face"
@import "_mixins/progressive_animation_delay"

// Fonts
@include font-face(icomoon, "./_fonts/icomoon", normal, normal, eot woff2 woff ttf svg)
@include font-face(Merriweather, "./_fonts/Merriweather", normal, normal, eot woff2 woff ttf svg)

// Custom styles
@import "_global/global"
@import "_global/icons"
Expand Down