Skip to content

Fix js-main script.#28057

Merged
XhmikosR merged 1 commit intov4-devfrom
v4-dev-xmr-npm-script
Jan 15, 2019
Merged

Fix js-main script.#28057
XhmikosR merged 1 commit intov4-devfrom
v4-dev-xmr-npm-script

Conversation

@XhmikosR
Copy link
Copy Markdown
Member

js-compile-main script doesn't exist for some time now.

@XhmikosR XhmikosR merged commit 0828b88 into v4-dev Jan 15, 2019
@XhmikosR XhmikosR deleted the v4-dev-xmr-npm-script branch January 15, 2019 15:30
bkdotcom added a commit to bkdotcom/bootstrap that referenced this pull request Jan 16, 2019
* v4-dev: (34 commits)
  tests: use jQuery from node_modules. (twbs#28059)
  Fix `js-main` script. (twbs#28057)
  Make progress animation respect `$enable-transitions` and `prefers-reduced-motion` media query
  Examples: add tabindex="-1" and aria-disabled="true" on disabled links
  Clean up .gitignore. (twbs#28050)
  Fix Carousel's touch option to not add touch listeners when set to false (twbs#28046)
  Remove map-merge (twbs#28033)
  Cleanup popover arrows (twbs#28008)
  Sync dropdown font size to base font size
  Sync dropdown font size with btn font size
  Remove background from nested tables
  Add some margin below the buttons
  Fix background size y
  Minify background property
  Combine background properties into one
  Prevent useless property rendering
  Don't render a background by default
  Prevent rendering of color property by default
  Change comment heading title to `Typography` (twbs#28032)
  Align toast variables (twbs#28041)
  ...

# Conflicts:
#	package.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants