Quellcode durchsuchen

Merge pull request #523 from Skylsmoi/master

Bastien Sevajol vor 6 Jahren
Ursprung
Commit
c9b689532a
Es ist kein Account mit dieser Commiter-Email verbunden

+ 1 - 1
gulpfile.js Datei anzeigen

22
 
22
 
23
 const listCssFiles = [
23
 const listCssFiles = [
24
   _srcdir + 'css/default_skin.css',
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
   _srcdir + 'font-awesome-4.2.0/css/font-awesome.css',
26
   _srcdir + 'font-awesome-4.2.0/css/font-awesome.css',
27
   _srcdir + 'select2-4.0.3/css/select2.min.css',
27
   _srcdir + 'select2-4.0.3/css/select2.min.css',
28
   _srcdir + 'css/dashboard.css'
28
   _srcdir + 'css/dashboard.css'

+ 1 - 0
tracim/tracim/templates/master_anonymous.mak Datei anzeigen

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

+ 1 - 0
tracim/tracim/templates/master_authenticated.mak Datei anzeigen

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