Skip to content
Permalink
Browse files

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

Conflicts:
	.github/PULL_REQUEST_TEMPLATE.md
	BACKERS.md
	CHANGELOG.md
	README.md
	bower.json
	bulma.sass
	css/bulma.css
	css/bulma.css.map
	css/bulma.min.css
	docs/_data/backers.json
	docs/_data/love.json
	docs/_data/meta.json
	docs/_data/sponsors.json
	docs/_data/variables/base/generic.json
	docs/_data/variables/components/card.json
	docs/_data/variables/components/dropdown.json
	docs/_data/variables/components/menu.json
	docs/_data/variables/components/message.json
	docs/_data/variables/components/pagination.json
	docs/_data/variables/components/panel.json
	docs/_data/variables/elements/button.json
	docs/_data/variables/elements/progress.json
	docs/_data/variables/elements/title.json
	docs/_data/variables/utilities/initial-variables.json
	docs/_includes/components/form-variables.html
	docs/_includes/elements/bsa.html
	docs/_includes/elements/carbon.html
	docs/_includes/elements/tws.html
	docs/_includes/global/deprecated.html
	docs/_includes/global/navbar.html
	docs/_includes/index/intro.html
	docs/_includes/steps/add-custom-styles.html
	docs/_sass/global.sass
	docs/_sass/sponsors.sass
	docs/css/bulma-docs.css
	docs/css/bulma-docs.min.css
	docs/documentation/customize/with-webpack.html
	docs/documentation/modifiers/helpers.html
	docs/documentation/modifiers/typography-helpers.html
	docs/index.html
	package-lock.json
	package.json
	sass/base/generic.sass
	sass/base/helpers.sass
	sass/base/minireset.sass
	sass/components/dropdown.sass
	sass/components/modal.sass
	sass/components/navbar.sass
	sass/elements/button.sass
	sass/elements/container.sass
	sass/elements/content.sass
	sass/elements/form.sass
	sass/elements/progress.sass
	sass/elements/table.sass
	sass/elements/tag.sass
	sass/elements/title.sass
	sass/grid/columns.sass
	sass/layout/hero.sass
  • Loading branch information...
intenscia committed Jun 26, 2019
2 parents 403db93 + 5ba7591 commit 53fa067913280f605969a0d697117c19fb472637
@@ -0,0 +1,37 @@
<!-- PLEASE READ THE FOLLOWING INSTRUCTIONS -->
<!-- DO NOT REBUILD THE CSS OUTPUT IN YOUR PR -->

<!-- Choose one of the following: -->
This is a **new feature | improvement | bugfix | documentation fix**.
<!-- New feature? Update the CHANGELOG.md too, and eventually the Docs. -->
<!-- Improvement? Explain how and why. -->
<!-- Bugfix? Reference that issue as well. -->

### Proposed solution

<!-- Which specific problem does this PR solve and how? -->
<!-- If it fixes a particular Issue, add "Fixes #ISSUE_NUMBER" in your title -->

### Tradeoffs

<!-- What are the drawbacks of this solution? Are there alternative ones? -->
<!-- Think of performance, build time, usability, complexity, coupling…) -->

### Testing Done

None.

<!-- BEFORE SUBMITTING YOUR PR, MAKE SURE TO FOLLOW THESE STEPS: -->
<!-- 1. Pull the latest `master` branch -->
<!-- 2. Make sure your Sass code is compliant with the [Bulma Sass styleguide](https://github.com/jgthms/bulma/blob/master/.github/CONTRIBUTING.md#bulma-sass-styleguide) -->
<!-- 3. Make sure your PR only affects `.sass` or documentation files -->
<!-- 4. [Try your changes](https://github.com/jgthms/bulma/blob/master/.github/CONTRIBUTING.md#try-your-changes). -->

<!-- How have you confirmed this feature works? -->
<!-- Please explain more than "Yes". -->

### Changelog updated?

No.

<!-- Thanks! -->
@@ -1,14 +1,18 @@
# Files

.DS_Store
.project
.ruby-version
test.sass
npm-debug.log
test.html
test.sass

# Folders

.idea/
.sass-cache
_gh_pages
_site
dev
node_modules
test/output/
@@ -4,7 +4,6 @@
[![License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://github.com/modio/UnityPlugin/blob/master/LICENSE)
[![Discord](https://img.shields.io/discord/389039439487434752.svg?label=Discord&logo=discord&color=7289DA&labelColor=2C2F33)](https://discord.mod.io)


Design for [mod.io](https://mod.io) is powered by the [bulma.io](http://bulma.io) CSS framework. The [bulma repository](https://github.com/jgthms/bulma) can be found here. We make minimal changes to it, opting to extend and overwrite its base functionality, so future updates to bulma.io can be easily merged in. We primarily comment out unused functionality to keep our compiled CSS filesize down.

## Extensions
@@ -4,6 +4,8 @@
.jekyll-metadata
_config.local.yml
_config.version.yml
_layouts/basic.html
_layouts/dev.html
bulma-test.sass
bulma-test.scss
bulma-test.css
@@ -20,6 +22,7 @@ test.scss

.sass-cache
/bulma
/dev
/icons
/styles/node_modules
/versions
@@ -1,31 +1,40 @@
$body-background-color: $white !default
$body-size: 16px !default
$body-min-width: 300px !default
$body-rendering: optimizeLegibility !default
$body-family: $family-primary !default
$body-overflow-x: hidden !default
$body-overflow-y: scroll !default

$body-color: $text !default
$body-font-size: 1em !default
$body-weight: $weight-normal !default
$body-line-height: 1.5 !default
$body-overflow-x: hidden !default
$body-overflow-y: scroll !default

$code-family: $family-code !default
$code-padding: 0.25em 0.5em 0.25em !default
$code-weight: normal !default
$code-size: 0.875em !default

$small-font-size: 0.875em !default

$hr-background-color: $background !default
$hr-height: 2px !default
$hr-margin: 1.5rem 0 !default

$strong-color: $text-strong !default
$strong-weight: $weight-bold !default

$pre-font-size: 0.875em !default
$pre-padding: 1.25rem 1.5rem !default
$pre-code-font-size: 1em !default

html
// background-color: $body-background-color
font-size: $body-size
-moz-osx-font-smoothing: grayscale
-webkit-font-smoothing: antialiased
min-width: 300px
min-width: $body-min-width
overflow-x: $body-overflow-x
// overflow-y: $body-overflow-y
text-rendering: $body-rendering
@@ -55,7 +64,7 @@ pre

body
color: $body-color
font-size: 1rem
font-size: $body-font-size
font-weight: $body-weight
line-height: $body-line-height

@@ -93,7 +102,7 @@ input[type="radio"]
vertical-align: baseline

small
font-size: 0.875em
font-size: $small-font-size

span
font-style: inherit
@@ -112,21 +121,22 @@ pre
+overflow-touch
background-color: $pre-background
color: $pre
font-size: 0.875em
font-size: $pre-font-size
overflow-x: auto
padding: 1.25rem 1.5rem
padding: $pre-padding
white-space: pre
word-wrap: normal
code
background-color: transparent
color: currentColor
font-size: 1em
font-size: $pre-code-font-size
padding: 0

table
td,
th
text-align: left
vertical-align: top
&:not([align])
text-align: left
// th
// color: $text-strong
@@ -115,6 +115,8 @@ $alignments: ('centered': 'center', 'justified': 'justify', 'left': 'left', 'rig
// font-weight: $weight-light !important
// .has-text-weight-normal
// font-weight: $weight-normal !important
// .has-text-weight-medium
// font-weight: $weight-medium !important
// .has-text-weight-semibold
// font-weight: $weight-semibold !important
.has-text-weight-bold
@@ -274,3 +276,6 @@ $displays: 'block' 'flex' 'inline' 'inline-block' 'inline-flex'

.is-unselectable
@extend %unselectable

.is-relative
position: relative !important
@@ -52,15 +52,9 @@ html

// Media
// img,
// iframe,
embed,
object,
video
height: auto
max-width: 100%

audio
max-width: 100%
// video
// height: auto
// max-width: 100%
// Fix Tinymce bug
img:not(.mce-object)
@@ -79,4 +73,5 @@ table
td,
th
padding: 0
text-align: left
&:not([align])
text-align: left
@@ -4,13 +4,18 @@ $card-shadow: 0 2px 3px rgba($black, 0.1), 0 0 0 1px rgba($black, 0.1) !default

$card-header-background-color: transparent !default
$card-header-color: $text-strong !default
$card-header-padding: 0.75rem !default
$card-header-shadow: 0 1px 2px rgba($black, 0.1) !default
$card-header-weight: $weight-bold !default

$card-content-background-color: transparent !default
$card-content-padding: 1.5rem !default

$card-footer-background-color: transparent !default
$card-footer-border-top: 1px solid $border !default
$card-footer-padding: 0.75rem !default

$card-media-margin: $block-spacing !default

.card
background-color: $card-background-color
@@ -31,7 +36,7 @@ $card-footer-border-top: 1px solid $border !default
display: flex
flex-grow: 1
font-weight: $card-header-weight
padding: 0.75rem
padding: $card-header-padding
&.is-centered
justify-content: center

@@ -40,15 +45,15 @@ $card-footer-border-top: 1px solid $border !default
cursor: pointer
display: flex
justify-content: center
padding: 0.75rem
padding: $card-header-padding

.card-image
display: block
position: relative

.card-content
background-color: $card-content-background-color
padding: 1.5rem
padding: $card-content-padding

.card-footer
background-color: $card-footer-background-color
@@ -63,12 +68,12 @@ $card-footer-border-top: 1px solid $border !default
flex-grow: 1
flex-shrink: 0
justify-content: center
padding: 0.75rem
padding: $card-footer-padding
&:not(:last-child)
border-right: $card-footer-border-top

// Combinations
.card
.media:not(:last-child)
margin-bottom: 0.75rem
margin-bottom: $card-media-margin
@@ -1,6 +1,10 @@
$dropdown-menu-min-width: 12rem !default

$dropdown-content-background-color: $white !default
$dropdown-content-arrow: $link !default
$dropdown-content-offset: 4px !default
$dropdown-content-padding-bottom: 0.5rem !default
$dropdown-content-padding-top: 0.5rem !default
$dropdown-content-radius: $radius !default
$dropdown-content-shadow: 0 2px 3px rgba($black, 0.1), 0 0 0 1px rgba($black, 0.1) !default
$dropdown-content-z: 20 !default
@@ -35,7 +39,7 @@ $dropdown-divider-background-color: $border !default
.dropdown-menu
display: none
left: 0
min-width: 12rem
min-width: $dropdown-menu-min-width
padding-top: $dropdown-content-offset
position: absolute
top: 100%
@@ -45,8 +49,8 @@ $dropdown-divider-background-color: $border !default
background-color: $dropdown-content-background-color
border-radius: $dropdown-content-radius
box-shadow: $dropdown-content-shadow
// padding-bottom: 0.5rem
// padding-top: 0.5rem
// padding-bottom: $dropdown-content-padding-bottom
// padding-top: $dropdown-content-padding-top
.dropdown-item
color: $dropdown-item-color !important
@@ -1,3 +1,5 @@
$level-item-spacing: ($block-spacing / 2) !default

.level
@extend %block
align-items: center
@@ -18,7 +20,7 @@
.level-item
&:not(:last-child)
margin-bottom: 0
margin-right: 0.75rem
margin-right: $level-item-spacing
&:not(.is-narrow)
flex-grow: 1
// Responsiveness
@@ -41,7 +43,7 @@
// Responsiveness
+mobile
&:not(:last-child)
margin-bottom: 0.75rem
margin-bottom: $level-item-spacing

.level-left,
.level-right
@@ -55,7 +57,7 @@
// Responsiveness
+tablet
&:not(:last-child)
margin-right: 0.75rem
margin-right: $level-item-spacing

.level-left
align-items: center
@@ -26,8 +26,8 @@ $list-item-hover-background-color: $background !default
border-top-left-radius: $list-radius
border-top-right-radius: $list-radius
&:last-child
border-top-left-radius: $list-radius
border-top-right-radius: $list-radius
border-bottom-left-radius: $list-radius
border-bottom-right-radius: $list-radius
&:not(:last-child)
border-bottom: $list-item-border
&.is-active
@@ -36,4 +36,4 @@ $list-item-hover-background-color: $background !default

a.list-item
background-color: $list-item-hover-background-color
cursor: pointer
cursor: pointer

0 comments on commit 53fa067

Please sign in to comment.
You can’t perform that action at this time.