Skip to content

Commit

Permalink
First stab at updating the website with the new logo
Browse files Browse the repository at this point in the history
  • Loading branch information
mitchelkuijpers committed Oct 24, 2017
1 parent 94c8f1a commit 2a5c107
Show file tree
Hide file tree
Showing 18 changed files with 400 additions and 95 deletions.
2 changes: 0 additions & 2 deletions docs/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ source "https://rubygems.org"
# This will help ensure the proper Jekyll version is running.
# Happy Jekylling!

gem "jekyll-theme-merlot"

# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
# uncomment the line below. To upgrade, run `bundle update github-pages`.
# gem "github-pages", group: :jekyll_plugins
Expand Down
1 change: 0 additions & 1 deletion docs/_config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
name: Fulcro
theme: jekyll-theme-merlot
markdown: kramdown
22 changes: 22 additions & 0 deletions docs/_includes/footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<footer class="flex-none">
<div class="content-container pt3 center">
<img class="mb2" src="/assets/img/logo.svg" width="80" />
{% if site.github.is_project_page %}
<p class="grey">this project by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a> can be found on <a href="{{ site.github.repository_url }}">GitHub</a></p>
{% endif %}
{% if site.github.is_user_page %}
<p class="grey">Projects by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a> can be found on <a href="{{ site.github.repository_url }}">GitHub</a></p>
{% endif %}
</div>
</footer>

{% if site.google_analytics %}
<script type="text/javascript">
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', '{{ site.google_analytics }}', 'auto');
ga('send', 'pageview');
</script>
{% endif %}
9 changes: 9 additions & 0 deletions docs/_includes/header.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<div class="py2 menu flex-none">
<div class="content-container items-baseline sm-flex">
<a href="index.html"><img src="/assets/img/fulcro-letters.svg" height="20" width="108" alt="fulcro logo"/></a>
<a href="docs.html" class="ml-auto px2">Getting started</a>
<a href="status.html" class="px2">Status</a>
<a href="help.html" class="px2">Help</a>
<a href="fund.html" class="pl2">Support Fulcro</a>
</div>
</div>
103 changes: 11 additions & 92 deletions docs/_layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,110 +2,29 @@
<html lang="{{ site.lang | default: "en-US" }}">
<head>
<meta charset='utf-8'>
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<meta name="viewport" content="width=640">

<!-- CDN stuff -->
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/basscss/8.0.3/css/basscss.min.css">
<link href="https://fonts.googleapis.com/css?family=Cambay" rel="stylesheet">

<!-- Theme -->
<link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}" media="screen">
<link rel="stylesheet" href="{{ '/assets/css/mobile.css' | relative_url }}" media="handheld, only screen and (max-device-width:640px)">
<link rel="stylesheet" href="{{ '/assets/css/non-screen.css' | relative_url }}" media="handheld, only screen and (max-device-width:640px)">

<script type="text/javascript" src="{{ '/assets/js/modernizr.js' | relative_url }}"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script type="text/javascript" src="{{ '/assets/js/headsmart.min.js' | relative_url }}"></script>
<script type="text/javascript">
$(document).ready(function () {
$('#main_content').headsmart()
})
</script>
<title>{{ site.title | default: site.github.repository_name }} by {{ site.github.owner_name }}</title>
<style>
.sponsor-img {
border: 0px;
box-shadow: none;
margin-left: 10pt;
margin-right: 10pt;
}
.toplink {
color: white;
margin-left: 20pt;
}
</style>
</head>

<body>
<a id="forkme_banner" href="{{ site.github.repository_url }}">View on GitHub</a>
<div class="shell">

<header>
<span class="ribbon-outer">
<span class="ribbon-inner">
<h1>
Fulcro
</h1>
<h2>{{ site.description | default: site.github.project_tagline }}</h2>
<div style="text-align: center;">
<a class="toplink" href="index.html">Home</a>
<a class="toplink" href="docs.html">Getting Started</a>
<a class="toplink" href="status.html">Status</a>
<a class="toplink" href="help.html">Help</a>
<a class="toplink" href="fund.html">Support Fulcro</a>
</div>
</span>
<span class="left-tail"> </span>
<span class="right-tail"></span>
</span>
</header>

{% if site.show_downloads %}
<section id="downloads">
<span class="inner">
<a href="{{ site.github.zip_url }}" class="zip"><em>download</em> .ZIP</a><a href="{{ site.github.tar_url }}" class="tgz"><em>download</em> .TGZ</a>
</span>
</section>
{% else %}
<div id="no-downloads">
<span class="inner">
</span>
</div>
{% endif %}

<div class="page-container flex flex-column">

<span class="banner-fix">
</span>
{% include header.html %}

<section class="content-container flex-auto md-content">
{{ content }}
</section>

<section id="main_content">
{{ content }}
</section>

<footer>
<span class="ribbon-outer">
<span class="ribbon-inner">
{% if site.github.is_project_page %}
<p>this project by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a> can be found on <a href="{{ site.github.repository_url }}">GitHub</a></p>
{% endif %}
{% if site.github.is_user_page %}
<p>Projects by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a> can be found on <a href="{{ site.github.repository_url }}">GitHub</a></p>
{% endif %}
</span>
<span class="left-tail"></span>
<span class="right-tail"></span>
</span>
<p>Generated with <a href="https://pages.github.com">GitHub Pages</a> using Merlot</p>
<span class="octocat"></span>
</footer>
{% include footer.html %}

</div>

{% if site.google_analytics %}
<script type="text/javascript">
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', '{{ site.google_analytics }}', 'auto');
ga('send', 'pageview');
</script>
{% endif %}
</body>
</html>
25 changes: 25 additions & 0 deletions docs/_layouts/home.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<!DOCTYPE html>
<html lang="{{ site.lang | default: "en-US" }}">
<head>
<meta charset='utf-8'>

<!-- CDN stuff -->
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/basscss/8.0.3/css/basscss.min.css">
<link href="https://fonts.googleapis.com/css?family=Cambay" rel="stylesheet">

<!-- Theme -->
<link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}" media="screen">

<title>{{ site.title | default: site.github.repository_name }} by {{ site.github.owner_name }}</title>
</head>

<body>

{% include header.html %}

{{ content }}

{% include footer.html %}

</body>
</html>
106 changes: 106 additions & 0 deletions docs/assets/css/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
---
---

$blue: #5577BB;
$green: #66BB33;

body {
font-family: 'Cambay', sans-serif;
margin: 0;
}

.page-container {
min-height: 100vh;
}

.green {
color: $green;
}

.blue {
color: $blue;
}

.grey {
color: #AAAAAA;
}

.menu {
background: #F9F9F9;
}

.content-container {
max-width: 960px;
margin: 0 auto;
}

.md-container {
h1,h2,h3,h4,h5 {color: $green;}
}

a {
color: $blue;
text-decoration: none;

&:hover {
text-decoration: underline;
}

}

.hero {
border-bottom: 5px solid #5577BB;
background: url('/assets/img/bg.png') no-repeat center top;
background-size: cover;
}

.hero h1 {
color: #66BB33;
text-transform: uppercase;
}

nav ul {
list-style: none;
}

nav ul li {
display: inline-block;
}

.btn-primary {
background: #5577BB;
color: #FFF;
}

.btn-secondary {
background: #66BB33;
color: #FFF;
}

.bg-grey {
background-color: #F9F9F9;
}

section {
overflow: hidden;
}

.section-border-green {
border-bottom: 5px solid #66BB33;
}

footer {
background: #F9F9F9;
min-height: 200px;
border-bottom: 4px solid #5577BB;
}

footer ul {
list-style-type: none;
}

.md-content {
h1, h2, h3, h4, h5 {
color: $green;
}
}
Binary file added docs/assets/img/adstage.png
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 docs/assets/img/atlascrm.png
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 docs/assets/img/bg.png
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 docs/assets/img/dave.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions docs/assets/img/fulcro-letters.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions docs/assets/img/icon-arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions docs/assets/img/icon-complexity.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 2a5c107

Please sign in to comment.