Skip to content

Commit

Permalink
New Bridgetown logo and docs tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
jaredcwhite committed Apr 7, 2020
1 parent c7f741f commit f756852
Show file tree
Hide file tree
Showing 32 changed files with 363 additions and 53 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,4 @@ print_hi('Tom')
#=> prints 'Hi, Tom' to STDOUT.
````

Check out the [Bridgetown docs][bridgetown-docs] for more info on how to get the most out of Bridgetown. File all bugs/feature requests at [Bridgetown’s GitHub repo][bridgetown-gh]. If you have questions, you can ask them on [Bridgetown Talk][bridgetown-talk].

[bridgetown-docs]: https://bridgetownrb.com/docs/
[bridgetown-gh]: https://github.com/bridgetownrb/bridgetown
[bridgetown-talk]: https://talk.bridgerb.com/
Check out the [Bridgetown docs](https://bridgetownrb.com/docs/) for more info on how to get the most out of Bridgetown. File all bugs/feature requests at [Bridgetown’s GitHub repo](https://github.com/bridgetownrb/bridgetown). If you have questions, you can ask them on [Bridgetown Community Forum](https://community.bridgetownrb.com).
11 changes: 6 additions & 5 deletions bridgetown-website/frontend/styles/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,12 @@ $link: $primary;

$pagination-background-color: $grey-lighter;

$navbar-background-color: $grey-dark;
$navbar-item-color: $grey-light;
$navbar-item-hover-color: $white-ter;
$navbar-item-active-color: $white-ter;
$navbar-item-hover-background-color: $grey-darker;
$navbar-background-color: $primary;
$navbar-item-color: $white-ter;
$navbar-item-hover-color: white;
$navbar-item-active-color: white;
$navbar-item-active-background-color: darken($primary, 5%);
$navbar-item-hover-background-color: $navbar-item-active-background-color;
$navbar-dropdown-arrow: $navbar-item-color;

$card-shadow: 0 2px 3px rgba($grey-dark, 0.1), 0 0 0 1px rgba($grey-dark, 0.1);
Expand Down
66 changes: 59 additions & 7 deletions bridgetown-website/frontend/styles/layout.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,31 @@
.container {
@include mobile {
/* This fixes a horizontal overscroll bug in iOS Safari */
overflow: hidden;
}
}

.navbar {
.bridgetown-logo {
width: 76px;
margin-right: 10px;
opacity: 0.8;

svg {
-webkit-filter: drop-shadow( 2px 3px 3px rgba(0,0,0,0.3));
filter: drop-shadow( 2px 3px 3px rgba(0,0,0,0.3));
}

svg path {
fill: white;
}
}

.navbar-brand .navbar-item:hover {
background: $navbar-item-hover-background-color;
.bridgetown-logo { opacity: 1; }
}

.navbar-item .title {
color: white;
text-shadow: 2px 3px 3px rgba(0,0,0,0.3);
Expand All @@ -9,12 +36,6 @@
font-size: 0.875rem;
font-weight: 700;
text-transform: uppercase;

color: rgba($white, 0.7) !important;

&.is-active {
color: white !important;
}
}

@include desktop {
Expand All @@ -29,7 +50,10 @@
}
}

&:not([class*='is-']) .navbar-burger span {
.navbar-burger span {
background-color: $white-ter;
}
.navbar-burger:hover span {
background-color: $white-ter;
}

Expand Down Expand Up @@ -79,4 +103,32 @@ body > footer {
.content .highlight {
margin-top: 1em;
margin-bottom: 1em;
}

.box div.bridgetown-logo {
max-width: 600px;
margin: 1rem auto;

svg {
-webkit-filter: drop-shadow( 2px 4px 4px transparentize($brown, 0.7));
filter: drop-shadow( 2px 4px 4px transparentize($brown, 0.7));
}

svg path {
fill: $primary;
}
}

.footer .bridgetown-logo {
width: 315px;
opacity: 0.8;

svg {
-webkit-filter: drop-shadow( 2px 3px 3px rgba(0,0,0,0.3));
filter: drop-shadow( 2px 3px 3px rgba(0,0,0,0.3));
}

svg path {
fill: white;
}
}
2 changes: 1 addition & 1 deletion bridgetown-website/src/_docs/collections.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Collections
order: 12
order: 13
top_section: Content
category: collections
---
Expand Down
2 changes: 1 addition & 1 deletion bridgetown-website/src/_docs/command_line_usage.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
order: 3
order: 4
title: Command Line Usage
top_section: Setup
category: cmd_usage
Expand Down
39 changes: 39 additions & 0 deletions bridgetown-website/src/_docs/community.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
---
order: 2
title: Community
top_section: Introduction
category: community
---

## Where to get support

If you're looking for support for Bridgetown, there are a lot of options:

* Read the [Bridgetown Documentation]({{ '/docs/' | relative_url }})
* Start a discussion on the [Bridgetown Community Forum](https://community.bridgerb.com/).
* Chat with Bridgetowners on our [Gitter channel](https://gitter.im/{{ site.github_handle }}).

There are a bunch of helpful core team and community members available that should be able to point you in the right direction.

## Bridgetown on Twitter

The [official Twitter account](https://twitter.com/{{ site.twitter_handle }}).

## Ways to contribute

Whether you're a developer, designer, or overall Bridgetown enthusiast, there are lots of ways to contribute. Here's a few ideas:

* Comment on some of the project's [open issues](https://github.com/{{ site.github_handle }}/issues). Have you experienced the same problem? Know a work around? Do you have a suggestion for how the feature could be better?
* Read through the [documentation](/docs/) and file a pull request (PR) by forking the [Bridgetown repo on GitHub](https://github.com/{{ site.github_handle }}) and adding your changes or suggestions for something that could be improved.
* Browse through the [Bridgetown community forum](https://community.bridgetownrb.com/), and lend a hand answering questions. There's a good chance you've already experienced what another user is experiencing.
* Find an [open issue](https://github.com/{{ site.github_handle }}/issues) (especially [those labeled `help-wanted`](https://github.com/{{ site.github_handle }}/issues?q=is%3Aopen+is%3Aissue+label%3Ahelp-wanted)), and submit a proposed fix. If it's your first pull request, we promise we won't bite, and are glad to answer any questions.
* Help evaluate [open pull requests](https://github.com/{{ site.github_handle }}/pulls), by testing the changes locally and reviewing what's proposed.

{:.note}
Reminder: Bridgetown's issue tracker is not a support forum.

## Bridgetown Contributor Code of Conduct

As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.

Read the full [code of conduct](https://github.com/bridgetownrb/bridgetown/blob/master/CODE_OF_CONDUCT.md)
2 changes: 1 addition & 1 deletion bridgetown-website/src/_docs/configuration.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
order: 4
order: 5
title: Customize Your Build
top_section: Configuration
category: configuration
Expand Down
2 changes: 1 addition & 1 deletion bridgetown-website/src/_docs/datafiles.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Data Files
order: 13
order: 14
top_section: Content
category: datafiles
---
Expand Down
2 changes: 1 addition & 1 deletion bridgetown-website/src/_docs/front-matter.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Front Matter
order: 11
order: 12
top_section: Content
category: front-matter
---
Expand Down
2 changes: 1 addition & 1 deletion bridgetown-website/src/_docs/frontend-assets.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Frontend Assets (Webpack)
order: 15
order: 16
top_section: Content
category: frontendassets
---
Expand Down
2 changes: 1 addition & 1 deletion bridgetown-website/src/_docs/includes.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Includes
order: 7
order: 8
top_category: Structure
category: includes
---
Expand Down
3 changes: 2 additions & 1 deletion bridgetown-website/src/_docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ $ bridgetown new myblog
```
$ cd myblog
```
6. Install frontend dependencies.
6. Install Bridgetown builder and frontend dependencies.
```
$ bundle install
$ yarn install
```
7. Build the site and make it available on a local server.
Expand Down
2 changes: 1 addition & 1 deletion bridgetown-website/src/_docs/installation.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
order: 2
order: 3
title: Installation Guides
description: Official guides to install Bridgetown on macOS, GNU/Linux or Windows.
top_section: Setup
Expand Down
7 changes: 6 additions & 1 deletion bridgetown-website/src/_docs/installation/macos.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ ruby -v

That's it! Head over [rbenv command references](https://github.com/rbenv/rbenv#command-reference) to learn how to use different versions of Ruby in your projects.

## Install Node & Yarn

{:.note.warning}
Documentation coming soon…

## Install Bridgetown

Now all that is left is installing Bundler and Bridgetown.
Expand Down Expand Up @@ -115,4 +120,4 @@ Every time you update Ruby to a version with a different first two digits, you w

## Problems?

Check out the [troubleshooting]({{ '/docs/troubleshooting/' | relative_url }}) page or [ask for help on our forum](https://talk.bridgetownrb.com).
Check out the [troubleshooting]({{ '/docs/troubleshooting/' | relative_url }}) page or [ask for help on our forum](https://community.bridgetownrb.com).
2 changes: 1 addition & 1 deletion bridgetown-website/src/_docs/layouts.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Layouts
order: 8
order: 9
top_category: Structure
category: layouts
---
Expand Down
2 changes: 1 addition & 1 deletion bridgetown-website/src/_docs/liquid.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Liquid
order: 16
order: 17
top_section: Templates
category: liquid
---
Expand Down
2 changes: 1 addition & 1 deletion bridgetown-website/src/_docs/liquid/tags.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: Liquid Filters
title: Liquid Tags
hide_in_toc: true
order: 0
category: liquid
Expand Down
2 changes: 1 addition & 1 deletion bridgetown-website/src/_docs/pages.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Pages
order: 9
order: 10
top_section: Content
category: pages
---
Expand Down
10 changes: 10 additions & 0 deletions bridgetown-website/src/_docs/plugins/tags.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,13 @@ And we would still get the same output as above on the page:
{: .note .info}
In the above example, the tag block and the tag are both registered with
the name <code>render_time</code>, but you'll want to avoid registering a tag and a tag block using the same name in the same project as this will lead to conflicts.

<div class="note">
<h5>Top Tip: Access the site object using Liquid</h5>
<p>
Bridgetown lets you access the <code>site</code> object through the
<code>context.registers</code> feature of Liquid at <code>context.registers[:site]</code>. For example, you can
access the global configuration file <code>_config.yml</code> using
<code>context.registers[:site].config</code>.
</p>
</div>
2 changes: 1 addition & 1 deletion bridgetown-website/src/_docs/posts.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Posts
order: 10
order: 11
top_section: Content
category: posts
---
Expand Down
2 changes: 1 addition & 1 deletion bridgetown-website/src/_docs/static_files.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Static Files
order: 14
order: 15
top_section: Content
category: staticfiles
---
Expand Down
2 changes: 1 addition & 1 deletion bridgetown-website/src/_docs/structure.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Folder Structure
order: 6
order: 7
top_section: Structure
category: structure
---
Expand Down
2 changes: 1 addition & 1 deletion bridgetown-website/src/_docs/variables.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Variables
order: 17
order: 18
top_section: Templates
category: variables
---
Expand Down
2 changes: 2 additions & 0 deletions bridgetown-website/src/_includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<div class="container">
<div class="columns">
<div class="column is-4">
<div class="bridgetown-logo">{% insert_svg Bridgetown-Logo.svg %}</div>

<h4 class="bd-footer-title">
<strong>Bridgetown</strong> is a static site generator.
</h4>
Expand Down
28 changes: 16 additions & 12 deletions bridgetown-website/src/_includes/navbar.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{%- assign about_active = "" -%}
{%- assign home_active = "" -%}
{%- assign docs_active = "" -%}

{%- if page.url == "/about/" -%}
{%- assign about_active = "is-active" -%}
{%- elsif page.url == "/" -%}
{%- assign home_active = "is-active" -%}
{%- elsif page.url contains "/docs/" -%}
{%- assign docs_active = "is-active" -%}
{%- endif -%}
<nav class="main-nav navbar is-primary">
<nav class="main-nav navbar is-pprimary">
<div class="container">
<div class="navbar-brand">
<a class="navbar-item" href="/">
<a class="navbar-item {{ home_active }}" href="/">
<span class="bridgetown-logo">{% insert_svg Bridgetown-Logo-Squished.svg %}</span>
<h1 class="title is-5">Bridgetown</h1>
</a>

Expand All @@ -22,21 +23,24 @@ <h1 class="title is-5">Bridgetown</h1>

<div id="topNavbar" class="navbar-menu">
<div class="navbar-start">
<a class="navbar-item {{ home_active }}" href="/">Home</a>
<a class="navbar-item {{ docs_active }}" href="/docs">Documentation</a>
<a class="navbar-item {{ about_active }}" href="/about">About</a>
<a class="navbar-item {{ about_active }}" href="/about">Roadmap</a>
<a class="navbar-item {{ news_active }}" href="/blog">News</a>
</div>

<div class="navbar-end">
<!-- <a href="https://github.com/{{ site.github_handle }}/stargazers" class="navbar-item">
<a class="navbar-item" href="https://github.com/{{ site.github_handle }}" target="_blank">
<button class="button is-info is-small">
<span class="icon"> <i class="fa fa-github"></i> </span>
<span>Star</span>
</button>
</a>
<!--<a href="https://github.com/{{ site.github_handle }}" class="navbar-item">
<img src="https://img.shields.io/github/stars/{{ site.github_handle }}.svg" alt="GitHub stars">
</a> -->
</a>-->
<a class="navbar-item" href="https://github.com/{{ site.github_handle }}/issues">
<i class="fa fa-bug"></i>&nbsp;Report an issue
</a>
<a class="navbar-item" href="https://github.com/{{ site.github_handle }}" target="_blank">
<span class="icon"> <i class="fa fa-github"></i> </span>
</a>
<a class="navbar-item" href="https://twitter.com/{{ site.twitter_handle }}">
<span class="icon"> <i class="fa fa-twitter"></i> </span>
</a>
Expand Down
Loading

0 comments on commit f756852

Please sign in to comment.