瀏覽代碼

added use of all.js and all.css in login page + added missing class in sidebarleft

Skylsmoi 8 年之前
父節點
當前提交
fe5d2101d0

+ 4 - 6
tracim/tracim/templates/master_anonymous.mak 查看文件

@@ -10,9 +10,9 @@
10 10
         <meta name="description" content="">
11 11
         <meta name="author" content="">
12 12
         <link rel="icon" href="/favicon.ico">
13
-        <link href="${tg.url('/assets/css/bootstrap.min.css')}" rel="stylesheet">
14
-        <link href="${tg.url('/assets/css/dashboard.css')}" rel="stylesheet">
15
-        <link href="${tg.url('/assets/font-awesome-4.2.0/css/font-awesome.css')}" rel="stylesheet">
13
+
14
+        <link href="${tg.url('/assets/dist/all.css')}" rel="stylesheet">
15
+
16 16
         <script>
17 17
           globalTracimLang = 'fr_FR'
18 18
         </script>
@@ -34,9 +34,7 @@
34 34
         </div>
35 35
         ${self.footer()}
36 36
 
37
-        <script src="${tg.url('/assets/js/bootstrap.min.js')}"></script>
38
-        <script src="${tg.url('/assets/js/trad.js')}"></script>
39
-        <script src="${tg.url('/assets/js/main.js')}"></script>
37
+        <script src="${tg.url('/assets/dist/all.js')}"></script>
40 38
         ## HACK - D.A. - 2014-10-21
41 39
         ##
42 40
         ## The following JS "hack" is intended to make TG2 flash messages compatible with bootstrap alert classes

+ 1 - 1
tracim/tracim/templates/master_authenticated_left_treeview.mak 查看文件

@@ -18,7 +18,7 @@
18 18
 
19 19
 <%def name="content_wrapper()">
20 20
     ## SIDEBAR LEFT
21
-    <div id="sidebar-left" class="sidebar">
21
+    <div id="sidebar-left" class="sidebar bg-primary">
22 22
         <div class="btn-group" style="position: absolute; right: 2px; top: 4px; ">
23 23
             <button id="toggle-left-sidebar-width" type="button" class="btn btn-link"><i class="fa fa-angle-double-right"></i></button>
24 24
         </div>