Skip to content
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
	css/bulma.min.css
	docs/README.md
	docs/_data/backers.json
	docs/_data/love.json
	docs/_data/meta.json
	docs/_data/variables/base/generic.json
	docs/_includes/content/pro.html
	docs/_includes/elements/link.html
	docs/_includes/elements/tw.html
	docs/_includes/elements/tws.html
	docs/_includes/footer/contribute.html
	docs/_includes/footer/support.html
	docs/_includes/global/footer.html
	docs/_includes/global/fortyfour.html
	docs/_includes/index/customize.html
	docs/_includes/index/intro.html
	docs/_includes/index/js.html
	docs/_includes/index/modifiers.html
	docs/_includes/index/sponsor.html
	docs/_includes/index/start.html
	docs/_includes/index/tws.html
	docs/_sass/book.sass
	docs/_sass/expo.sass
	docs/_sass/footer.sass
	docs/_sass/index.sass
	docs/_sass/sponsors.sass
	docs/_sass/twitter.sass
	docs/atom.xml
	docs/bulma-docs.sass
	docs/bulma-start.html
	docs/css/bulma-docs.css
	docs/css/bulma-docs.min.css
	docs/documentation/components/modal.html
	docs/documentation/components/navbar.html
	docs/documentation/customize/concepts.html
	docs/documentation/elements/button.html
	docs/documentation/elements/content.html
	docs/documentation/elements/image.html
	docs/documentation/elements/notification.html
	docs/documentation/elements/progress.html
	docs/documentation/elements/tag.html
	docs/documentation/form/general.html
	docs/documentation/modifiers/responsive-helpers.html
	docs/documentation/modifiers/typography-helpers.html
	docs/documentation/overview/modular.html
	docs/expo.html
	docs/images/expo/gustav-1344x840.jpg
	docs/images/expo/gustav-2688x1680.jpg
	docs/images/sponsors/themeisle.png
	docs/love.html
	docs/package.json
	package.json
	sass/base/generic.sass
	sass/base/minireset.sass
  • Loading branch information...
intenscia committed May 8, 2019
2 parents 1ef39e4 + 305d51c commit 99335af12c87f04e818c248cf0d1757609512f38
Showing with 50 additions and 8 deletions.
  1. +36 −0 .github/stale.yml
  2. +1 −1 LICENSE
  3. +1 −1 README.md
  4. +4 −2 sass/base/generic.sass
  5. +7 −4 sass/base/minireset.sass
  6. +1 −0 sass/elements/form.sass
@@ -0,0 +1,36 @@
# Configuration for probot-stale - https://github.com/probot/stale

# Number of days of inactivity before an Issue or Pull Request becomes stale
daysUntilStale: 180

# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
daysUntilClose: 7

# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
exemptLabels:
- pinned

# Set to true to ignore issues in a project (defaults to false)
exemptProjects: true

# Set to true to ignore issues in a milestone (defaults to false)
exemptMilestones: true

# Set to true to ignore issues with an assignee (defaults to false)
exemptAssignees: true

# Label to use when marking as stale
staleLabel: stale

# Comment to post when marking as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
# Limit the number of actions per hour, from 1-30. Default is 30
limitPerRun: 30

# Limit to only `issues` or `pulls`
only: issues
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2018 Jeremy Thomas
Copyright (c) 2019 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
@@ -30,4 +30,4 @@ Our aim with [mod.io](https://mod.io), is to provide an open modding API. You ar
* [Unity plugin](https://github.com/modio/UnityPlugin), easily manage the browsing and install of mods in Unity Engine games
* [Python wrapper](https://github.com/ClementJ18/mod.io), a python wrapper for the mod.io API
* [Rust wrapper](https://github.com/nickelc/modio-rs), rust interface for mod.io
* And more...
* And more...
@@ -5,6 +5,8 @@ $body-family: $family-primary !default
$body-color: $text !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
@@ -24,8 +26,8 @@ html
-moz-osx-font-smoothing: grayscale
-webkit-font-smoothing: antialiased
min-width: 300px
overflow-x: hidden
// overflow-y: scroll
overflow-x: $body-overflow-x
// overflow-y: $body-overflow-y
text-rendering: $body-rendering
text-size-adjust: 100%

@@ -1,4 +1,4 @@
/*! minireset.css v0.0.3 | MIT License | github.com/jgthms/minireset.css */
/*! minireset.css v0.0.4 | MIT License | github.com/jgthms/minireset.css */
// Blocks
html,
body,
@@ -51,14 +51,17 @@ html
box-sizing: inherit

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

audio
max-width: 100%

// Fix Tinymce bug
img:not(.mce-object)
height: auto
@@ -47,6 +47,7 @@ $help-size: $size-small !default
@extend %control
background-color: $input-background-color
border-color: $input-border-color
border-radius: $input-radius
color: $input-color
+placeholder
color: $input-placeholder-color

0 comments on commit 99335af

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