RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2024-11-22 21:16:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Kevin Brown 2019-07-09 23:24:30 -04:00
commit 03e1b69751
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pages/01.getting-started/01.installation/docs.md
View File

@ -13,8 +13,8 @@ A CDN (content delivery network) is the fastest way to get up and running with S
Select2 is hosted on both the [cdnjs](https://cdnjs.com/libraries/select2) and [jsDelivr](https://www.jsdelivr.com/#!select2) CDNs. Simply include the following lines of code in the `<head>` section of your page: Select2 is hosted on both the [cdnjs](https://cdnjs.com/libraries/select2) and [jsDelivr](https://www.jsdelivr.com/#!select2) CDNs. Simply include the following lines of code in the `<head>` section of your page:
``` ```
<link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/css/select2.min.css" rel="stylesheet" /> <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.7/css/select2.min.css" rel="stylesheet" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/js/select2.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.7/js/select2.min.js"></script>
``` ```
>>> <i class="fa fa-info-circle"></i> Immediately following a new release, it takes some time for CDNs to catch up and get the new versions live on the CDN. >>> <i class="fa fa-info-circle"></i> Immediately following a new release, it takes some time for CDNs to catch up and get the new versions live on the CDN.

2
pages/13.i18n/docs.md
View File

@ -7,7 +7,7 @@ process:
never_cache_twig: true never_cache_twig: true
--- ---
{% do assets.addJs('https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/js/i18n/es.js', 90) %} {% do assets.addJs('https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.7/js/i18n/es.js', 90) %}
## Message translations ## Message translations

4
themes/site/templates/partials/base.html.twig
View File

@ -17,7 +17,7 @@
{% do assets.addCss('theme://css/custom.css',100) %} {% do assets.addCss('theme://css/custom.css',100) %}
{% do assets.addCss('theme://css/font-awesome.min.css',100) %} {% do assets.addCss('theme://css/font-awesome.min.css',100) %}
{% do assets.addCss('theme://css/featherlight.min.css') %} {% do assets.addCss('theme://css/featherlight.min.css') %}
{% do assets.addCss('https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.1/css/select2.min.css') %} {% do assets.addCss('https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.7/css/select2.min.css') %}
{% do assets.addCss('theme://css/s2-docs.css', 100) %} {% do assets.addCss('theme://css/s2-docs.css', 100) %}
{% do assets.addCss('theme://css/theme.css',100) %} {% do assets.addCss('theme://css/theme.css',100) %}
@ -33,7 +33,7 @@
{% block javascripts %} {% block javascripts %}
{% do assets.addJs('jquery',101) %} {% do assets.addJs('jquery',101) %}
{% do assets.addJs('theme://js/modernizr.custom.71422.js',100) %} {% do assets.addJs('theme://js/modernizr.custom.71422.js',100) %}
{% do assets.addJs('https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.1/js/select2.full.min.js', 100) %} {% do assets.addJs('https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.7/js/select2.full.min.js', 100) %}
{% do assets.addJs('https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js', 100) %} {% do assets.addJs('https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js', 100) %}
{% do assets.addJs('theme://js/featherlight.min.js') %} {% do assets.addJs('theme://js/featherlight.min.js') %}
{% do assets.addJs('theme://js/clipboard.min.js') %} {% do assets.addJs('theme://js/clipboard.min.js') %}