Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6f2bc5b
Grid advances
AntonioMateoGomez Jul 1, 2019
71d2237
Home layout advances
AntonioMateoGomez Jul 2, 2019
2a324da
Base home html elements disposition
AntonioMateoGomez Jul 3, 2019
51fd28f
Fixes docs links
AntonioMateoGomez Jul 3, 2019
1d77f46
Including icons
AntonioMateoGomez Jul 4, 2019
366ba32
WIP animation home layout
AntonioMateoGomez Jul 5, 2019
39ffa8e
Implements home animation
AntonioMateoGomez Jul 8, 2019
b497e67
Add features text
purrgrammer Jul 9, 2019
625bad1
Set sbt-microsites version to 0.9.2. Fixes safari browser issues in a…
AntonioMateoGomez Jul 10, 2019
276089e
Conflict resolution in features file
AntonioMateoGomez Jul 10, 2019
ff8c4db
Minor css modification
AntonioMateoGomez Jul 10, 2019
98f2cb1
review styles
israelperezglez Jul 11, 2019
07d9636
fix sidebar docs
israelperezglez Jul 11, 2019
8c9af57
Modifies sidebar links in doc section
AntonioMateoGomez Jul 11, 2019
f442614
Delete sass-cache
AntonioMateoGomez Jul 11, 2019
763c436
Use Ubuntu Xenial to run Travis jobs
calvellido Jul 11, 2019
f5ecdca
Drop tests support for Oracle JDK envs
calvellido Jul 11, 2019
4310cd4
Remove fexbox mixin
AntonioMateoGomez Sep 6, 2019
bf2eb1f
Merge branch 'paolo-201-implement-redesign' of github.com:47deg/fetch…
AntonioMateoGomez Sep 6, 2019
b470cfa
Include needed params to use external layouts and includes
calvellido Sep 9, 2019
b7373ae
Adds sbt-microsites param to use the right data folder
AntonioMateoGomez Sep 9, 2019
5038959
Remove .html from docs url
AntonioMateoGomez Sep 10, 2019
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ _site/*
docs/src/jekyll/_site/
docs/src/jekyll/*.md
/secring.gpg
.sass-cache
.DS_Store

3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
dist: xenial
language: scala

scala:
- 2.11.12
- 2.12.8

jdk:
- oraclejdk9
- oraclejdk8
- openjdk8

before_install:
Expand Down
7 changes: 7 additions & 0 deletions docs/src/main/resources/microsite/_data/commons.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
repoUrl: "https://github.com/47deg/fetch"
organizationUrl: "https://www.47deg.com"
organization: "47 Degrees"
description: "Simple & Efficient data fetching"
keywords: "functional-programming, kotlin, kotlin-library, scala, scala-js, cats, monads, monix, data, data-fetching, parallelism, concurrency, sequencing, for-comprehension, category-theory"
owner: "47 Degrees"
repo: "fetch"
12 changes: 12 additions & 0 deletions docs/src/main/resources/microsite/_data/features.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
content:
- title: Define
description: Tell Fetch how your data is fetched and define your data-fetching functions using functional combinators.
icon: img/icon-feature-first.svg

- title: Run
description: Fetch can run your data-fetching code and apply multiple optimizations such as baching, caching and deduplication.
icon: img/icon-feature-second.svg

- title: Inspect
description: The execution log of a Fetch can be inspected and it contains information about fetch scheduling, results and timings.
icon: img/icon-feature-third.svg
9 changes: 9 additions & 0 deletions docs/src/main/resources/microsite/_data/menu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
nav:
- title: Documentation
url: /docs

- title: Github
url: https://github.com/47deg/fetch

- title: License
url: https://github.com/47deg/fetch/blob/master/LICENSE
18 changes: 18 additions & 0 deletions docs/src/main/resources/microsite/_includes/_fetch-footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<footer id="site-footer">
<div class="wrapper">
<div class="footer-flex">
<div class="footer-dev">
<p>{{ site.name }} is designed and developed by <a href="{{site.data.commons.organizationUrl}}" target="_blank">{{site.data.commons.organization}}</a></p>
</div>
<ul class="footer-menu">
{% for item in site.data.menu.nav %}
<li class="footer-menu-item">
<a href={% if item.title == "Documentation" %}"{{site.url}}{{site.baseurl}}{{ item.url }}"{% else %}"{{ item.url }}"{% endif %} title="{{ item.title }}">
{{ item.title }}
</a>
</li>
{% endfor %}
</ul>
</div>
</div>
</footer>
33 changes: 33 additions & 0 deletions docs/src/main/resources/microsite/_includes/_fetch-head.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<head>
<title>{{site.name}}</title>

<meta charset="utf-8">
<meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<meta name="description" content="{{site.description}}">
<meta name="keywords" content="{{site.data.commons.keywords}}">

<meta property="og:title" content="{{site.name}}">
<meta property="og:description" content="{{site.description}}">
<meta property="og:image" content="{{organizationUrl}}/img/twitter-card.png">
<meta property="og:url" content="{{organizationUrl}}">
<meta property="og:site_name" content="{{site.name}}">
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:image" content="{{organizationUrl}}/img/twitter-card.png">
<meta name="twitter:image:alt" content="{{site.description}}">
<meta name="twitter:site" content="@47deg">
<meta name="twitter:creator" content="@47deg">
<meta name="twitter:title" content="{{site.name}}">
<meta name="twitter:text:description" content="{{site.description}}" />

<link rel="shortcut icon" type="image/png" href="{{ '/img/favicon.png' | relative_url }}">

<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.2/animate.min.css">
<link href="./css/style.css" rel="stylesheet">
<link href="./css/palette.css" rel="stylesheet">
<link href="./css/custom.css" rel="stylesheet">

<script defer src="{{ '/js/main.js' | relative_url }}"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/bodymovin/5.5.6/lottie.min.js" type="text/javascript"></script>
</head>
11 changes: 11 additions & 0 deletions docs/src/main/resources/microsite/_includes/_fetch-header.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<header id="site-header">
<div class="wrapper">
<div class="header-container">
<div class="header-text">
<h1 class="title" id="content" data-github-owner="{{site.data.commons.owner}}" data-github-repo="{{site.data.commons.repo}}">{{site.data.commons.description}}</h1>
<a href="{{site.url}}{{site.baseurl}}/docs" class="header-button">Learn more</a>
</div>
<div id="fetch-animation"></div>
</div>
</div>
</header>
13 changes: 13 additions & 0 deletions docs/src/main/resources/microsite/_includes/_fetch-main.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<div id="site-main">
<div class="wrapper">
<div class="main-flex">
{% for item in site.data.features.content %}
<div class="main-item">
<img src="{{ item.icon }}" alt="{{ item.title }}">
<h2>{{ item.title }}</h2>
<p>{{ item.description }}</p>
</div>
{% endfor %}
</div>
</div>
</div>
32 changes: 32 additions & 0 deletions docs/src/main/resources/microsite/_includes/_fetch-navigation.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<nav id="navigation">
<div class="wrapper">
<div class="nav-flex">
<a class="nav-brand" title="Fetch" href="{{site.data.commons.repoUrl}}">
<img src="img/navbar_brand.svg" title="{{ site.name }}">
<span>{{site.name}}</span>
</a>
<div class="nav-menu">
<button
class="button nav-icon-close"
title="Close"
onClick="toggleClass('.nav-menu', 'open');">
<img src="img/nav-icon-close.svg" alt="Close">
</button>
<ul>
{% for item in site.data.menu.nav%}
<li class="nav-menu-item">
<a href={% if item.title == "Documentation" %}"{{site.url}}{{site.baseurl}}{{ item.url }}"{% else %}"{{ item.url }}"{% endif %} title="{{ item.title }}">{{ item.title }}</a>
Comment thread
purrgrammer marked this conversation as resolved.
</li>
{% endfor %}
</ul>
</div>

<button
class="button nav-icon-open"
title="Open"
onClick="toggleClass('.nav-menu', 'open');">
<img src="img/nav-icon-open.svg" alt="Open">
</button>
</div>
</div>
</nav>
11 changes: 11 additions & 0 deletions docs/src/main/resources/microsite/_layouts/fetch-home.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!DOCTYPE html>
<html>
{% include _fetch-head.html %}
<body id="fetch-home">
{% include _fetch-navigation.html %}
{% include _fetch-header.html %}
{% include _fetch-main.html %}
{% include _fetch-footer.html %}
</body>

</html>
28 changes: 28 additions & 0 deletions docs/src/main/resources/microsite/_sass/_breakpoint.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Breakpoint
// -----------------------------------------------
// -----------------------------------------------
@mixin bp($point) {
@if $point==xlarge {
@media (max-width: $bp-xlarge) {
@content;
}
}

@if $point==large {
@media (max-width: $bp-large) {
@content;
}
}

@if $point==medium {
@media (max-width: $bp-medium) {
@content;
}
}

@if $point==small {
@media (max-width: $bp-small) {
@content;
}
}
}
53 changes: 53 additions & 0 deletions docs/src/main/resources/microsite/_sass/_components.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
// COMPONENTS
// -----------------------------------------------
// -----------------------------------------------

body {
color: $brand-secondary;
font-family: $font-family-poppins;
}

#fetch-home {
background-image: url('../img/pattern-background.svg');
background-repeat: no-repeat;
}

ol,
ul {
list-style: none;
}

// Buttons

.btn {
padding: 12px 40px;
border-radius: 0;

&:hover {
background: $brand-secondary;
}
}

.wrapper {
padding: 0 ($base-point * 3);
margin: 0 auto;
box-sizing: border-box;
max-width: $container-width;
}

.button {
display: block;
background: none;
border: none;
outline: none;
text-decoration: none;
position: relative;

&:hover {
cursor: pointer;
}

> img {
vertical-align: bottom;
}
}
95 changes: 95 additions & 0 deletions docs/src/main/resources/microsite/_sass/_docs.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
// Docs
// -----------------------------------------------
// -----------------------------------------------
#sidebar-wrapper {
background-color: $white-color;
border-right: 1px solid #CED8DC;

#sidebar {
.sidebar-brand {
.brand {
.brand-wrapper {
span {
margin-top: 0;
letter-spacing: $base-point / 2;
font-size: $base-point * 2;
padding-left: $base-point * 2;
}
}
}
}
}
}

.sidebar-nav {
background-color: $white-color;
> li {
> a {
color: $brand-secondary;
&.active {
background: $brand-tertiary;
border-left: 3px solid $brand-primary;
color: $brand-secondary;
}
&:hover {
background: $brand-tertiary;
color: $brand-secondary;
}
> span {
display: none;
}
}
ul {
li {
font-size: 14px;
a {
background: $brand-tertiary;
color: darken($brand-tertiary, 50%);
line-height: normal;
padding-bottom: $base-point * 2;
padding-top: $base-point * 2;
&:hover,
&:active {
color: $brand-secondary;
}
}
}
}
}
> .sidebar-brand {
a {
background-color: $white-color;
border-bottom: 1px solid $line-color;
color: $brand-secondary;
text-transform: uppercase;

&:hover {
background: $brand-tertiary;
color: $brand-secondary;
}
}
}
}

.container-fluid {;
padding-bottom: 1px;
border-bottom: 1px solid $line-color;
}

#page-content-wrapper {
background: $white-color;

.nav {
max-height: $docs-brand-height;
}

section{
margin: 0;
}

pre .hljs {
background-color: $brand-tertiary;
}


}
Loading