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

Apply new brand on the website #538

Merged
merged 5 commits into from
Jun 6, 2022
Merged
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -4,3 +4,6 @@
/.cache
.DS_Store
/Gemfile.lock
.jekyll-cache
.gem
_site
4 changes: 2 additions & 2 deletions source/_footer.haml
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@
.container
.row
.col-lg-3.col-lg-offset-1.col-sm-3.hidden-xs
%a.navbar-brand.page-scroll{:href => "#page-top"}
=image_tag '/img/logo.svgz', :title => 'Flatpak', :class => 'full'
%a.navbar-brand.page-scroll{:href => "#page-top"}
=partial "logo.svg"
%ul.col-lg-7.col-lg-offset-0.col-sm-8.col-sm-offset-0.col-xs-7.col-xs-offset-2
%li.toplevel
= link_to "Home", "/index.html"
1 change: 1 addition & 0 deletions source/_logo.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 modified source/favicon.ico
Binary file not shown.
Binary file added source/fonts/Inter.var.woff2
Binary file not shown.
Binary file removed source/fonts/Overpass-Bold-Italic.ttf
Binary file not shown.
Binary file removed source/fonts/Overpass-Bold.ttf
Binary file not shown.
Binary file removed source/fonts/Overpass-ExtraLight Italic.ttf
Binary file not shown.
Binary file removed source/fonts/Overpass-ExtraLight.ttf
Binary file not shown.
Binary file removed source/fonts/Overpass-Light-Italic.ttf
Binary file not shown.
Binary file removed source/fonts/Overpass-Light.ttf
Binary file not shown.
Binary file removed source/fonts/Overpass-Regular-Italic.ttf
Binary file not shown.
Binary file removed source/fonts/Overpass-Regular.ttf
Binary file not shown.
Binary file removed source/fonts/SourceCodePro-ExtraLight.otf
Binary file not shown.
Binary file removed source/fonts/SourceCodePro-Light.otf
Binary file not shown.
Binary file removed source/fonts/SourceCodePro-Regular.otf
Binary file not shown.
Binary file removed source/fonts/SourceCodePro-Semibold.otf
Binary file not shown.
Binary file removed source/fonts/SourceSansPro-ExtraLight.otf
Binary file not shown.
Binary file removed source/fonts/SourceSansPro-Light.otf
Binary file not shown.
Binary file removed source/fonts/SourceSansPro-Regular.otf
Binary file not shown.
Binary file removed source/fonts/SourceSansPro-Semibold.otf
Binary file not shown.
Binary file added source/img/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
98 changes: 98 additions & 0 deletions source/img/apple-touch-icon.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 removed source/img/banner.svgz
Binary file not shown.
Binary file added source/img/container.webp
Binary file not shown.
Binary file removed source/img/favicon.png
Binary file not shown.
1 change: 1 addition & 0 deletions source/img/favicon.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 removed source/img/favicon.xcf.bz2
Binary file not shown.
Binary file removed source/img/favicon152.png
Binary file not shown.
Binary file removed source/img/favicon57.png
Binary file not shown.
Binary file modified source/img/flatpak-logos.zip
Binary file not shown.
Binary file modified source/img/logo.svgz
Binary file not shown.
16 changes: 4 additions & 12 deletions source/index.html.haml
Original file line number Diff line number Diff line change
@@ -3,20 +3,12 @@ title: Flatpak—the future of application distribution
description: The days of chasing multiple Linux distributions are over. Standalone apps for Linux are here!
---

%section.imagebanner.centered
%section.imagebanner
.container
.row.largegap
.col-lg-12
.col-lg-10.col-lg-offset-1
%h1.section-heading
The future of
%span.emphasize apps on Linux
%p Flatpak is a next-generation technology for building and distributing desktop applications on Linux

%section.illustration.centered
.container
.row
.col-lg-8.col-lg-offset-2
= image_tag '/img/delivery_truck2.png'
The future of apps on Linux

%section#appsplash.bg-secondary
.container
@@ -44,7 +36,7 @@ description: The days of chasing multiple Linux distributions are over. Standalo
.container
.row.centered
.col-sm-10.col-sm-offset-1
%iframe{'width'=>'100%','height'=>'440', 'src'=>'https://www.youtube.com/embed/jDVCITRWGgs', 'frameborder'=>'0', 'allowfullscreen'=>'true'}
%iframe.full{'width'=>'100%', 'src'=>'https://www.youtube.com/embed/jDVCITRWGgs', 'frameborder'=>'0', 'allowfullscreen'=>'true'}
=link_to 'Flatpak 1.0', 'https://youtu.be/jDVCITRWGgs'
.row.centered
.col-sm-6.col-sm-offset-3
132 changes: 13 additions & 119 deletions source/stylesheets/fonts.css
Original file line number Diff line number Diff line change
@@ -1,127 +1,21 @@
/* Oblique */
/* --------------------------------------------------------------------------
[EXPERIMENTAL] Multi-axis, single variable font.

/*
@font-face {
font-family: "Overpass";
src: local("Overpass ExtraLight Italic"),
local(Overpass-ExtraLight-Italic),
url(../fonts/Overpass-ExtraLight-Italic.ttf);
font-style: italic;
font-weight: 200;
}
Slant axis is not yet widely supported (as of February 2019) and thus this
multi-axis single variable font is opt-in rather than the default.

@font-face {
font-family: "Overpass";
src: local("Overpass Light Italic"),
local(Overpass-Light-Italic),
url(../fonts/Overpass-Light-Italic.ttf);
font-style: italic;
font-weight: 300;
}
When using this, you will probably need to set font-variation-settings
explicitly, e.g.

* { font-variation-settings: "slnt" 0deg }
.italic { font-variation-settings: "slnt" 10deg }

@font-face {
font-family: "Overpass";
src: local("Overpass Italic"),
local(Overpass-Italic),
local(Overpass-Regular-Italic),
url(../fonts/Overpass-Regular-Italic.ttf);
font-style: italic;
font-weight: 400;
}

@font-face {
font-family: "Overpass";
src: local("Overpass Bold Italic"),
local(Overpass-Bold-Italic),
local(Overpass-Bold-Italic),
url(../fonts/Overpass-Bold-Italic.ttf);
font-style: italic;
font-weight: 700;
}
*/


/* Normal */

/*
@font-face {
font-family: "Overpass";
src: local("Overpass ExtraLight"),
local(Overpass-ExtraLight),
url(../fonts/Overpass-ExtraLight.ttf);
font-style: normal;
font-weight: 200;
}

@font-face {
font-family: "Overpass";
src: local("Overpass Light"),
local(Overpass-Light),
url(../fonts/Overpass-Light.ttf);
font-style: normal;
font-weight: 300;
}


@font-face {
font-family: "Overpass";
src: local("Overpass Regular"),
local(Overpass),
local(Overpass-Regular),
url(../fonts/Overpass-Regular.ttf);
font-style: normal;
font-weight: 400;
}

@font-face {
font-family: "Overpass";
src: local("Overpass Bold"),
local(Overpass-Bold),
local(Overpass-Bold),
url(../fonts/Overpass-Bold.ttf);
font-style: normal;
font-weight: 700;
}
*/

@font-face {
font-family: "Source Sans Pro";
src: local("Source Sans Pro ExtraLight"),
local(SourceSansProExtraLight),
local(SourceSansPro-ExtraLight),
url(../fonts/SourceSansPro-ExtraLight.otf);
font-style: normal;
font-weight: 200;
}

@font-face {
font-family: "Source Sans Pro";
src: local("Source Sans Pro Light"),
local(SourceSansProLight),
local(SourceSansPro-Light),
url(../fonts/SourceSansPro-Light.otf);
font-style: normal;
font-weight: 300;
}

@font-face {
font-family: "Source Sans Pro";
src: local("Source Sans Pro Regular"),
local(SourceSansPro),
local(SourceSansPro-Regular),
url(../fonts/SourceSansPro-Regular.otf);
font-style: normal;
font-weight: 400;
}

@font-face {
font-family: "Source Sans Pro";
src: local("Source Sans Pro SemiBold"),
local(SourceSansProSemiBold),
local(SourceSansPro-SemiBold),
url(../fonts/SourceSansPro-Semibold.otf);
font-style: bold;
font-weight: 600;
font-family: 'Inter';
font-weight: 100 900;
font-display: swap;
font-style: oblique 0deg 10deg;
src: url("../fonts/Inter.var.woff2?v=3.19") format("woff2");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"https://dl.flathub.org/repo/assets/Inter-3.19/inter.css"

@barthalion hosted Inter there for us, so it might be worth using it from the same source. But it might cause CSP problems

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've opted to go variable font, for it is the future. A single request covering all weight needs. Looking into sharing the asset across both sites in future would be nice.

}

Loading