Skip to content
Merged
Show file tree
Hide file tree
Changes from 13 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
18 changes: 9 additions & 9 deletions modules/docs/arrow-docs/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.5.2)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
colorator (1.1.0)
concurrent-ruby (1.1.3)
concurrent-ruby (1.1.5)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
ffi (1.9.25)
ffi (1.10.0)
forwardable-extended (2.6.0)
http_parser.rb (0.6.0)
i18n (0.9.5)
Expand All @@ -34,7 +34,7 @@ GEM
jekyll-watch (2.1.2)
listen (~> 3.0)
kramdown (1.17.0)
liquid (4.0.1)
liquid (4.0.3)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
Expand All @@ -44,12 +44,12 @@ GEM
forwardable-extended (~> 2.6)
public_suffix (3.0.3)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rb-inotify (0.10.0)
ffi (~> 1.0)
rouge (3.3.0)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
sass (3.7.2)
safe_yaml (1.0.5)
sass (3.7.3)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand All @@ -63,4 +63,4 @@ DEPENDENCIES
jekyll-redirect-from

BUNDLED WITH
1.15.3
2.0.1
2 changes: 2 additions & 0 deletions modules/docs/arrow-docs/docs/_data/commons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ description: "Functional companion to Kotlin's Standard Library"
keywords: "functional-programming, kotlin-library, monads, monad-transformers, functional-data-structure, kotlin, fp-types, adt, free-monads, tagless-final, mtl, for-comprehension, category-theory"
google_analytics: "UA-18433785-18"
github_repository: "https://github.com/arrow-kt/arrow"
stable_version: "https://arrow-kt.io/"
next_version: "https://next.arrow-kt.io/"
23 changes: 23 additions & 0 deletions modules/docs/arrow-docs/docs/_data/doc-versions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
docVersions:

- title: "v0.8.2"
url: https://0-8-2.arrow-kt.io/
previous: https://0-8-0.arrow-kt.io/

- title: "v0.9.0"
url: https://arrow-kt.io/
previous: https://0-8-2.arrow-kt.io/

- title: "v0.9.1"
url: https://next.arrow-kt.io/
previous: https://arrow-kt.io/

docMenu:
title: Documentation
url: /docs
icon: "fa-book"

# Literals
previous: PREVIOUS
stable: STABLE
next: NEXT
4 changes: 0 additions & 4 deletions modules/docs/arrow-docs/docs/_data/menu.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
nav:
- title: Documentation
url: /docs
icon: "fa-book"

- title: Blog
url: /blog
icon: "fa-rss"
Expand Down
5 changes: 4 additions & 1 deletion modules/docs/arrow-docs/docs/_includes/_head.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,14 @@
<!-- Arrow main css -->
<link rel="stylesheet" type="text/css" href="{{ '/css/arrow.css' | relative_url }}">

<!-- Code to manage version information -->
<script src="{{ '/js/docVersions.js' | relative_url }}" defer></script>

<!-- Diagrams support -->
<script src="{{ '/js/dagre.min.js' | relative_url }}"></script>
<script src="{{ '/js/lodash.min.js' | relative_url }}"></script>
<script src="{{ '/js/nomnoml.js' | relative_url }}"></script>
<script src="{{ '/js/diagrams.js' | relative_url }}"></script>
<script src="{{ '/js/diagrams.js' | relative_url }}" async></script>

{% if jekyll.environment == 'production' and site.data.commons.google_analytics %}
{% include _google-tag-manager.html %}
Expand Down
2 changes: 1 addition & 1 deletion modules/docs/arrow-docs/docs/_includes/_header.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="masthead-inner">
<img class="masthead-brand" src="img/arrow-brand.svg" alt="">
<h1 class="masthead-title">Functional companion to Kotlin's Standard Library</h1>
<a class="masthead-button button" href="./docs/">Learn More</a>
{% include _home-doc-versions.html %}
<div class="masthead-stars">
<a href="https://github.com/arrow-kt/arrow/stargazers">
<i class="fa fa-star"></i>
Expand Down
33 changes: 33 additions & 0 deletions modules/docs/arrow-docs/docs/_includes/_home-doc-versions.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<div class="masthead-doc-version">
<ul>
<li>
<a class="masthead-button secondary-button button"
href="{{ previous_version.url | append: 'docs/' }}">
<span>{{ previous_version.title }}</span>
<span class="secondary-doc-version-text">
{{ site.data.doc-versions.previous }}
</span>
</a>
</li>

<li>
<a class="masthead-button button"
href="{{ stable_version.url | append: 'docs/' }}">
<span>{{ stable_version.title }}</span>
<span class="secondary-doc-version-text">
{{ site.data.doc-versions.stable }}
</span>
</a>
</li>

<li>
<a class="masthead-button secondary-button button"
href="{{ next_version.url | append: 'docs/' }}">
<span>{{ next_version.title }}</span>
<span class="secondary-doc-version-text">
{{ site.data.doc-versions.next }}
</span>
</a>
</li>
</ul>
</div>
1 change: 1 addition & 0 deletions modules/docs/arrow-docs/docs/_includes/_nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<a href="/">Λrrow</a>
</div>
<ul class="navigation-menu">
{% include _navigation-doc-versions.html %}
{% for item in site.data.menu.nav %}
<li class="navigation-menu-item {% if item.url == category.url %}active {% endif %}">
<a href="{{ item.url }}" title="{{ item.title }}" alt="{{ item.title }}">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<li id="version-dropdown" class="navigation-menu-item
{% if site.data.doc-versions.docMenu.url == category.url %}active {% endif %}">

<a href="#" onclick="displayToggle(event)" title="{{ site.data.doc-versions.docMenu.title }}" alt="{{ item.title }}">
{% if site.data.doc-versions.docMenu.icon != "" %}
<i class="nav-item-icon fa fa-lg {{ site.data.doc-versions.docMenu.icon }}" aria-hidden="true"></i>
<span class="nav-item-text">{{ site.data.doc-versions.docMenu.title }}</span>
{% else %}
<span>{{ site.data.doc-versions.docMenu.title }}</span>
{% endif %}
</a>

<div class="dropdown dropdown-content">

<a href="{{ site.data.commons.stable_version | append: 'docs/' }}">
<span>
{{ stable_version.title }} -
{{ site.data.doc-versions.stable }}
</span>
</a>
<a href="{{ next_version.url | append: 'docs/' }}">
<span>
{{ next_version.title }} -
{{ site.data.doc-versions.next }}
</span>
</a>
<a href="{{ previous_version.url | append: 'docs/' }}">
<span>
{{ previous_version.title }} -
{{ site.data.doc-versions.previous }}
</span>
</a>

{% for item in site.data.doc-versions.docVersions %}
{% if item.url != stable_version.url
and item.url != next_version.url
and item.url != previous_version.url %}
<a href="{{ item.url | append: 'docs/' }}">
<span>{{ item.title }}</span>
</a>
{% endif %}
{% endfor %}
</div>
</li>
46 changes: 46 additions & 0 deletions modules/docs/arrow-docs/docs/_includes/_sidebar-doc-versions.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<ul class="sidebar-nav sidebar-doc-versions">
<li class="sidebar-nav-item">
<a href="#">
<span>Arrow version</span>
<span id="arrow-version"></span>
</a>
<ul>
<li>
<a href="{{ site.data.commons.stable_version | append: 'docs/' }}">
<span>
{{ stable_version.title }} - {{ site.data.doc-versions.stable }}
</span>
</a>
</li>

<li>
<a href="{{ next_version.url | append: 'docs/' }}">
<span>
{{ next_version.title }} - {{ site.data.doc-versions.next }}
</span>
</a>
</li>

<li>
<a href="{{ previous_version.url | append: 'docs/' }}">
<span>
{{ previous_version.title }} -
{{ site.data.doc-versions.previous }}
</span>
</a>
</li>

{% for item in site.data.doc-versions.docVersions %}
{% if item.url != stable_version.url
and item.url != next_version.url
and item.url != previous_version.url %}
<li>
<a href="{{ item.url | append: 'docs/' }}">
<span>{{ item.title }}</span>
</a>
</li>
{% endif %}
{% endfor %}
</ul>
</li>
</ul>
2 changes: 2 additions & 0 deletions modules/docs/arrow-docs/docs/_includes/_sidebar-wrapper.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
</button>
</div>

{% include _sidebar-doc-versions.html %}

<ul class="sidebar-nav">
{% for item in site.data.sidebar.options %}
<li class="sidebar-nav-item">
Expand Down
37 changes: 37 additions & 0 deletions modules/docs/arrow-docs/docs/_includes/_top-version-warning.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{% for item in site.data.doc-versions.docVersions %}
{% if item.url == site.data.commons.stable_version %}
{% assign stable_version = item %}
{% endif %}
{% if item.url == site.data.commons.next_version %}
{% assign next_version = item %}
{% endif %}
{% endfor %}

{% for item in site.data.doc-versions.docVersions %}
{% if item.url == stable_version.previous %}
{% assign previous_version = item %}
{% endif %}
{% endfor %}

<div id="topWarning" class="top-warning">
<div class="top-container">
<a href="{{ previous_version.url | append: 'docs/' }}">
<span id="top-previous" data-title="{{ previous_version.title }}" data-url="{{ previous_version.url }}">
{{ site.data.doc-versions.previous }} {{ previous_version.title }}
</span>
</a>
<a href="{{ stable_version.url | append: 'docs/' }}" class="middle-tab">
<span id="top-stable" data-title="{{ stable_version.title }}" data-url="{{ stable_version.url }}">
{{ site.data.doc-versions.stable }} {{ stable_version.title }}
</span>
</a>
<a href="{{ next_version.url | append: 'docs/' }}">
<span id="top-next" data-title="{{ next_version.title }}" data-url="{{ next_version.url }}">
{{ site.data.doc-versions.next }} {{ next_version.title }}
</span>
</a>
</div>
<div onclick="closeTop()" class="close">
<img src="/img/close.svg" alt="close" />
</div>
</div>
1 change: 1 addition & 0 deletions modules/docs/arrow-docs/docs/_layouts/docs.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<html>
{% include _head.html %}
<body id="doc-body">
{% include _top-version-warning.html %}
<div id="wrapper">
{% include _sidebar-wrapper.html %}
{% include _doc-wrapper.html %}
Expand Down
1 change: 1 addition & 0 deletions modules/docs/arrow-docs/docs/_layouts/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
{% include _head.html %}
<body>
<div class="navigation-fade-screen"></div>
{% include _top-version-warning.html %}
{% include _nav.html %}
{% include _header.html %}
{% include _main.html %}
Expand Down
7 changes: 6 additions & 1 deletion modules/docs/arrow-docs/docs/_sass/base/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ html {

body,
html {
height: 100%;
height: auto;
}
// Typography
// -----------------------------------------------
Expand Down Expand Up @@ -163,3 +163,8 @@ table {
[class*="indirect-injection"] {
opacity: 0;
}

// Gitter action bar fix
.gitter-chat-embed-action-bar {
z-index: 11;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
// -----------------------------------------------
// -----------------------------------------------
#doc-body {
background: rgba($brand-tertiary, 0.10);
background: $brand-tertiary;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// -----------------------------------------------
.features {
padding: ($base-point-grid * 12) 0 ($base-point-grid * 8);
background: rgba($brand-tertiary, 0.10);
background: #ecf1fd;

.feature-item {
margin-bottom: ($base-point-grid * 6);
Expand Down
Loading