Merge branch 'zelei.fan_dev'
Showing
79 changed files
with
10 additions
and
10 deletions
7.89 KB
7.83 KB
8.67 KB
924 Bytes
78.2 KB
38.1 KB
97.5 KB
110 KB
83.2 KB
91.7 KB
104 KB
76.4 KB
97.6 KB
103 KB
127 KB
87.7 KB
90.9 KB
82.7 KB
86.3 KB
84.9 KB
77.7 KB
75.3 KB
222 Bytes
1.32 KB
1.33 KB
1.39 KB
1.26 KB
872 Bytes
1.38 KB
1.23 KB
1.35 KB
1.34 KB
1.15 KB
1.37 KB
1.38 KB
1.4 KB
634 Bytes
1.26 KB
1.36 KB
1.23 KB
1.21 KB
1.3 KB
1.35 KB
1.21 KB
951 Bytes
1.39 KB
1.83 KB
1.07 KB
1.39 KB
1.41 KB
2.17 KB
1.8 KB
1.06 KB
1.68 KB
2.54 KB
2.38 KB
1.36 KB
1.59 KB
1.71 KB
1.83 KB
1.74 KB
2.01 KB
2.54 KB
180 Bytes
120 Bytes
105 Bytes
111 Bytes
110 Bytes
107 Bytes
monitor-ui-web/src/main/webapp/img/jquery-ui/ui-bg_highlight-soft_75_cccccc_1x100.png
deleted
100644 → 0
101 Bytes
monitor-ui-web/src/main/webapp/img/jquery-ui/ui-bg_inset-soft_95_fef1ec_1x100.png
deleted
100644 → 0
123 Bytes
@@ -48,8 +48,8 @@ | @@ -48,8 +48,8 @@ | ||
48 | <body> | 48 | <body> |
49 | 49 | ||
50 | <!-- 头部 --> | 50 | <!-- 头部 --> |
51 | - <div id="header"> | ||
52 | - <h1><a href="#">yoho</a></h1> | 51 | + <div id="head"> |
52 | + <h5 style="color: #E0EEE0;font-style:oblique;font-weight:900;font-size:200%;margin-left: 45px;margin-top: 40px;">YOHO</h5> | ||
53 | </div> | 53 | </div> |
54 | 54 | ||
55 | <!-- 左侧菜单项 --> | 55 | <!-- 左侧菜单项 --> |
@@ -107,9 +107,9 @@ | @@ -107,9 +107,9 @@ | ||
107 | </div> | 107 | </div> |
108 | </div> | 108 | </div> |
109 | <div class="modal-footer"> | 109 | <div class="modal-footer"> |
110 | - <button type="button" class="btn btn-default" data-dismiss="modal">关闭 | 110 | + <button type="button" class="btn btn-danger" data-dismiss="modal">关闭 |
111 | </button> | 111 | </button> |
112 | - <button type="submit" class="btn btn-primary" id="addSubmit">提交</button> | 112 | + <button type="submit" class="btn btn-success" id="addSubmit">提交</button> |
113 | </div> | 113 | </div> |
114 | </div> | 114 | </div> |
115 | <!-- /.modal-content --> | 115 | <!-- /.modal-content --> |
@@ -174,9 +174,9 @@ | @@ -174,9 +174,9 @@ | ||
174 | </div> | 174 | </div> |
175 | </div> | 175 | </div> |
176 | <div class="modal-footer"> | 176 | <div class="modal-footer"> |
177 | - <button type="button" class="btn btn-default" data-dismiss="modal">关闭 | 177 | + <button type="button" class="btn btn-danger" data-dismiss="modal">关闭 |
178 | </button> | 178 | </button> |
179 | - <button type="submit" class="btn btn-primary" value="Validate" id="updateSubmit">提交</button> | 179 | + <button type="submit" class="btn btn-success" value="Validate" id="updateSubmit">提交</button> |
180 | </div> | 180 | </div> |
181 | </div> | 181 | </div> |
182 | <!-- /.modal-content --> | 182 | <!-- /.modal-content --> |
@@ -204,10 +204,10 @@ | @@ -204,10 +204,10 @@ | ||
204 | </div> | 204 | </div> |
205 | </div> | 205 | </div> |
206 | </div> | 206 | </div> |
207 | - <button type="button" class="btn btn-default" style="margin-right: auto" data-dismiss="modal">取消 | 207 | + <button type="button" class="btn btn-danger" style="margin-right: auto" data-dismiss="modal">关闭 |
208 | </button> | 208 | </button> |
209 | 209 | ||
210 | - <button type="submit" class="btn btn-primary" style="margin-left: auto" id="deleteSubmit">确认</button> | 210 | + <button type="submit" class="btn btn-success" style="margin-left: auto" id="deleteSubmit">提交</button> |
211 | </div> | 211 | </div> |
212 | </div> | 212 | </div> |
213 | <!-- /.modal-content --> | 213 | <!-- /.modal-content --> |
@@ -247,7 +247,7 @@ | @@ -247,7 +247,7 @@ | ||
247 | var div = $("<div>"); | 247 | var div = $("<div>"); |
248 | 248 | ||
249 | //修改 | 249 | //修改 |
250 | - var editBtn = $("<button data-target='#updateModal' data-toggle='modal'>").addClass("btn btn-primary btn-mini").html("修改").appendTo(div); | 250 | + var editBtn = $("<button data-target='#updateModal' data-toggle='modal'>").addClass("btn btn-xs btn-success").html("修改").appendTo(div); |
251 | editBtn.click(function () { | 251 | editBtn.click(function () { |
252 | updateMObject(rowData); | 252 | updateMObject(rowData); |
253 | }); | 253 | }); |
@@ -257,7 +257,7 @@ | @@ -257,7 +257,7 @@ | ||
257 | div.append(" "); | 257 | div.append(" "); |
258 | 258 | ||
259 | //删除 | 259 | //删除 |
260 | - var delBtn = $("<button data-target='#deleteModal' data-toggle='modal'>").addClass("btn btn-danger btn-mini").html("删除").appendTo(div); | 260 | + var delBtn = $("<button data-target='#deleteModal' data-toggle='modal'>").addClass("btn btn-xs btn-danger").html("删除").appendTo(div); |
261 | delBtn.click(function () { | 261 | delBtn.click(function () { |
262 | deleteMObject(rowData); | 262 | deleteMObject(rowData); |
263 | } | 263 | } |
-
Please register or login to post a comment