Merge branch 'develop' into staging
This commit is contained in:
commit
b010b8def1
3 changed files with 3 additions and 3 deletions
|
@ -3,6 +3,6 @@ $(document).on('page:load', wysihtml5_active);
|
|||
|
||||
function wysihtml5_active (){
|
||||
$('.wysihtml5').each(function(i, elem) {
|
||||
$(elem).wysihtml5({ toolbar:{ "fa": true } });
|
||||
$(elem).wysihtml5({ toolbar:{ "fa": true, "link": false, "color": true }, "locale": "fr-FR" });
|
||||
});
|
||||
}
|
|
@ -18,10 +18,10 @@
|
|||
*= require leaflet
|
||||
*= require font-awesome
|
||||
*= require franceconnect
|
||||
*= require bootstrap-wysihtml5
|
||||
*/
|
||||
@import "bootstrap-sprockets";
|
||||
@import "bootstrap";
|
||||
@import "bootstrap-wysihtml5/bootstrap3-wysihtml5";
|
||||
|
||||
body {
|
||||
background-color: rgb(255, 255, 255);
|
||||
|
|
|
@ -21,4 +21,4 @@
|
|||
|
||||
- unless @facade.procedure.lien_site_web.blank?
|
||||
.center
|
||||
=link_to truncate(@facade.procedure.lien_site_web, length: 40), @facade.procedure.lien_site_web, {target: '_blank'}
|
||||
=link_to 'En savoir plus ...', @facade.procedure.lien_site_web, {target: '_blank'}
|
Loading…
Reference in a new issue