DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into staging

Browse source
This commit is contained in:
Xavier J 2016-08-24 15:51:40 +02:00
commit b010b8def1
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/bootstrap_wysihtml5.js vendored
View file

@ -3,6 +3,6 @@ $(document).on('page:load', wysihtml5_active);
function wysihtml5_active (){ function wysihtml5_active (){
$('.wysihtml5').each(function(i, elem) { $('.wysihtml5').each(function(i, elem) {
$(elem).wysihtml5({ toolbar:{ "fa": true } }); $(elem).wysihtml5({ toolbar:{ "fa": true, "link": false, "color": true }, "locale": "fr-FR" });
}); });
} }

2
app/assets/stylesheets/application.scss
View file

@ -18,10 +18,10 @@
*= require leaflet *= require leaflet
*= require font-awesome *= require font-awesome
*= require franceconnect *= require franceconnect
*= require bootstrap-wysihtml5
*/ */
@import "bootstrap-sprockets"; @import "bootstrap-sprockets";
@import "bootstrap"; @import "bootstrap";
@import "bootstrap-wysihtml5/bootstrap3-wysihtml5";
body { body {
background-color: rgb(255, 255, 255); background-color: rgb(255, 255, 255);

2
app/views/dossiers/etapes/_etape1.html.haml
View file

@ -21,4 +21,4 @@
- unless @facade.procedure.lien_site_web.blank? - unless @facade.procedure.lien_site_web.blank?
.center .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'}