Explorar el Código

removed bootstrap.css from all.css

Skylsmoi hace 6 años
padre
commit
8131296a5c

+ 1 - 1
gulpfile.js Ver fichero

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

+ 1 - 0
tracim/tracim/templates/master_anonymous.mak Ver fichero

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

+ 1 - 0
tracim/tracim/templates/master_authenticated.mak Ver fichero

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