Permalink
Browse files

Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
	BACKERS.md
	CHANGELOG.md
	README.md
	bower.json
	bulma.sass
	css/bulma.css
	css/bulma.css.map
	docs/_config.yml
	docs/_data/backers.json
	docs/_data/icons.json
	docs/_data/love.json
	docs/_data/variables/components/card.json
	docs/_data/variables/elements/button.json
	docs/_data/variables/elements/content.json
	docs/_data/variables/elements/title.json
	docs/_data/variables/utilities/controls.json
	docs/_data/variables/utilities/initial-variables.json
	docs/_includes/elements/patreon-item.html
	docs/_includes/elements/tw-button.html
	docs/_includes/examples/navbar-bottom.html
	docs/_includes/examples/navbar-color.html
	docs/_includes/examples/navbar.html
	docs/_includes/index/intro.html
	docs/_javascript/index.js
	docs/_javascript/main.js
	docs/_javascript/navbar.js
	docs/_layouts/default.html
	docs/_layouts/documentation.html
	docs/_layouts/post.html
	docs/_posts/2016-02-09-blog-launched-new-responsive-columns-new-helpers.md
	docs/_posts/2016-04-11-metro-ui-css-grid-with-bulma-tiles.md
	docs/_posts/2017-03-10-new-field-element.md
	docs/_posts/2017-07-24-access-previous-bulma-versions.md
	docs/_posts/2017-08-01-bulma-bootstrap-comparison.md
	docs/_posts/2017-08-03-list-of-tags.md
	docs/_posts/2017-10-09-roses-are-red-links-are-blue.md
	docs/_posts/2017-10-22-list-of-buttons.md
	docs/_posts/2017-11-01-fixed-navbar.md
	docs/_posts/2017-11-14-bulma-is-on-patreon.md
	docs/_sass/bootstrap.sass
	docs/_sass/bsa.sass
	docs/_sass/example.sass
	docs/_sass/expo.sass
	docs/_sass/footer.sass
	docs/_sass/global.sass
	docs/_sass/header.sass
	docs/_sass/highlight.sass
	docs/_sass/index.sass
	docs/_sass/love.sass
	docs/_sass/override.sass
	docs/_sass/patreon.sass
	docs/_sass/specific.sass
	docs/_sass/sponsors.sass
	docs/_sass/twitter.sass
	docs/alternative-to-bootstrap.html
	docs/atom.xml
	docs/backers.html
	docs/blog.html
	docs/bulma-docs.sass
	docs/bulma-start.html
	docs/css/bulma-docs.css
	docs/documentation/columns/basics.html
	docs/documentation/columns/gap.html
	docs/documentation/columns/nesting.html
	docs/documentation/columns/options.html
	docs/documentation/columns/responsiveness.html
	docs/documentation/columns/sizes.html
	docs/documentation/components/breadcrumb.html
	docs/documentation/components/card.html
	docs/documentation/components/dropdown.html
	docs/documentation/components/menu.html
	docs/documentation/components/message.html
	docs/documentation/components/modal.html
	docs/documentation/components/nav.html
	docs/documentation/components/navbar.html
	docs/documentation/components/pagination.html
	docs/documentation/components/panel.html
	docs/documentation/components/tabs.html
	docs/documentation/elements/box.html
	docs/documentation/elements/button.html
	docs/documentation/elements/content.html
	docs/documentation/elements/delete.html
	docs/documentation/elements/icon.html
	docs/documentation/elements/image.html
	docs/documentation/elements/notification.html
	docs/documentation/elements/progress.html
	docs/documentation/elements/table.html
	docs/documentation/elements/tag.html
	docs/documentation/elements/title.html
	docs/documentation/form/checkbox.html
	docs/documentation/form/file.html
	docs/documentation/form/general.html
	docs/documentation/form/input.html
	docs/documentation/form/radio.html
	docs/documentation/form/select.html
	docs/documentation/form/textarea.html
	docs/documentation/layout/container.html
	docs/documentation/layout/footer.html
	docs/documentation/layout/hero.html
	docs/documentation/layout/level.html
	docs/documentation/layout/media-object.html
	docs/documentation/layout/section.html
	docs/documentation/layout/tiles.html
	docs/documentation/modifiers/helpers.html
	docs/documentation/modifiers/responsive-helpers.html
	docs/documentation/modifiers/syntax.html
	docs/documentation/modifiers/typography-helpers.html
	docs/documentation/overview/classes.html
	docs/documentation/overview/colors.html
	docs/documentation/overview/customize.html
	docs/documentation/overview/functions.html
	docs/documentation/overview/mixins.html
	docs/documentation/overview/modular.html
	docs/documentation/overview/responsiveness.html
	docs/documentation/overview/start.html
	docs/documentation/overview/variables.html
	docs/expo.html
	docs/extensions.html
	docs/index.html
	docs/lib/index.js
	docs/lib/main.js
	docs/lib/navbar.js
	docs/love.html
	docs/made-with-bulma.html
	docs/package.json
	docs/templates.html
	docs/thank-you.html
	docs/tiles.html
	docs/yarn.lock
	package.json
	sass/base/helpers.sass
	sass/components/dropdown.sass
	sass/components/navbar.sass
	sass/elements/button.sass
	sass/elements/container.sass
	sass/elements/content.sass
	sass/elements/form.sass
	sass/elements/image.sass
	sass/elements/table.sass
	sass/elements/tag.sass
	sass/grid/columns.sass
	sass/utilities/mixins.sass
  • Loading branch information...
intenscia committed Apr 19, 2018
2 parents ddc6392 + b6977cf commit 140a90f8580883ce9b5566be6e41f32f5ddecec8
@@ -1,6 +1,6 @@
The MIT License (MIT)
Copyright (c) 2017 Jeremy Thomas
Copyright (c) 2018 Jeremy Thomas
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -12,6 +12,7 @@ css/bulma-test.css
css/bulma-docs.css.map
PUBLISHING.md
npm-debug.log
test.html
test.sass
test.scss
@@ -11,8 +11,8 @@ $code-padding: 0.25em 0.5em 0.25em !default
$code-weight: normal !default
$code-size: 0.875em !default
$hr-background-color: $border !default
$hr-height: 1px !default
$hr-background-color: $background !default
$hr-height: 2px !default
$hr-margin: 1.5rem 0 !default
$strong-color: $text-strong !default
@@ -52,6 +52,8 @@ $alignments: ('centered': 'center', 'justified': 'justify', 'left': 'left', 'rig
@each $alignment, $text-align in $alignments
.has-text-#{$alignment}
text-align: #{$text-align} !important
// @each $alignment, $text-align in $alignments
// +mobile
// .has-text-#{$alignment}-mobile
// text-align: #{$text-align} !important
@@ -100,10 +102,14 @@ $alignments: ('centered': 'center', 'justified': 'justify', 'left': 'left', 'rig
&:hover,
&:focus
color: darken($color, 10%) !important
.has-background-#{$name}
background-color: $color !important
@each $name, $shade in $shades
.has-text-#{$name}
color: $shade !important
.has-background-#{$name}
background-color: $shade !important
// .has-text-weight-light
// font-weight: $weight-light !important
@@ -1,4 +1,4 @@
/*! minireset.css v0.0.2 | MIT License | github.com/jgthms/minireset.css */
/*! minireset.css v0.0.3 | MIT License | github.com/jgthms/minireset.css */
// Blocks
html,
body,
@@ -45,19 +45,18 @@ html
box-sizing: border-box
*
box-sizing: inherit
&:before,
&:after
&,
&::before,
&::after
box-sizing: inherit
// Media
iframe,
canvas,
img,
embed,
object,
audio,
video
height: auto
max-width: 100%
// Fix Tinymce bug
@@ -2,23 +2,22 @@ $breadcrumb-item-color: $link !default
$breadcrumb-item-hover-color: $link-hover !default
$breadcrumb-item-active-color: $text-strong !default
$breadcrumb-item-separator-color: $text !default
$breadcrumb-item-padding-vertical: 0 !default
$breadcrumb-item-padding-horizontal: 0.75em !default
$breadcrumb-item-separator-color: $grey-light !default
.breadcrumb
+block
+unselectable
align-items: stretch
display: flex
font-size: $size-normal
overflow: hidden
overflow-x: auto
white-space: nowrap
a
align-items: center
color: $breadcrumb-item-color
display: flex
justify-content: center
padding: 0.5em 0.75em
padding: $breadcrumb-item-padding-vertical $breadcrumb-item-padding-horizontal
&:hover
color: $breadcrumb-item-hover-color
li
@@ -34,11 +33,11 @@ $breadcrumb-item-separator-color: $text !default
& + li::before
color: $breadcrumb-item-separator-color
content: "\0002f"
ul, ol
align-items: center
ul,
ol
align-items: flex-start
display: flex
flex-grow: 1
flex-shrink: 0
flex-wrap: wrap
justify-content: flex-start
.icon
&:first-child
@@ -47,10 +46,12 @@ $breadcrumb-item-separator-color: $text !default
margin-left: 0.5em
// Alignment
&.is-centered
ol, ul
ol,
ul
justify-content: center
&.is-right
ol, ul
ol,
ul
justify-content: flex-end
// Sizes
&.is-small
@@ -2,10 +2,14 @@ $card-color: $text !default
$card-background-color: $white !default
$card-shadow: 0 2px 3px rgba($black, 0.1), 0 0 0 1px rgba($black, 0.1) !default
$card-header-background-color: none !default
$card-header-color: $text-strong !default
$card-header-shadow: 0 1px 2px rgba($black, 0.1) !default
$card-header-weight: $weight-bold !default
$card-content-background-color: none !default
$card-footer-background-color: none !default
$card-footer-border-top: 1px solid $border !default
.card
@@ -16,6 +20,7 @@ $card-footer-border-top: 1px solid $border !default
position: relative
.card-header
background-color: $card-header-background-color
align-items: stretch
box-shadow: $card-header-shadow
display: flex
@@ -42,9 +47,11 @@ $card-footer-border-top: 1px solid $border !default
position: relative
.card-content
background-color: $card-content-background-color
padding: 1.5rem
.card-footer
background-color: $card-footer-background-color
border-top: $card-footer-border-top
align-items: stretch
display: flex
@@ -29,7 +29,7 @@ $dropdown-divider-background-color: $border !default
// .dropdown-menu
// bottom: 100%
// padding-bottom: $dropdown-content-offset
// padding-top: unset
// padding-top: initial
// top: auto
.dropdown-menu
@@ -3,17 +3,21 @@ $message-radius: $radius !default
$message-header-background-color: $text !default
$message-header-color: $text-invert !default
$message-header-padding: 0.5em 0.75em !default
$message-header-weight: $weight-bold !default
$message-header-padding: 0.75em 1em !default
$message-header-radius: $radius !default
$message-body-border: 1px solid $border !default
$message-body-border-color: $border !default
$message-body-border-width: 0 0 0 4px !default
$message-body-color: $text !default
$message-body-padding: 1em 1.25em !default
$message-body-padding: 1.25em 1.5em !default
$message-body-radius: $radius !default
$message-body-pre-background-color: $white !default
$message-body-pre-code-background-color: transparent !default
$message-header-body-border-width: 0 !default
.message
+block
background-color: $message-background-color
@@ -54,6 +58,7 @@ $message-body-pre-code-background-color: transparent !default
border-radius: $message-header-radius $message-header-radius 0 0
color: $message-header-color
display: flex
font-weight: $message-header-weight
justify-content: space-between
line-height: 1.25
padding: $message-header-padding
@@ -63,13 +68,15 @@ $message-body-pre-code-background-color: transparent !default
flex-shrink: 0
margin-left: 0.75em
& + .message-body
border-width: $message-header-body-border-width
border-top-left-radius: 0
border-top-right-radius: 0
border-top: none
.message-body
border: $message-body-border
border-color: $message-body-border-color
border-radius: $message-body-radius
border-style: solid
border-width: $message-body-border-width
color: $message-body-color
padding: $message-body-padding
code,
Oops, something went wrong.

0 comments on commit 140a90f

Please sign in to comment.