Merge with upstream branch#1
Merged
ohrionmartin merged 65 commits intoohrionmartin:developmentfrom Sep 25, 2020
Merged
Conversation
. Remove display:grid for top and bottom positions . Move rtl definition for footer to _footer.scss ([dir=rtl] & ) . Add margin to form control-group . Add underline for links without class (e.g. in text) . Change padding and position for mod-list on sidebar . Improve links in mod-menu on sidebar
* [4.0] codestyle fix typo in code comments - code review only required * spelling
Make template parameters work on error.php Remove all module positions (only menu, search and footer left) Adapt layout of offline.php to Cassiopeia design
Package operations: 0 installs, 38 updates, 0 removals - Updating symfony/deprecation-contracts (v2.1.3 => v2.2.0): Downloading (100%) - Updating joomla/database (2.0.0-beta2 => 2.0.0-beta3): Downloading (100%) - Updating laminas/laminas-zendframework-bridge (1.0.4 => 1.1.1): Downloading (100%) - Updating laminas/laminas-diactoros (2.3.1 => 2.4.1): Downloading (100%) - Updating symfony/string (v5.1.3 => v5.1.5): Loading from cache - Updating symfony/service-contracts (v2.1.3 => v2.2.0): Downloading (100%) - Updating symfony/console (v5.1.3 => v5.1.5): Loading from cache - Updating symfony/var-dumper (v5.1.3 => v5.1.5): Loading from cache - Updating symfony/error-handler (v5.1.3 => v5.1.5): Loading from cache - Updating symfony/options-resolver (v5.1.3 => v5.1.5): Loading from cache - Updating symfony/ldap (v5.1.3 => v5.1.5): Loading from cache - Updating symfony/web-link (v5.1.3 => v5.1.5): Loading from cache - Updating symfony/yaml (v5.1.3 => v5.1.5): Loading from cache - Updating squizlabs/php_codesniffer (3.5.5 => 3.5.6): Loading from cache - Updating symfony/finder (v5.1.3 => v5.1.5): Loading from cache - Updating symfony/event-dispatcher-contracts (v2.1.3 => v2.2.0): Downloading (100%) - Updating symfony/event-dispatcher (v5.1.3 => v5.1.5): Loading from cache - Updating symfony/css-selector (v5.1.3 => v5.1.5): Loading from cache - Updating phpdocumentor/type-resolver (1.3.0 => 1.4.0): Downloading (100%) - Updating phpdocumentor/reflection-docblock (5.2.0 => 5.2.2): Downloading (100%) - Updating codeception/lib-asserts (1.12.0 => 1.13.1): Loading from cache - Updating codeception/codeception (4.1.6 => 4.1.7): Loading from cache - Updating codeception/module-asserts (1.2.1 => 1.3.0): Loading from cache - Updating codeception/module-rest (1.2.1 => 1.2.3): Downloading (100%) - Updating symfony/process (v5.1.3 => v5.1.5): Loading from cache - Updating codeception/module-webdriver (1.1.0 => 1.1.1): Loading from cache - Updating composer/semver (1.5.1 => 1.7.0): Downloading (100%) - Updating composer/xdebug-handler (1.4.2 => 1.4.3): Loading from cache - Updating doctrine/annotations (1.10.3 => 1.10.4): Loading from cache - Updating symfony/filesystem (v5.1.3 => v5.1.5): Loading from cache - Updating symfony/stopwatch (v5.1.3 => v5.1.5): Loading from cache - Updating joomla/filesystem (1.5.2 => 1.6.0): Loading from cache - Updating composer/ca-bundle (1.2.7 => 1.2.8): Loading from cache - Updating nyholm/psr7 (1.3.0 => 1.3.1): Downloading (100%) - Updating spomky-labs/base64url (v2.0.2 => v2.0.3): Loading from cache - Updating symfony/dom-crawler (v5.1.3 => v5.1.5): Loading from cache - Updating symfony/browser-kit (v5.1.3 => v5.1.5): Loading from cache - Updating brick/math (0.8.15 => 0.8.17): Loading from cache ### note Package phpunit/php-token-stream is abandoned, you should avoid using it. No replacement was suggested.
* Renaming the "default" chrome to "card" as it isn't a default chrome at all. * There is no "xhtml" chrome anymore
* Fix saving images * Typo * CS
fix my own mistake the correct spelling is fulfil
…u, use layout noCard for newsflash
* Show 0 values as checked out in nullable columns * Check in 0 values in nullable columns * Change comparison
The intention of this PR is to make a separate Metismenu, with real words in Menu Items. It lets the old menu Items untouched and makes testing easier for rtl. Additionally some houskeeping was made, typos fixed, hard coded item_ids replaced by the correct ItemIds.
…g the module class "card-grey" with the "card" chrome (#30734)
### Steps to reproduce the issue Clean install of development branch ### Expected result no console errors ### Actual result 404 error on `templates/media/vendor/roboto-fontface/scss/roboto/roboto-fontface.css` ### Comment The path should be `media/vendor/roboto-fontface/scss/roboto/roboto-fontface.css` ### This PR This PR corrects the path in fonts-local_roboto.scss
…agination-remove-borders
Fix relative include path to roboto.
fix margin top on first element in sidebar left
…agination-remove-borders
Solve layout problems with search module on mobile - Set a max-width for input on search - Set nowrap for input-group - Correct rounded borders when no search button present (only search input) - Move awesomplete code fron _global.scss to _awesomplete-.scss - Change height of banner module on small displays
…tion-remove-borders Remove the white border on active pagination elements
Change positions of top-main and breadcrumbs
…-demo-styling Remove obsolete demo-styling.scss
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pull Request for Issue # .
Summary of Changes
Testing Instructions
Expected result
Actual result
Documentation Changes Required