Skip to content

Commit

Permalink
Mise à jour de Materialize CSS à la v1.2.2 (#948)
Browse files Browse the repository at this point in the history
* Upgrade MaterializeCSS to 1.2.2

* Update doc
  • Loading branch information
raphodn authored Aug 8, 2023
1 parent 8e6c749 commit 462ae1c
Show file tree
Hide file tree
Showing 14 changed files with 624 additions and 480 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ _cliquez pour voir l'image en grand_
* PHP 7.4
* Symfony 3.4
* jQuery 3.6
* Materialize 1.2.1
* Materialize 1.2.2
* MySQL/MariaDB

[Guide du développeur](doc/dev.md)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{#
Template for the modal popup used to change the user register for a shift bucket in /booking/admin
It use the materialize modal class https://materializecss.com/modals.html
It use the materialize modal class https://materializeweb.com/modals.html
id = "modal-bucket"
#}
{% set nbBookableShifts = shifts | filter ( shift => not shift.shifter) | length %}
Expand Down
4 changes: 2 additions & 2 deletions app/Resources/views/layout.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>{% block title %}{{ site_name }}{% endblock %}</title>
<link rel="stylesheet" href="{{ asset('bundles/app/materialize/css/materialize-1.2.1.min.css') }}">
<link rel="stylesheet" href="{{ asset('bundles/app/materialize/css/materialize-1.2.2.min.css') }}">
<link rel="stylesheet" href="{{ asset('bundles/app/materialize/iconfont/material-icons.css') }}">
<link rel="stylesheet" href="{{ asset('bundles/app/simplemde/simplemde.min.css') }}"/>
{% block stylesheets %}{% endblock %}
Expand Down Expand Up @@ -73,7 +73,7 @@
{{ render(controller("AppBundle:Default:footer")) }}

<script src="{{ asset('bundles/app/js/jquery-3.6.min.js') }}"></script>
<script src="{{ asset('bundles/app/materialize/js/materialize-1.2.1.min.js') }}"></script>
<script src="{{ asset('bundles/app/materialize/js/materialize-1.2.2.min.js') }}"></script>
<script src="{{ asset('bundles/app/simplemde/simplemde.min.js') }}"></script>
<script src="//cdn.rawgit.com/Mikhus/canvas-gauges/gh-pages/download/2.1.5/radial/gauge.min.js"></script>
<script>
Expand Down
4 changes: 2 additions & 2 deletions app/Resources/views/layoutlight.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>{% block title %}{{ site_name }}{% endblock %}</title>
<link rel="stylesheet" href="{{ asset('bundles/app/materialize/css/materialize-1.2.1.min.css') }}">
<link rel="stylesheet" href="{{ asset('bundles/app/materialize/css/materialize-1.2.2.min.css') }}">
<link rel="stylesheet" href="{{ asset('bundles/app/materialize/iconfont/material-icons.css') }}">
{% block stylesheets %}{% endblock %}
<link rel="stylesheet" href="{{ asset('bundles/app/css/custom.css') }}">
Expand Down Expand Up @@ -42,7 +42,7 @@

</main>
<script src="{{ asset('bundles/app/js/jquery-3.6.min.js') }}"></script>
<script src="{{ asset('bundles/app/materialize/js/materialize-1.2.1.min.js') }}"></script>
<script src="{{ asset('bundles/app/materialize/js/materialize-1.2.2.min.js') }}"></script>
{% block javascripts %}{% endblock %}
</body>
</html>
2 changes: 1 addition & 1 deletion doc/dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Si la dernière commande ne marche pas, vérifiez que vous avez le dossier des g

## Materialize

* [official doc](https://materializecss.com/)
* [official doc](https://materializeweb.com/)

## Docker

Expand Down
2 changes: 1 addition & 1 deletion src/AppBundle/Resources/public/js/app.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$(document).ready(function() {
// initialize Materialize behavior - https://materializecss.com/
// initialize Materialize behavior - https://materializeweb.com/
$('select').formSelect();
// $('datepicker').datepicker(); // see datepicker.js
$('.sidenav').sidenav({
Expand Down
2 changes: 1 addition & 1 deletion src/AppBundle/Resources/public/js/datepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jQuery.extend(jQuery.fn.datepicker.defaults, {
labelYearSelect: 'Sélectionner une année'
});

// https://materializecss.com/pickers.html
// https://materializeweb.com/pickers.html
datepickerSettings = {
format: 'yyyy-mm-dd',
showClearBtn: true,
Expand Down
42 changes: 27 additions & 15 deletions src/AppBundle/Resources/public/materialize/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
</a>
</p>

<h3 align="center">MaterializeCSS</h3>
<h3 align="center">Materialize</h3>

<p align="center">
Materialize, a CSS Framework based on material design.
Materialize, a CSS Framework based on Material Design.
<br>
<a href="https://materializecss.github.io/materialize/"><strong>-- Browse the docs --</strong></a>
<br>
Expand All @@ -24,19 +24,12 @@
<a href="https://gitter.im/materializecss/materialize">
<img src="https://badges.gitter.im/Join%20Chat.svg" alt="Gitter badge">
</a>
<a href="https://opencollective.com/materialize">
<img alt="Open Collective backers and sponsors" src="https://img.shields.io/opencollective/all/materialize">
</a>
</p>

## Table of Contents
- [Quickstart](#quickstart)
- [Documentation](#documentation)
- [Build](#build)
- [Supported Browsers](#supported-browsers)
- [Changelog](#changelog)
- [Testing](#testing)
- [Contributing](#contributing)
- [Copyright and license](#copyright-and-license)

## Quickstart:
## Quickstart
Read the [getting started guide](https://materializecss.github.io/materialize/getting-started.html) for more information on how to use materialize.

- [Download the latest release](https://github.com/materializecss/materialize/releases/latest) of materialize directly from GitHub. ([Beta](https://github.com/materializecss/materialize/releases/))
Expand Down Expand Up @@ -76,7 +69,6 @@ Materialize is compatible with:
- Safari 9+
- Opera
- Edge
- IE 11+

## Changelog
For changelogs, check out [the Releases section of materialize](https://github.com/materializecss/materialize/releases) or the [CHANGELOG.md](CHANGELOG.md).
Expand All @@ -87,5 +79,25 @@ We use Jasmine as our testing framework and we're trying to write a robust test
## Contributing
Check out the [CONTRIBUTING document](CONTRIBUTING.md) in the root of the repository to learn how you can contribute. You can also browse the [help-wanted](https://github.com/materializecss/materialize/labels/help-wanted) tag in our issue tracker to find things to do.

## Sponsors
Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/materialize#sponsor)]

[![OC sponsor 0](https://opencollective.com/materialize/sponsor/0/avatar.svg)](https://opencollective.com/materialize/sponsor/0/website)
[![OC sponsor 1](https://opencollective.com/materialize/sponsor/1/avatar.svg)](https://opencollective.com/materialize/sponsor/1/website)
[![OC sponsor 2](https://opencollective.com/materialize/sponsor/2/avatar.svg)](https://opencollective.com/materialize/sponsor/2/website)
[![OC sponsor 3](https://opencollective.com/materialize/sponsor/3/avatar.svg)](https://opencollective.com/materialize/sponsor/3/website)
[![OC sponsor 4](https://opencollective.com/materialize/sponsor/4/avatar.svg)](https://opencollective.com/materialize/sponsor/4/website)
[![OC sponsor 5](https://opencollective.com/materialize/sponsor/5/avatar.svg)](https://opencollective.com/materialize/sponsor/5/website)
[![OC sponsor 6](https://opencollective.com/materialize/sponsor/6/avatar.svg)](https://opencollective.com/materialize/sponsor/6/website)
[![OC sponsor 7](https://opencollective.com/materialize/sponsor/7/avatar.svg)](https://opencollective.com/materialize/sponsor/7/website)
[![OC sponsor 8](https://opencollective.com/materialize/sponsor/8/avatar.svg)](https://opencollective.com/materialize/sponsor/8/website)
[![OC sponsor 9](https://opencollective.com/materialize/sponsor/9/avatar.svg)](https://opencollective.com/materialize/sponsor/9/website)


## Backers
Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/materialize#backer)]

[![Backers](https://opencollective.com/materialize/backers.svg?width=890)](https://opencollective.com/materialize#backers)

## Copyright and license
Code Copyright 2022 Materialize. Code released under the MIT license.
Code Copyright 2023 Materialize. Code released under the MIT license.

This file was deleted.

Loading

0 comments on commit 462ae1c

Please sign in to comment.