... | ... |
@@ -903,10 +903,8 @@ button.close { |
903 | 903 |
|
904 | 904 |
.btn { |
905 | 905 |
display: inline-block; |
906 |
- *display: inline; |
|
907 | 906 |
padding: 4px 12px; |
908 | 907 |
margin-bottom: 0; |
909 |
- *margin-left: .3em; |
|
910 | 908 |
font-size: 14px; |
911 | 909 |
line-height: 20px; |
912 | 910 |
color: #333333; |
... | ... |
@@ -915,7 +913,6 @@ button.close { |
915 | 913 |
vertical-align: middle; |
916 | 914 |
cursor: pointer; |
917 | 915 |
background-color: #f5f5f5; |
918 |
- *background-color: #e6e6e6; |
|
919 | 916 |
background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); |
920 | 917 |
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); |
921 | 918 |
background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); |
... | ... |
@@ -923,19 +920,16 @@ button.close { |
923 | 920 |
background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); |
924 | 921 |
background-repeat: repeat-x; |
925 | 922 |
border: 1px solid #cccccc; |
926 |
- *border: 0; |
|
927 | 923 |
border-color: #e6e6e6 #e6e6e6 #bfbfbf; |
928 | 924 |
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); |
929 | 925 |
border-bottom-color: #b3b3b3; |
930 | 926 |
border-radius: 4px; |
931 | 927 |
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); |
932 | 928 |
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); |
933 |
- *zoom: 1; |
|
934 | 929 |
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); |
935 | 930 |
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); |
936 | 931 |
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); |
937 | 932 |
} |
938 |
- |
|
939 | 933 |
.btn:hover, |
940 | 934 |
.btn:focus, |
941 | 935 |
.btn:active, |
... | ... |
@@ -944,7 +938,6 @@ button.close { |
944 | 938 |
.btn[disabled] { |
945 | 939 |
color: #333333; |
946 | 940 |
background-color: #e6e6e6; |
947 |
- *background-color: #d9d9d9; |
|
948 | 941 |
} |
949 | 942 |
|
950 | 943 |
.btn:active, |
... | ... |
@@ -952,10 +945,6 @@ button.close { |
952 | 945 |
background-color: #cccccc \9; |
953 | 946 |
} |
954 | 947 |
|
955 |
-.btn:first-child { |
|
956 |
- *margin-left: 0; |
|
957 |
-} |
|
958 |
- |
|
959 | 948 |
.btn:hover, |
960 | 949 |
.btn:focus { |
961 | 950 |
color: #333333; |
... | ... |
@@ -1226,87 +1215,22 @@ button.close { |
1226 | 1215 |
float: right; |
1227 | 1216 |
} |
1228 | 1217 |
|
1229 |
-.nav-header { |
|
1230 |
- display: block; |
|
1231 |
- padding: 3px 15px; |
|
1232 |
- font-size: 11px; |
|
1233 |
- font-weight: bold; |
|
1234 |
- line-height: 20px; |
|
1235 |
- color: #999999; |
|
1236 |
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); |
|
1237 |
- text-transform: uppercase; |
|
1238 |
-} |
|
1239 |
- |
|
1240 |
-.nav li + .nav-header { |
|
1241 |
- margin-top: 9px; |
|
1242 |
-} |
|
1243 |
- |
|
1244 |
-.nav-list { |
|
1245 |
- padding-right: 15px; |
|
1246 |
- padding-left: 15px; |
|
1247 |
- margin-bottom: 0; |
|
1248 |
-} |
|
1249 |
- |
|
1250 |
-.nav-list > li > a, |
|
1251 |
-.nav-list .nav-header { |
|
1252 |
- margin-right: -15px; |
|
1253 |
- margin-left: -15px; |
|
1254 |
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); |
|
1255 |
-} |
|
1256 |
- |
|
1257 |
-.nav-list > li > a { |
|
1258 |
- padding: 3px 15px; |
|
1259 |
-} |
|
1260 |
- |
|
1261 |
-.nav-list > .active > a, |
|
1262 |
-.nav-list > .active > a:hover, |
|
1263 |
-.nav-list > .active > a:focus { |
|
1264 |
- color: #ffffff; |
|
1265 |
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); |
|
1266 |
- background-color: #0088cc; |
|
1267 |
-} |
|
1268 |
- |
|
1269 |
-.nav-list [class^="icon-"], |
|
1270 |
-.nav-list [class*=" icon-"] { |
|
1271 |
- margin-right: 2px; |
|
1272 |
-} |
|
1273 |
- |
|
1274 |
-.nav-list .divider { |
|
1275 |
- *width: 100%; |
|
1276 |
- height: 1px; |
|
1277 |
- margin: 9px 1px; |
|
1278 |
- *margin: -5px 0 5px; |
|
1279 |
- overflow: hidden; |
|
1280 |
- background-color: #e5e5e5; |
|
1281 |
- border-bottom: 1px solid #ffffff; |
|
1282 |
-} |
|
1283 |
- |
|
1284 |
-.nav-tabs, |
|
1285 |
-.nav-pills { |
|
1286 |
- *zoom: 1; |
|
1287 |
-} |
|
1288 |
- |
|
1289 | 1218 |
.nav-tabs:before, |
1290 |
-.nav-pills:before, |
|
1291 |
-.nav-tabs:after, |
|
1292 |
-.nav-pills:after { |
|
1219 |
+.nav-tabs:after { |
|
1293 | 1220 |
display: table; |
1294 | 1221 |
line-height: 0; |
1295 | 1222 |
content: ""; |
1296 | 1223 |
} |
1297 | 1224 |
|
1298 |
-.nav-tabs:after, |
|
1299 |
-.nav-pills:after { |
|
1225 |
+.nav-tabs:after { |
|
1300 | 1226 |
clear: both; |
1301 | 1227 |
} |
1302 | 1228 |
|
1303 |
-.nav-tabs > li, |
|
1304 |
-.nav-pills > li { |
|
1229 |
+.nav-tabs > li { |
|
1305 | 1230 |
float: left; |
1306 | 1231 |
} |
1307 | 1232 |
|
1308 |
-.nav-tabs > li > a, |
|
1309 |
-.nav-pills > li > a { |
|
1233 |
+.nav-tabs > li > a { |
|
1310 | 1234 |
padding-right: 12px; |
1311 | 1235 |
padding-left: 12px; |
1312 | 1236 |
margin-right: 2px; |
... | ... |
@@ -1344,21 +1268,6 @@ button.close { |
1344 | 1268 |
border-bottom-color: transparent; |
1345 | 1269 |
} |
1346 | 1270 |
|
1347 |
-.nav-pills > li > a { |
|
1348 |
- padding-top: 8px; |
|
1349 |
- padding-bottom: 8px; |
|
1350 |
- margin-top: 2px; |
|
1351 |
- margin-bottom: 2px; |
|
1352 |
- border-radius: 5px; |
|
1353 |
-} |
|
1354 |
- |
|
1355 |
-.nav-pills > .active > a, |
|
1356 |
-.nav-pills > .active > a:hover, |
|
1357 |
-.nav-pills > .active > a:focus { |
|
1358 |
- color: #ffffff; |
|
1359 |
- background-color: #0088cc; |
|
1360 |
-} |
|
1361 |
- |
|
1362 | 1271 |
.nav-stacked > li { |
1363 | 1272 |
float: none; |
1364 | 1273 |
} |
... | ... |
@@ -1392,22 +1301,10 @@ button.close { |
1392 | 1301 |
border-color: #ddd; |
1393 | 1302 |
} |
1394 | 1303 |
|
1395 |
-.nav-pills.nav-stacked > li > a { |
|
1396 |
- margin-bottom: 3px; |
|
1397 |
-} |
|
1398 |
- |
|
1399 |
-.nav-pills.nav-stacked > li:last-child > a { |
|
1400 |
- margin-bottom: 1px; |
|
1401 |
-} |
|
1402 |
- |
|
1403 | 1304 |
.nav-tabs .dropdown-menu { |
1404 | 1305 |
border-radius: 0 0 6px 6px; |
1405 | 1306 |
} |
1406 | 1307 |
|
1407 |
-.nav-pills .dropdown-menu { |
|
1408 |
- border-radius: 6px; |
|
1409 |
-} |
|
1410 |
- |
|
1411 | 1308 |
.nav .dropdown-toggle .caret { |
1412 | 1309 |
margin-top: 6px; |
1413 | 1310 |
border-top-color: #0088cc; |
... | ... |
@@ -1420,8 +1317,6 @@ button.close { |
1420 | 1317 |
border-bottom-color: #005580; |
1421 | 1318 |
} |
1422 | 1319 |
|
1423 |
-/* move down carets for tabs */ |
|
1424 |
- |
|
1425 | 1320 |
.nav-tabs .dropdown-toggle .caret { |
1426 | 1321 |
margin-top: 8px; |
1427 | 1322 |
} |
... | ... |
@@ -1442,7 +1337,6 @@ button.close { |
1442 | 1337 |
} |
1443 | 1338 |
|
1444 | 1339 |
.nav-tabs .open .dropdown-toggle, |
1445 |
-.nav-pills .open .dropdown-toggle, |
|
1446 | 1340 |
.nav > li.dropdown.open.active > a:hover, |
1447 | 1341 |
.nav > li.dropdown.open.active > a:focus { |
1448 | 1342 |
color: #ffffff; |
... | ... |
@@ -1460,128 +1354,18 @@ button.close { |
1460 | 1354 |
filter: alpha(opacity=100); |
1461 | 1355 |
} |
1462 | 1356 |
|
1463 |
-.tabs-stacked .open > a:hover, |
|
1464 |
-.tabs-stacked .open > a:focus { |
|
1465 |
- border-color: #999999; |
|
1466 |
-} |
|
1467 |
- |
|
1468 |
-.tabbable { |
|
1469 |
- *zoom: 1; |
|
1470 |
-} |
|
1471 |
- |
|
1472 |
-.tabbable:before, |
|
1473 |
-.tabbable:after { |
|
1474 |
- display: table; |
|
1475 |
- line-height: 0; |
|
1476 |
- content: ""; |
|
1477 |
-} |
|
1478 |
- |
|
1479 |
-.tabbable:after { |
|
1480 |
- clear: both; |
|
1481 |
-} |
|
1482 |
- |
|
1483 | 1357 |
.tab-content { |
1484 | 1358 |
overflow: auto; |
1485 | 1359 |
} |
1486 | 1360 |
|
1487 |
-.tabs-below > .nav-tabs, |
|
1488 |
-.tabs-right > .nav-tabs, |
|
1489 |
-.tabs-left > .nav-tabs { |
|
1490 |
- border-bottom: 0; |
|
1491 |
-} |
|
1492 |
- |
|
1493 |
-.tab-content > .tab-pane, |
|
1494 |
-.pill-content > .pill-pane { |
|
1361 |
+.tab-content > .tab-pane { |
|
1495 | 1362 |
display: none; |
1496 | 1363 |
} |
1497 | 1364 |
|
1498 |
-.tab-content > .active, |
|
1499 |
-.pill-content > .active { |
|
1365 |
+.tab-content > .active { |
|
1500 | 1366 |
display: block; |
1501 | 1367 |
} |
1502 | 1368 |
|
1503 |
-.tabs-below > .nav-tabs { |
|
1504 |
- border-top: 1px solid #ddd; |
|
1505 |
-} |
|
1506 |
- |
|
1507 |
-.tabs-below > .nav-tabs > li { |
|
1508 |
- margin-top: -1px; |
|
1509 |
- margin-bottom: 0; |
|
1510 |
-} |
|
1511 |
- |
|
1512 |
-.tabs-below > .nav-tabs > li > a { |
|
1513 |
- border-radius: 0 0 4px 4px; |
|
1514 |
-} |
|
1515 |
- |
|
1516 |
-.tabs-below > .nav-tabs > li > a:hover, |
|
1517 |
-.tabs-below > .nav-tabs > li > a:focus { |
|
1518 |
- border-top-color: #ddd; |
|
1519 |
- border-bottom-color: transparent; |
|
1520 |
-} |
|
1521 |
- |
|
1522 |
-.tabs-below > .nav-tabs > .active > a, |
|
1523 |
-.tabs-below > .nav-tabs > .active > a:hover, |
|
1524 |
-.tabs-below > .nav-tabs > .active > a:focus { |
|
1525 |
- border-color: transparent #ddd #ddd #ddd; |
|
1526 |
-} |
|
1527 |
- |
|
1528 |
-.tabs-left > .nav-tabs > li, |
|
1529 |
-.tabs-right > .nav-tabs > li { |
|
1530 |
- float: none; |
|
1531 |
-} |
|
1532 |
- |
|
1533 |
-.tabs-left > .nav-tabs > li > a, |
|
1534 |
-.tabs-right > .nav-tabs > li > a { |
|
1535 |
- min-width: 74px; |
|
1536 |
- margin-right: 0; |
|
1537 |
- margin-bottom: 3px; |
|
1538 |
-} |
|
1539 |
- |
|
1540 |
-.tabs-left > .nav-tabs { |
|
1541 |
- float: left; |
|
1542 |
- margin-right: 19px; |
|
1543 |
- border-right: 1px solid #ddd; |
|
1544 |
-} |
|
1545 |
- |
|
1546 |
-.tabs-left > .nav-tabs > li > a { |
|
1547 |
- margin-right: -1px; |
|
1548 |
- border-radius: 4px 0 0 4px; |
|
1549 |
-} |
|
1550 |
- |
|
1551 |
-.tabs-left > .nav-tabs > li > a:hover, |
|
1552 |
-.tabs-left > .nav-tabs > li > a:focus { |
|
1553 |
- border-color: #eeeeee #dddddd #eeeeee #eeeeee; |
|
1554 |
-} |
|
1555 |
- |
|
1556 |
-.tabs-left > .nav-tabs .active > a, |
|
1557 |
-.tabs-left > .nav-tabs .active > a:hover, |
|
1558 |
-.tabs-left > .nav-tabs .active > a:focus { |
|
1559 |
- border-color: #ddd transparent #ddd #ddd; |
|
1560 |
-} |
|
1561 |
- |
|
1562 |
-.tabs-right > .nav-tabs { |
|
1563 |
- float: right; |
|
1564 |
- margin-left: 19px; |
|
1565 |
- border-left: 1px solid #ddd; |
|
1566 |
-} |
|
1567 |
- |
|
1568 |
-.tabs-right > .nav-tabs > li > a { |
|
1569 |
- margin-left: -1px; |
|
1570 |
- border-radius: 0 4px 4px 0; |
|
1571 |
-} |
|
1572 |
- |
|
1573 |
-.tabs-right > .nav-tabs > li > a:hover, |
|
1574 |
-.tabs-right > .nav-tabs > li > a:focus { |
|
1575 |
- border-color: #eeeeee #eeeeee #eeeeee #dddddd; |
|
1576 |
-} |
|
1577 |
- |
|
1578 |
-.tabs-right > .nav-tabs .active > a, |
|
1579 |
-.tabs-right > .nav-tabs .active > a:hover, |
|
1580 |
-.tabs-right > .nav-tabs .active > a:focus { |
|
1581 |
- border-color: #ddd #ddd #ddd transparent; |
|
1582 |
- *border-left-color: #ffffff; |
|
1583 |
-} |
|
1584 |
- |
|
1585 | 1369 |
/* bread */ |
1586 | 1370 |
.breadcrumb { |
1587 | 1371 |
margin-bottom:10px; |