Permalink
Browse files

Fix imports

  • Loading branch information...
1 parent c52a3da commit aed21e7fb35a306e4b3bbc087f9498156d672d09 @jgthms committed Oct 16, 2016
Showing with 417 additions and 7,527 deletions.
  1. +1 −0 .gitignore
  2. +4 −0 CHANGELOG.md
  3. +6 −5 bulma.sass
  4. +2 −1 docs/.gitignore
  5. +0 −1 docs/_config.yml
  6. +2 −2 docs/_includes/blog-hero.html
  7. +4 −4 docs/_includes/footer.html
  8. +3 −3 docs/_includes/head.html
  9. +6 −6 docs/_includes/header.html
  10. +10 −10 docs/_includes/subnav-components.html
  11. +11 −11 docs/_includes/subnav-elements.html
  12. +2 −2 docs/_includes/subnav-grid.html
  13. +4 −4 docs/_includes/subnav-layout.html
  14. +3 −3 docs/_includes/subnav-modifiers.html
  15. +5 −5 docs/_includes/subnav-overview.html
  16. +5 −5 docs/_layouts/documentation.html
  17. +1 −1 docs/_layouts/post.html
  18. +1 −2 docs/bulma-docs.sass
  19. +306 −1,286 docs/css/bulma-docs.css
  20. +0 −5,887 docs/css/bulma.css
  21. +0 −175 docs/css/utilities.css
  22. 0 docs/css/variables.css
  23. +2 −2 docs/documentation/components/level.html
  24. +2 −2 docs/documentation/components/nav.html
  25. +3 −3 docs/documentation/layout/hero.html
  26. +2 −2 docs/documentation/navbar.html
  27. +1 −1 docs/documentation/overview/classes.html
  28. +3 −2 docs/documentation/overview/modular.html
  29. +10 −10 docs/index.html
  30. +3 −3 docs/templates.html
  31. +1 −1 docs/thank-you.html
  32. 0 sass/base/{base.sass → _all.sass}
  33. +0 −3 sass/base/generic.sass
  34. +0 −2 sass/base/helpers.sass
  35. 0 sass/components/{components.sass → _all.sass}
  36. +0 −2 sass/components/card.sass
  37. +0 −3 sass/components/level.sass
  38. +0 −3 sass/components/media.sass
  39. +0 −2 sass/components/menu.sass
  40. +0 −3 sass/components/message.sass
  41. +0 −3 sass/components/modal.sass
  42. +0 −3 sass/components/nav.sass
  43. +0 −3 sass/components/pagination.sass
  44. +0 −3 sass/components/panel.sass
  45. +0 −3 sass/components/tabs.sass
  46. 0 sass/elements/{elements.sass → _all.sass}
  47. +0 −2 sass/elements/box.sass
  48. +0 −3 sass/elements/button.sass
  49. +0 −2 sass/elements/content.sass
  50. +1 −4 sass/elements/form.sass
  51. +0 −2 sass/elements/image.sass
  52. +0 −3 sass/elements/notification.sass
  53. +0 −3 sass/elements/other.sass
  54. +0 −2 sass/elements/progress.sass
  55. +0 −3 sass/elements/table.sass
  56. +0 −3 sass/elements/title.sass
  57. 0 sass/grid/{grid.sass → _all.sass}
  58. +0 −3 sass/grid/columns.sass
  59. +0 −3 sass/grid/tiles.sass
  60. 0 sass/layout/{layout.sass → _all.sass}
  61. +0 −2 sass/layout/footer.sass
  62. +0 −3 sass/layout/hero.sass
  63. +0 −3 sass/layout/section.sass
  64. +6 −0 sass/utilities/_all.sass
  65. +0 −5 sass/utilities/animations.sass
  66. +0 −3 sass/utilities/controls.sass
  67. +7 −4 sass/utilities/mixins.sass
  68. +0 −2 sass/utilities/variables.sass
View
@@ -1,6 +1,7 @@
# Files
.DS_Store
.ruby-version
+test.sass
npm-debug.log
# Folders
View
@@ -1,5 +1,9 @@
# Bulma Changelog
+## 0.2.2
+
+* Fix: remove multiple imports
+
## 0.2.1
* Fix: container flex
View
@@ -1,7 +1,8 @@
@charset "utf-8"
-@import "sass/base/base.sass"
-@import "sass/elements/elements.sass"
-@import "sass/components/components.sass"
-@import "sass/grid/grid.sass"
-@import "sass/layout/layout.sass"
+@import "sass/utilities/_all"
+@import "sass/base/_all"
+@import "sass/elements/_all"
+@import "sass/components/_all"
+@import "sass/grid/_all"
+@import "sass/layout/_all"
View
@@ -1,9 +1,10 @@
# Files
.DS_Store
+.jekyll-metadata
_config.local.yml
-css/bulma-test.css
bulma-test.sass
bulma-website-local.sass
+css/bulma-test.css
npm-debug.log
# Folders
View
@@ -11,7 +11,6 @@ url: http://bulma.io
# Variables
-baseurl: ""
documentation: "/documentation/overview/start/"
download: https://github.com/jgthms/bulma/archive/0.2.1.zip
github: https://github.com/jgthms/bulma
@@ -10,12 +10,12 @@
<div class="columns is-vcentered">
<div class="column">
<h1 class="title">
- <a href="{{ site.baseurl }}/blog">Blog</a>
+ <a href="{{ site.url }}/blog">Blog</a>
</h1>
<p class="subtitle">
Stay updated about new features, bug fixes, and releases
</p>
- <a class="button is-primary is-inverted" href="{{ site.baseurl }}/atom.xml">
+ <a class="button is-primary is-inverted" href="{{ site.url }}/atom.xml">
<span class="icon">
<i class="fa fa-rss"></i>
</span>
@@ -120,12 +120,12 @@
<script async id="twitter-wjs" src="https://platform.twitter.com/widgets.js"></script>
<script async type="text/javascript" src="https://s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js"></script>
-<script src="{{ site.baseurl }}/javascript/jquery-2.2.0.min.js"></script>
-<script src="{{ site.baseurl }}/javascript/clipboard.min.js"></script>
-<script src="{{ site.baseurl }}/javascript/bulma.js"></script>
+<script src="{{ site.url }}/javascript/jquery-2.2.0.min.js"></script>
+<script src="{{ site.url }}/javascript/clipboard.min.js"></script>
+<script src="{{ site.url }}/javascript/bulma.js"></script>
{% if page.route == 'index' %}
- <script type="text/javascript" src="{{ site.baseurl }}/javascript/index.js"></script>
+ <script type="text/javascript" src="{{ site.url }}/javascript/index.js"></script>
{% endif %}
<script type="text/javascript">
@@ -7,10 +7,10 @@
<title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css">
- <link rel="stylesheet" href="{{ site.baseurl }}/css/bulma-docs.css">
+ <link rel="stylesheet" href="{{ site.url }}/css/bulma-docs.css">
- <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
- <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
+ <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.url }}">
+ <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.url }}">
<meta property="og:url" content="{{site.url}}">
<meta property="og:type" content="website">
@@ -1,10 +1,10 @@
<nav class="nav">
<div class="nav-left">
- <a class="nav-item is-brand" href="{{ site.baseurl }}/">
+ <a class="nav-item is-brand" href="{{ site.url }}/">
{% if page.route == 'index' %}
- <img src="{{ site.baseurl }}/images/bulma-type.png" alt="{{ site.title }}">
+ <img src="{{ site.url }}/images/bulma-type.png" alt="{{ site.title }}">
{% else %}
- <img src="{{ site.baseurl }}/images/bulma-type-white.png" alt="{{ site.title }}">
+ <img src="{{ site.url }}/images/bulma-type-white.png" alt="{{ site.title }}">
{% endif %}
</a>
</div>
@@ -29,17 +29,17 @@
</span>
<div id="nav-menu" class="nav-right nav-menu">
- <a class="nav-item {% if page.route == 'index' %}is-active{% endif %}" href="{{ site.baseurl }}/">
+ <a class="nav-item {% if page.route == 'index' %}is-active{% endif %}" href="{{ site.url }}/">
Home
</a>
- <a class="is-hidden nav-item {% if page.route == 'templates' %}is-active{% endif %} {% if page.layout == 'templates' %}is-active{% endif %}" href="{{ site.baseurl }}/templates/">
+ <a class="is-hidden nav-item {% if page.route == 'templates' %}is-active{% endif %} {% if page.layout == 'templates' %}is-active{% endif %}" href="{{ site.url }}/templates/">
<span>Templates</span>
<span class="tag is-small is-success">New!</span>
</a>
<a class="nav-item {% if page.route == 'documentation' %}is-active{% endif %} {% if page.layout == 'documentation' %}is-active{% endif %}" href="{{ site.documentation }}">
Documentation
</a>
- <a class="nav-item {% if page.route == 'blog' %}is-active{% endif %}" href="{{ site.baseurl }}/blog/">
+ <a class="nav-item {% if page.route == 'blog' %}is-active{% endif %}" href="{{ site.url }}/blog/">
Blog
</a>
@@ -1,34 +1,34 @@
<nav class="nav has-shadow">
<div class="container">
<div class="nav-left">
- <a class="nav-item is-tab {% if page.doc-subtab == 'card' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/components/card/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'card' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/card/">
Card
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'level' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/components/level/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'level' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/level/">
Level
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'media-object' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/components/media-object/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'media-object' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/media-object/">
Media object
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'menu' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/components/menu/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'menu' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/menu/">
Menu
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'message' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/components/message/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'message' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/message/">
Message
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'modal' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/components/modal/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'modal' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/modal/">
Modal
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'nav' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/components/nav/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'nav' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/nav/">
Nav
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'pagination' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/components/pagination/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'pagination' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/pagination/">
Pagination
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'panel' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/components/panel/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'panel' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/panel/">
Panel
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'tabs' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/components/tabs/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'tabs' %}is-active{% endif %}" href="{{ site.url }}/documentation/components/tabs/">
Tabs
</a>
</div>
@@ -1,37 +1,37 @@
<nav class="nav has-shadow">
<div class="container">
<div class="nav-left">
- <a class="nav-item is-tab {% if page.doc-subtab == 'box' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/elements/box/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'box' %}is-active{% endif %}" href="{{ site.url }}/documentation/elements/box/">
Box
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'button' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/elements/button/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'button' %}is-active{% endif %}" href="{{ site.url }}/documentation/elements/button/">
Button
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'content' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/elements/content/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'content' %}is-active{% endif %}" href="{{ site.url }}/documentation/elements/content/">
Content
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'form' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/elements/form/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'form' %}is-active{% endif %}" href="{{ site.url }}/documentation/elements/form/">
Form
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'icon' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/elements/icon/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'icon' %}is-active{% endif %}" href="{{ site.url }}/documentation/elements/icon/">
Icon
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'image' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/elements/image/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'image' %}is-active{% endif %}" href="{{ site.url }}/documentation/elements/image/">
Image
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'notification' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/elements/notification/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'notification' %}is-active{% endif %}" href="{{ site.url }}/documentation/elements/notification/">
Notification
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'progress' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/elements/progress/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'progress' %}is-active{% endif %}" href="{{ site.url }}/documentation/elements/progress/">
Progress
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'table' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/elements/table/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'table' %}is-active{% endif %}" href="{{ site.url }}/documentation/elements/table/">
Table
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'tag' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/elements/tag/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'tag' %}is-active{% endif %}" href="{{ site.url }}/documentation/elements/tag/">
Tag
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'title' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/elements/title/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'title' %}is-active{% endif %}" href="{{ site.url }}/documentation/elements/title/">
Title
</a>
</div>
@@ -1,10 +1,10 @@
<nav class="nav has-shadow">
<div class="container">
<div class="nav-left">
- <a class="nav-item is-tab {% if page.doc-subtab == 'columns' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/grid/columns/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'columns' %}is-active{% endif %}" href="{{ site.url }}/documentation/grid/columns/">
Columns
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'tiles' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/grid/tiles/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'tiles' %}is-active{% endif %}" href="{{ site.url }}/documentation/grid/tiles/">
Tiles
</a>
</div>
@@ -1,16 +1,16 @@
<nav class="nav has-shadow">
<div class="container">
<div class="nav-left">
- <a class="nav-item is-tab {% if page.doc-subtab == 'container' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/layout/container/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'container' %}is-active{% endif %}" href="{{ site.url }}/documentation/layout/container/">
Container
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'hero' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/layout/hero/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'hero' %}is-active{% endif %}" href="{{ site.url }}/documentation/layout/hero/">
Hero
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'section' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/layout/section/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'section' %}is-active{% endif %}" href="{{ site.url }}/documentation/layout/section/">
Section
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'footer' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/layout/footer/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'footer' %}is-active{% endif %}" href="{{ site.url }}/documentation/layout/footer/">
Footer
</a>
</div>
@@ -1,13 +1,13 @@
<nav class="nav has-shadow">
<div class="container">
<div class="nav-left">
- <a class="nav-item is-tab {% if page.doc-subtab == 'syntax' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/modifiers/syntax/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'syntax' %}is-active{% endif %}" href="{{ site.url }}/documentation/modifiers/syntax/">
Syntax
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'helpers' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/modifiers/helpers/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'helpers' %}is-active{% endif %}" href="{{ site.url }}/documentation/modifiers/helpers/">
Helpers
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'responsive-helpers' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/modifiers/responsive-helpers/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'responsive-helpers' %}is-active{% endif %}" href="{{ site.url }}/documentation/modifiers/responsive-helpers/">
Responsive helpers
</a>
</div>
@@ -1,19 +1,19 @@
<nav class="nav has-shadow">
<div class="container">
<div class="nav-left">
- <a class="nav-item is-tab {% if page.doc-subtab == 'start' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/overview/start/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'start' %}is-active{% endif %}" href="{{ site.url }}/documentation/overview/start/">
Start
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'variables' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/overview/variables/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'variables' %}is-active{% endif %}" href="{{ site.url }}/documentation/overview/variables/">
Variables
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'responsiveness' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/overview/responsiveness/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'responsiveness' %}is-active{% endif %}" href="{{ site.url }}/documentation/overview/responsiveness/">
Responsiveness
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'modular' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/overview/modular/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'modular' %}is-active{% endif %}" href="{{ site.url }}/documentation/overview/modular/">
Modular
</a>
- <a class="nav-item is-tab {% if page.doc-subtab == 'classes' %}is-active{% endif %}" href="{{ site.baseurl }}/documentation/overview/classes/">
+ <a class="nav-item is-tab {% if page.doc-subtab == 'classes' %}is-active{% endif %}" href="{{ site.url }}/documentation/overview/classes/">
Classes
</a>
</div>
@@ -36,19 +36,19 @@
<a href="{{ site.documentation }}">Overview</a>
</li>
<li {% if page.doc-tab == 'modifiers' %}class="is-active"{% endif %}>
- <a href="{{ site.baseurl }}/documentation/modifiers/syntax">Modifiers</a>
+ <a href="{{ site.url }}/documentation/modifiers/syntax">Modifiers</a>
</li>
<li {% if page.doc-tab == 'grid' %}class="is-active"{% endif %}>
- <a href="{{ site.baseurl }}/documentation/grid/columns">Grid</a>
+ <a href="{{ site.url }}/documentation/grid/columns">Grid</a>
</li>
<li {% if page.doc-tab == 'elements' %}class="is-active"{% endif %}>
- <a href="{{ site.baseurl }}/documentation/elements/box/">Elements</a>
+ <a href="{{ site.url }}/documentation/elements/box/">Elements</a>
</li>
<li {% if page.doc-tab == 'components' %}class="is-active"{% endif %}>
- <a href="{{ site.baseurl }}/documentation/components/card/">Components</a>
+ <a href="{{ site.url }}/documentation/components/card/">Components</a>
</li>
<li {% if page.doc-tab == 'layout' %}class="is-active"{% endif %}>
- <a href="{{ site.baseurl }}/documentation/layout/container/">Layout</a>
+ <a href="{{ site.url }}/documentation/layout/container/">Layout</a>
</li>
</ul>
</div>
@@ -9,7 +9,7 @@
<div class="container">
<article class="article {{ page.category | downcase }}{% if page.recommended == true %} recommended{% endif %}">
<p class="subtitle">
- <a href="{{ site.baseurl }}/blog">Back</a>
+ <a href="{{ site.url }}/blog">Back</a>
</p>
<p class="subtitle is-4">
{{ page.date | date_to_string }}
@@ -1,7 +1,6 @@
@charset "utf-8"
-@import "../bulma.sass"
-@import "../sass/utilities/mixins.sass"
+@import "../bulma"
// Override
.button
Oops, something went wrong.

0 comments on commit aed21e7

Please sign in to comment.