Skip to content

Commit

Permalink
Remove Bourbon SASS framework (#720)
Browse files Browse the repository at this point in the history
* Remove protocol and host name so you don't end up on the live site while clicking around to test your dev site.

* Fix typos and formatting problems

* Removed Bourbon SASS framework

We were using very little of the Bourbon framework. Removed it and then removed or replaced the few mixins we were using with their Bootstrap equivalents.

When we add in Bootstrap, we will probably want to remove _sass/core/_mixins.scss and _sass/variables/_utilities.scss
  • Loading branch information
cnk authored Sep 11, 2020
1 parent 3f563a3 commit 9f70aa6
Show file tree
Hide file tree
Showing 62 changed files with 73 additions and 2,180 deletions.
Binary file not shown.
5 changes: 3 additions & 2 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ <h2 class="social-header">Follow us&mdash;<a href="/donate/" target="_blank" ><b
{% for item in site.data.navigation.social %} {% if item.footer %}
<li>
<a href="{{ item.link }}" rel="noopener" target="_blank" class="js-social-link js-social-link-{{ item.name | downcase }}">
{% if item.icon %} {%- include {{ site.baseurl
}}{{ item.icon }} -%} {% endif %}
{% if item.icon %}
{%- include {{ site.baseurl }}{{ item.icon }} -%}
{% endif %}
<span class="sr-only">{{ item.name }}</span>
</a>
</li>
Expand Down
2 changes: 1 addition & 1 deletion _includes/hack-nights.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h3>{{ item.title }}</h3>
</p>
<p>
<a href="https://www.meetup.com/hackforla/events" rel="noopener" target="_blank" class="btn btn-primary">Our Meetup Events</a>
<a href="https://www.hackforla.org/slack" rel="noopener" target="_blank" class="btn btn-primary">Join our Slack</a>
<a href="/slack" rel="noopener" target="_blank" class="btn btn-primary">Join our Slack</a>
</p>
</div>
</section>
4 changes: 2 additions & 2 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<meta property="og:url" content="{{ page.url | absolute_url }}" />
<meta property="og:type" content="website" />
<meta property="og:title" content="{% if page.title %}{{ page.title | escape }} by {% endif %}{{ site.title | escape}}" />
<meta property="og:description" content="{% if page.description %}{{ page.description | strip_html strip_newlines | truncate: 400 }}{% else %}{{ site.description }}{% endif %}" />
<meta property="og:description" content="{% if page.description %}{{ page.description | strip_html | strip_newlines | truncate: 400 }}{% else %}{{ site.description }}{% endif %}" />
<meta property="og:image" content="{% if page.image %}{{ page.image | absolute_url }}{% else%}{{'/assets/images/logos/hfla_fb_logo.png' | absolute_url }}{% endif %}" />

<title>{% if page.title %}{{ page.title | escape }} - {% endif %}{{ site.title | escape}}</title>
<meta name="description"
content="{% if page.description %}{{ page.description | strip_html strip_newlines | truncate: 400 }}{% else %}{{ site.description }}{% endif %}" />
content="{% if page.description %}{{ page.description | strip_html | strip_newlines | truncate: 400 }}{% else %}{{ site.description }}{% endif %}" />
<link rel="stylesheet" href="{{ '/assets/css/main.css' | absolute_url }}" />
<link rel="canonical" href="{{ page.url | absolute_url }}" />
<link rel="shortcut icon" type="image/x-icon" href="{{ 'favicon.ico' | absolute_url }}" />
Expand Down
6 changes: 4 additions & 2 deletions _sass/_main.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/**
* Vendor
*/
@import 'bourbon/bourbon';

// This is the original reset included when we used bourbon.sass
@import 'normalize.scss';

/**
Expand All @@ -11,6 +12,7 @@
@import 'variables/colors';
@import 'variables/layout';
@import 'variables/typography';
@import 'variables/utilities';

// /**
// * Base global styles.
Expand Down Expand Up @@ -70,4 +72,4 @@
// /**
// * Prototype Project Page
// */
@import 'components/project-page';
@import 'components/project-page';
54 changes: 0 additions & 54 deletions _sass/bourbon/_bourbon.scss

This file was deleted.

14 changes: 0 additions & 14 deletions _sass/bourbon/bourbon/helpers/_buttons-list.scss

This file was deleted.

27 changes: 0 additions & 27 deletions _sass/bourbon/bourbon/helpers/_scales.scss

This file was deleted.

26 changes: 0 additions & 26 deletions _sass/bourbon/bourbon/library/_border-color.scss

This file was deleted.

85 changes: 0 additions & 85 deletions _sass/bourbon/bourbon/library/_border-radius.scss

This file was deleted.

25 changes: 0 additions & 25 deletions _sass/bourbon/bourbon/library/_border-style.scss

This file was deleted.

25 changes: 0 additions & 25 deletions _sass/bourbon/bourbon/library/_border-width.scss

This file was deleted.

Loading

0 comments on commit 9f70aa6

Please sign in to comment.