Fix imports

2024-11-14 11:14:24 +00:00 · 2016-09-22 20:30:09 +01:00 · 2016-09-22 20:30:09 +01:00 · 70b1367053
commit 70b1367053
parent 9928f2b9f0
34 changed files with 2523 additions and 51 deletions
--- a/css/bulma.css
+++ b/css/bulma.css
--- a/css/bulma.css.map
+++ b/css/bulma.css.map
--- a/docs/.gitignore
+++ b/docs/.gitignore
@ -1,6 +1,8 @@
 # Files
 .DS_Store
 _config.local.yml
+css/bulma-test.css
+bulma-test.sass
 bulma-website-local.sass
 npm-debug.log

--- a/package.json
+++ b/package.json
@ -36,7 +36,9 @@
    "docs-sass": "node-sass --output-style expanded docs/bulma-docs.sass docs/css/bulma-docs.css",
    "pre-push": "npm run build && git add css && git commit --amend --no-edit",
    "start": "npm run build-sass -- --watch",
-    "start-docs": "npm run docs-sass -- --watch"
+    "start-docs": "npm run docs-sass -- --watch",
+    "start-test": "npm run test-sass -- --watch",
+    "test-sass": "node-sass --output-style expanded docs/bulma-test.sass docs/css/bulma-test.css"
  },
  "files": [
    "css",
--- a/sass/base/classes.sass
+++ b/sass/base/classes.sass
@ -1,3 +1,5 @@
+@import "../utilities/mixins.sass"
+
 .block
  &:not(:last-child)
    margin-bottom: 20px
--- a/sass/base/generic.sass
+++ b/sass/base/generic.sass
@ -1,3 +1,6 @@
+@import "../utilities/mixins.sass"
+@import "../utilities/variables.sass"
+
 html
  background-color: $body-background
  font-size: $size-normal
--- a/sass/base/helpers.sass
+++ b/sass/base/helpers.sass
@ -1,3 +1,6 @@
+@import "../elements/other.sass"
+@import "../utilities/mixins.sass"
+
 // Display

 $displays: 'block' 'flex' 'inline' 'inline-block' 'inline-flex'
--- a/sass/components/card.sass
+++ b/sass/components/card.sass
@ -1,3 +1,5 @@
+@import "../utilities/variables.sass"
+
 .card-header
  align-items: stretch
  box-shadow: 0 1px 2px rgba($black, 0.1)
--- a/sass/components/grid.sass
+++ b/sass/components/grid.sass
@ -1,3 +1,6 @@
+@import "../utilities/mixins.sass"
+@import "../utilities/variables.sass"
+
 .column
  flex-basis: 0
  flex-grow: 1
--- a/sass/components/level.sass
+++ b/sass/components/level.sass
@ -1,3 +1,7 @@
+@import "../base/classes.sass"
+@import "../utilities/mixins.sass"
+@import "../utilities/variables.sass"
+
 .level-item
  .title,
  .subtitle
--- a/sass/components/media.sass
+++ b/sass/components/media.sass
@ -1,3 +1,6 @@
+@import "../utilities/mixins.sass"
+@import "../utilities/variables.sass"
+
 .media-number
  background-color: $background
  border-radius: 290486px
--- a/sass/components/menu.sass
+++ b/sass/components/menu.sass
@ -1,3 +1,5 @@
+@import "../utilities/variables.sass"
+
 .menu-nav
  a
    display: block
--- a/sass/components/message.sass
+++ b/sass/components/message.sass
@ -1,3 +1,7 @@
+@import "../base/classes.sass"
+@import "../utilities/functions.sass"
+@import "../utilities/variables.sass"
+
 .message-body
  border: 1px solid $border
  border-radius: $radius
--- a/sass/components/modal.sass
+++ b/sass/components/modal.sass
@ -1,3 +1,7 @@
+@import "../elements/other.sass"
+@import "../utilities/mixins.sass"
+@import "../utilities/variables.sass"
+
 .modal-background
  +overlay
  background-color: rgba($black, 0.86)
--- a/sass/components/nav.sass
+++ b/sass/components/nav.sass
@ -1,3 +1,7 @@
+@import "../elements/other.sass"
+@import "../utilities/mixins.sass"
+@import "../utilities/variables.sass"
+
 // Components

 .nav-toggle
--- a/sass/components/pagination.sass
+++ b/sass/components/pagination.sass
@ -1,3 +1,6 @@
+@import "../utilities/mixins.sass"
+@import "../utilities/variables.sass"
+
 .pagination
  align-items: center
  display: flex
--- a/sass/components/panel.sass
+++ b/sass/components/panel.sass
@ -1,3 +1,6 @@
+@import "../utilities/mixins.sass"
+@import "../utilities/variables.sass"
+
 .panel-icon
  +fa(14px, 16px)
  color: $text-light
--- a/sass/components/tabs.sass
+++ b/sass/components/tabs.sass
@ -1,3 +1,7 @@
+@import "../base/classes.sass"
+@import "../elements/other.sass"
+@import "../utilities/variables.sass"
+
 .tabs
  @extend .block
  @extend .unselectable
--- a/sass/elements/box.sass
+++ b/sass/elements/box.sass
@ -1,3 +1,6 @@
+@import "../base/classes.sass"
+@import "../utilities/variables.sass"
+
 .box
  @extend .block
  background-color: $white
--- a/sass/elements/button.sass
+++ b/sass/elements/button.sass
@ -1,3 +1,7 @@
+@import "../elements/other.sass"
+@import "../utilities/controls.sass"
+@import "../utilities/variables.sass"
+
 =button-small
  border-radius: $radius-small
  font-size: 11px
--- a/sass/elements/content.sass
+++ b/sass/elements/content.sass
@ -1,3 +1,6 @@
+@import "../base/classes.sass"
+@import "../utilities/variables.sass"
+
 .content
  @extend .block
  color: $text
--- a/sass/elements/form.sass
+++ b/sass/elements/form.sass
@ -1,3 +1,7 @@
+@import "../elements/other.sass"
+@import "../utilities/controls.sass"
+@import "../utilities/mixins.sass"
+
 =form-control
  +control
  @each $name, $pair in $colors
--- a/sass/elements/image.sass
+++ b/sass/elements/image.sass
@ -1,3 +1,5 @@
+@import "../utilities/mixins.sass"
+
 $dimensions: 16 24 32 48 64 96 128

 .image
--- a/sass/elements/notification.sass
+++ b/sass/elements/notification.sass
@ -1,3 +1,7 @@
+@import "../base/classes.sass"
+@import "../utilities/mixins.sass"
+@import "../utilities/variables.sass"
+
 .notification
  @extend .block
  +clearfix
--- a/sass/elements/other.sass
+++ b/sass/elements/other.sass
@ -1,3 +1,7 @@
+@import "../base/classes.sass"
+@import "../utilities/mixins.sass"
+@import "../utilities/variables.sass"
+
 .delete
  @extend .unselectable
  -moz-appearance: none
@ -147,9 +151,6 @@
  .delete
    margin-left: 4px
    margin-right: -6px
-  &:not(.is-large)
-    .delete
-      @extend .delete.is-small
  // Colors
  @each $name, $pair in $colors
    $color: nth($pair, 1)
--- a/sass/elements/progress.sass
+++ b/sass/elements/progress.sass
@ -1,3 +1,6 @@
+@import "../base/classes.sass"
+@import "../utilities/variables.sass"
+
 .progress
  @extend .block
  -moz-appearance: none
--- a/sass/elements/table.sass
+++ b/sass/elements/table.sass
@ -1,3 +1,6 @@
+@import "../utilities/mixins.sass"
+@import "../utilities/variables.sass"
+
 .table
  background-color: $white
  color: $text-strong
--- a/sass/elements/title.sass
+++ b/sass/elements/title.sass
@ -1,3 +1,7 @@
+@import "../base/classes.sass"
+@import "../utilities/mixins.sass"
+@import "../utilities/variables.sass"
+
 .title,
 .subtitle
  @extend .block
--- a/sass/layout/footer.sass
+++ b/sass/layout/footer.sass
@ -1,3 +1,5 @@
+@import "../utilities/variables.sass"
+
 .footer
  background-color: $background
  padding: 40px 20px 80px
--- a/sass/layout/hero.sass
+++ b/sass/layout/hero.sass
@ -1,3 +1,6 @@
+@import "../utilities/mixins.sass"
+@import "../utilities/variables.sass"
+
 // Components

 .hero-video
--- a/sass/layout/section.sass
+++ b/sass/layout/section.sass
@ -1,3 +1,6 @@
+@import "../utilities/mixins.sass"
+@import "../utilities/variables.sass"
+
 .section
  background-color: $white
  padding: 40px 20px
--- a/sass/utilities/controls.sass
+++ b/sass/utilities/controls.sass
@ -1,3 +1,6 @@
+@import "./mixins.sass"
+@import "./variables.sass"
+
 =control
  -moz-appearance: none
  -webkit-appearance: none
--- a/sass/utilities/mixins.sass
+++ b/sass/utilities/mixins.sass
@ -57,6 +57,12 @@
  text-indent: -290486px
  width: $width

+// Responsiveness
+
+$tablet: 769px !default
+$desktop: 980px !default
+$widescreen: 1180px !default
+
 =from($device)
  @media screen and (min-width: $device)
    @content
--- a/sass/utilities/variables.sass
+++ b/sass/utilities/variables.sass
@ -1,3 +1,5 @@
+@import "./functions.sass"
+
 // 1. Initial variables

 // Colors
@ -37,12 +39,6 @@ $weight-bold: 700 !default
 $weight-title-normal: 300 !default
 $weight-title-bold: 500 !default

-// Breakpoints
-
-$tablet: 769px !default
-$desktop: 980px !default
-$widescreen: 1180px !default
-
 // Dimensions

 $column-gap: 20px !default