Merge pull request #523 from Skylsmoi/master

gulpfile.js

@@ -22,7 +22,7 @@ const _tpldir = 'tracim/tracim/templates/'
 
 const listCssFiles = [
   _srcdir + 'css/default_skin.css',
-  _srcdir + 'css/bootstrap.css',
+  // _srcdir + 'css/bootstrap.css', // Côme - 2018/01/11 - removed to allow easier configuration of theme builder
   _srcdir + 'font-awesome-4.2.0/css/font-awesome.css',
   _srcdir + 'select2-4.0.3/css/select2.min.css',
   _srcdir + 'css/dashboard.css'

tracim/tracim/templates/master_anonymous.mak

@@ -11,6 +11,7 @@
         <meta name="author" content="">
         <link rel="icon" href="/favicon.ico">
 
+        <link href="${tg.url('/assets/css/bootstrap.css')}" rel="stylesheet">
         <link href="${tg.url('/assets/dist/all.css')}" rel="stylesheet">
 
         <script>

tracim/tracim/templates/master_authenticated.mak

@@ -12,6 +12,7 @@
         <meta name="author" content="">
         <link rel="icon" href="/favicon.ico">
 
+        <link href="${tg.url('/assets/css/bootstrap.css')}" rel="stylesheet">
         <link href="${tg.url('/assets/dist/all.css')}" rel="stylesheet">
 
         <script>