Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.0] Update Bootstrap to beta-1 #17496

Merged
merged 24 commits into from
Aug 23, 2017
Merged

[4.0] Update Bootstrap to beta-1 #17496

merged 24 commits into from
Aug 23, 2017

Conversation

C-Lodder
Copy link
Member

@C-Lodder C-Lodder commented Aug 11, 2017

WIP

This PR updates Bootstrap to beta-1 which was released this morning. There's still a lot of fixes to be made to cater for ther B/C breaks, so probably not much point in testing.

Do NOT merge!


To-Do

  • Fix grid issue (@ciar4n may need your eyes on this).
  • Mobile menu showing on desktop (Possible a responsive utility class update needed).
  • Fix toolbar "save" dropdown misalignment
  • Investigate font-size mismatch between alpha-6 and beta-1
  • Update tests


.alert-message {
@include alert-variant(theme-color("success"), theme-color("success"), $gray-200);
}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Files should end with a trailing newline

Copy link
Member Author

@C-Lodder C-Lodder Aug 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

woof, done

@@ -0,0 +1,265 @@
(function () {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@C-Lodder you need to remove the tab files, it's not ready for merging yet

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It they're being compile but not merged, then they should probably be ignored in th
he Gruntfile.js

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gruntfile is totally stupid (and that's the way it should be), it copies all the files from the dist/js to the media/system/webcomponents.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm ok. Will revert that file

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

4 files, thanks

@brianteeman
Copy link
Contributor

Please ping when it is ready for testing

@C-Lodder
Copy link
Member Author

will do, thanks @brianteeman

@C-Lodder
Copy link
Member Author

@brianteeman - apart from the first 2 things on the "to-do" list mentioned in my initial comment, could you give this a once over to see if anything drastic is going wrong, that would be appreciated. FYI you will need to reinstall Joomla to get the background colour variants on the demo modules for Aurora.

@brianteeman
Copy link
Contributor

My four hour train journey from an unnamed location in the middle of Wales is almost over so I will have to put this on the todo list for tomorrow am as I suspect I am about to fall asleep in the keyboard

@brianteeman
Copy link
Contributor

Some of the fonts seem to be different sizes for example

screenshotr20-35-57

screenshotr20-36-18

@brianteeman
Copy link
Contributor

and there is a difference here as well - maybe its padding - not sure only a quick check

screenshotr20-37-46

screenshotr20-38-11

@brianteeman
Copy link
Contributor

And another font size difference

screenshotr20-39-56

screenshotr20-39-35

@brianteeman
Copy link
Contributor

@C-Lodder login font size and alert font size are now ok thanks - toolbar still the same

@C-Lodder
Copy link
Member Author

@brianteeman fixed

@C-Lodder
Copy link
Member Author

@wilsonge - This is good to go now. If there are however any glitches I've missed, a new issue can be opened.

@brianteeman
Copy link
Contributor

Can this be merged now please?

@wilsonge wilsonge merged commit 9317866 into joomla:4.0-dev Aug 23, 2017
@wilsonge wilsonge added this to the Joomla 4.0 milestone Aug 23, 2017
@C-Lodder C-Lodder deleted the bs4-beta1 branch August 23, 2017 09:34
@brianteeman
Copy link
Contributor

Thanks all

roland-d added a commit to roland-d/joomla-cms that referenced this pull request Aug 31, 2017
…olandd-4.0-dev

* '4.0-dev' of https://github.com/joomla/joomla-cms: (35 commits)
  Delete redis handler in favor of fw handler (joomla#17798)
  Remove deprecated JArrayHelper (joomla#17795)
  [4.0] codestyle (joomla#17779)
  Update error renderers for PHP 7 code structure, update Exception/Throwable references to only reference Throwable (joomla#17750)
  Improve article association links
  Fix parsing routes with language filter enabled
  Fix JString use
  [4.0] Fix content margin if no "top" modules are assigned (joomla#17699)
  Removed required state for Secret Key field (joomla#17713)
  [4.0] [installation]  set proper default for lastResetTime (joomla#16847)
  [4.0] Remove FOF From Joomla Core (joomla#17687)
  [4.0] Add Controller suffix to extension controllers (joomla#17624)
  Fix menu association form field not loading
  remove html imports (joomla#17691)
  [4.0] Update Bootstrap to beta-1 (joomla#17496)
  Move files
  [4.0] Cleanup classmap and include it properly for stubs generation (joomla#17667)
  Add back class that got deleted somewhere
  Fix Sql field class name (joomla#17666)
  [4.0] Fix namespaced form fields Part 2 (joomla#17664)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants