首頁 探索 說明
登入
SmartCost
/
ConstructionCost
2
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

更新bootstrap 4.0 beta

MaiXinRong 7 年之前
父節點
792db413fa
當前提交
1c7638d4a9
共有 17 個文件被更改，包括 41 次插入 和 41 次删除
分割檢視 顯示文件統計
  1. 2 2
      config/gulpConfig.js
  2. 2 3
      lib/bootstrap/bootstrap.min.js
  3. 3 2
      lib/bootstrap/css/bootstrap.min.css
  4. 4 0
      lib/jquery/jquery-3.2.1.slim.min.js
  5. 0 4
      lib/jquery/jquery.min.js
  6. 0 1
      lib/tether/tether.min.js
  7. 3 3
      web/building_saas/complementary_glj_lib/html/tools-gongliaoji.html
  8. 4 3
      web/building_saas/main/html/main.html
  9. 1 1
      web/building_saas/main/js/views/calc_program_view.js
  10. 3 3
      web/building_saas/pm/html/project-management.html
  11. 4 4
      web/common/html/header.html
  12. 2 2
      web/src/html/pm/project-management.html
  13. 5 5
      web/users/html/login-infoinput.html
  14. 2 2
      web/users/html/login.html
  15. 2 2
      web/users/html/user-info.html
  16. 2 2
      web/users/html/user-safe.html
  17. 2 2
      web/users/html/user-set.html

+ 2 - 2
config/gulpConfig.js
查看文件 

@@ -5,8 +5,8 @@
 
 module.exports = {
 
     version:'1.0.1',
 
     common_jspaths:[
 
-        'lib/jquery/jquery.min.js',
 
-        'lib/tether/tether.min.js',
 
+        'lib/jquery/jquery-3.2.1.slim.min.js',
 
+        'lib/popper/popper.min.js',
 
         'lib/bootstrap/bootstrap.min.js',
 
         'web/building_saas/js/*.js'
 
     ],

文件差異過大導致無法顯示
+ 2 - 3
lib/bootstrap/bootstrap.min.js


文件差異過大導致無法顯示
+ 3 - 2
lib/bootstrap/css/bootstrap.min.css


文件差異過大導致無法顯示
+ 4 - 0
lib/jquery/jquery-3.2.1.slim.min.js


文件差異過大導致無法顯示
+ 0 - 4
lib/jquery/jquery.min.js


文件差異過大導致無法顯示
+ 0 - 1
lib/tether/tether.min.js


+ 3 - 3
web/building_saas/complementary_glj_lib/html/tools-gongliaoji.html
查看文件 

@@ -20,7 +20,7 @@
 
 <body>
 
     <div class="header">
 
         <%include ../../../common/html/header.html %>
 
-        <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
 
+        <nav class="navbar navbar-expand-lg justify-content-between navbar-light p-0">
 
             <ul class="nav navbar-nav px-1">
 
                 <li class="nav-item">
 
                     <a class="nav-link" href="#" aria-expanded="false"><i class="fa fa-sliders"></i> 选项</a>
 
@@ -176,10 +176,10 @@
 
         </div>
 
     </div>
 
     <!-- JS. -->
 
-    <script src="/lib/jquery/jquery.min.js"></script>
 
+    <script src="/lib/jquery/jquery-3.2.1.slim.min.js"></script>
 
     <script src="/lib/jquery-contextmenu/jquery.contextMenu.min.js"></script>
 
     <script src="/lib/jquery-contextmenu/jquery.ui.position.js"></script>
 
-    <script src="/lib/tether/tether.min.js"></script>
 
+    <script src="/lib/popper/popper.min.js"></script>
 
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
 
     <script src="/web/building_saas/js/global.js"></script>
 
     <!-- zTree -->

+ 4 - 3
web/building_saas/main/html/main.html
查看文件 

@@ -36,7 +36,7 @@
 
             </div>
 
         </div>
 
         <%include ../../../common/html/header.html %>
 
-        <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
 
+        <nav class="navbar navbar-expand-lg justify-content-between navbar-light p-0">
 
             <ul class="nav navbar-nav px-1">
 
                 <li class="nav-item">
 
                     <a class="nav-link" href="#" aria-expanded="false" data-toggle="modal" data-target="#poj-set"><i class="fa fa-cube"></i> 项目属性</a>
 
@@ -99,7 +99,7 @@
 
                     <a href="javascript:void(0)" class="btn btn-sm" id="downMove"><i class="fa fa-arrow-down" aria-hidden="true"></i> 下移</a>
 
                     <a href="javascript:void(0)" class="btn btn-sm" id="upMove"><i class="fa fa-arrow-up" aria-hidden="true"></i> 上移</a>
 
                   </div>
 
-                  <div>
 
+                  <div class="tools-btn">
 
                       <a href="javacript:void(0);" data-toggle="modal" data-target="#column" class="btn btn-sm"><i class="fa fa-table" aria-hidden="true"></i> 列设置</a>
 
                   </div>
 
                   <div class="side-tabs">
 
@@ -631,7 +631,8 @@
 
     <script type="text/javascript" src="/web/building_saas/main/js/views/calc_program_manage.js"></script>
 
 
     <!-- JS. -->
 
-    <script src="/lib/tether/tether.min.js"></script>
 
+    <script src="js/jquery/jquery-3.2.1.slim.min.js"></script>
 
+    <script src="js/popper/popper.min.js"></script>
 
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
 
     <script src="/web/building_saas/js/global.js"></script>

+ 1 - 1
web/building_saas/main/js/views/calc_program_view.js
查看文件 

@@ -227,7 +227,7 @@ let calcProgramObj = {
 
         me.treeNode = treeNode;
 
         if (treeNode.sourceType === projectObj.project.Ration.getSourceType()) {
 
             projectObj.project.calcProgram.calculate(treeNode);
 
-           if (treeNode.parent) {
 
+            if (treeNode.parent) {
 
                 projectObj.converseCalculateBills(treeNode.parent);
 
             }
 
             me.datas = me.treeNode.data.calcTemplate.calcItems;

+ 3 - 3
web/building_saas/pm/html/project-management.html
查看文件 

@@ -40,7 +40,7 @@
 
         </div>
 
     </div>
 
     <%include ../../../common/html/header.html %>
 
-    <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
 
+    <nav class="navbar navbar-expand-lg justify-content-between navbar-light p-0">
 
         <ul class="nav navbar-nav px-1">
 
             <li class="nav-item dropdown">
 
                 <a class="nav-link dropdown-toggle" href="http://example.com" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">文件</a>
 
@@ -496,8 +496,8 @@
 
 </div>
 
 <!-- JS. -->
 
 <!-- inject:js -->
 
-<script src="/lib/jquery/jquery.min.js"></script>
 
-<script src="/lib/tether/tether.min.js"></script>
 
+<script src="/lib/jquery/jquery-3.2.1.slim.min.js"></script>
 
+<script src="/lib/popper/popper.min.js"></script>
 
 <script src="/lib/bootstrap/bootstrap.min.js"></script>
 
 <script src="/web/building_saas/js/global.js"></script>
 
 <script src="/public/web/date_util.js"></script>

+ 4 - 4
web/common/html/header.html
查看文件 

@@ -1,12 +1,12 @@
 
-<nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
 
+<nav class="navbar navbar-expand-lg navbar-light bg-light p-0 justify-content-between">
 
     <span class="header-logo px-2">Smartcost</span>
 
     <div class="navbar-text navbar-crumb p-0" id="fullpath">
 
         <% if (action !== 'index' || controller !== 'pm') {%>
 
         <span class="text-truncate"><a href="/pm">项目管理</a></span>
 
         <% } %>
 
     </div>
 
-    <div class="float-lg-right navbar-text pt-0">
 
-        <div class="dropdown d-inline-block">
 
+    <div class="float-lg-right navbar-text p-0">
 
+        <div class="dropdown d-inline-block navbar-nav">
 
             <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><%= sessionUser.email %></button>
 
             <div class="dropdown-menu dropdown-menu-right">
 
                 <a class="dropdown-item" href="/user/info" target="_blank">账号资料</a>
 
@@ -58,7 +58,7 @@
 
     </div>
 
 </div>
 
 <!-- inject:js -->
 
-<script src="/lib/jquery/jquery.min.js"></script>
 
+<script src="/lib/jquery/jquery-3.2.1.slim.min.js"></script>
 
 <script type="text/javascript" src="/web/building_saas/js/moment.min.js"></script>
 
 <script type="text/javascript" src="/web/building_saas/js/message.js"></script>
 
 <!-- endinject -->

+ 2 - 2
web/src/html/pm/project-management.html
查看文件 

@@ -40,7 +40,7 @@
 
         </div>
 
     </div>
 
     <%include ../../../common/html/header.html %>
 
-    <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
 
+    <nav class="navbar navbar-expand-lg justify-content-between navbar-light p-0">
 
         <ul class="nav navbar-nav px-1">
 
             <li class="nav-item dropdown">
 
                 <a class="nav-link dropdown-toggle" href="http://example.com" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">文件</a>
 
@@ -496,7 +496,7 @@
 
 </div>
 
 <!-- JS. -->
 
 <!-- inject:js -->
 
-<script src="/lib/tether/tether.min.js"></script>
 
+<script src="/lib/popper/popper.min.js"></script>
 
 <script src="/lib/bootstrap/bootstrap.min.js"></script>
 
 <script src="/web/building_saas/js/global.js"></script>
 
 <script src="/public/web/date_util.js"></script>

+ 5 - 5
web/users/html/login-infoinput.html
查看文件 

@@ -17,13 +17,13 @@
 
 </div>
 
 <div class="container mt-3">
 
     <form class="row" method="post" action="/user/info" id="info-form">
 
-        <div class="col-lg-8 offset-lg-2">
 
+        <div class="col-lg-8 m-auto">
 
             <div class="card newuser-input">
 
-                <div class="card-block">
 
+                <div class="card-body">
 
                     <h4 class="card-title">在开始使用前，请填写以下信息。</h4>
 
                     <h6 class="card-subtitle text-muted">详细填写这些信息，可以让我们更好的服务您。</h6>
 
                 </div>
 
-                <div class="card-block">
 
+                <div class="card-body">
 
                     <div class="form-group">
 
                         <input class="form-control" placeholder="你的姓名" name="real_name" id="name">
 
                     </div>
 
@@ -69,8 +69,8 @@
 
     </form>
 
 </div>
 
 <!-- JS. -->
 
-<script src="/lib/jquery/jquery.min.js"></script>
 
-<script src="/lib/tether/tether.min.js"></script>
 
+<script src="/lib/jquery/jquery-3.2.1.slim.min.js"></script>
 
+<script src="/lib/popper/popper.min.js"></script>
 
 <script src="/lib/bootstrap/bootstrap.min.js"></script>
 
 <script src="/web/building_saas/js/global.js"></script>
 
 <script src="/web/users/js/user.js"></script>

+ 2 - 2
web/users/html/login.html
查看文件 

@@ -69,9 +69,9 @@
 
     </div>
 
     <!-- JS. -->
 
     <!-- inject:js -->
 
-    <script src="/lib/jquery/jquery.min.js"></script>
 
+    <script src="/lib/jquery/jquery-3.2.1.slim.min.js"></script>
 
     <script src="/public/web/url_util.js"></script>
 
-    <script src="/lib/tether/tether.min.js"></script>
 
+    <script src="/lib/popper/popper.min.js"></script>
 
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
 
     <script src="/web/building_saas/js/global.js"></script>
 
     <script type="text/javascript" src="/web/users/js/login.js"></script>

+ 2 - 2
web/users/html/user-info.html
查看文件 

@@ -84,8 +84,8 @@
 
     </div>
 
 </div>
 
 <!-- JS. -->
 
-<script src="/lib/jquery/jquery.min.js"></script>
 
-<script src="/lib/tether/tether.min.js"></script>
 
+<script src="/lib/jquery/jquery-3.2.1.slim.min.js"></script>
 
+<script src="/lib/popper/popper.min.js"></script>
 
 <script src="/lib/bootstrap/bootstrap.min.js"></script>
 
 <script src="/web/building_saas/js/global.js"></script>
 
 <script src="/web/users/js/user.js"></script>

+ 2 - 2
web/users/html/user-safe.html
查看文件 

@@ -10,8 +10,8 @@
 
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
 
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
 
     <!-- JS. -->
 
-    <script src="/lib/jquery/jquery.min.js"></script>
 
-    <script src="/lib/tether/tether.min.js"></script>
 
+    <script src="/lib/jquery/jquery-3.2.1.slim.min.js"></script>
 
+    <script src="/lib/popper/popper.min.js"></script>
 
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
 
     <script type="text/javascript" src="/lib/bootstrap/bootstrap-paginator.js"></script>
 
     <script src="/web/building_saas/js/global.js"></script>

+ 2 - 2
web/users/html/user-set.html
查看文件 

@@ -78,8 +78,8 @@
 
         </div>
 
     </div>
 
     <!-- JS. -->
 
-    <script src="/lib/jquery/jquery.min.js"></script>
 
-    <script src="/lib/tether/tether.min.js"></script>
 
+    <script src="/lib/jquery/jquery-3.2.1.slim.min.js"></script>
 
+    <script src="/lib/popper/popper.min.js"></script>
 
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
 
     <script src="/web/building_saas/js/global.js"></script>
 
 </body>