Commit 6951b48e authored by Mark Otto's avatar Mark Otto
Browse files

grunt

parent 09a77709
5 merge requests!28721Hot test,!13110Modal caching,!16605Test pull please ignore,!22103test,!25326Adjust examples
Showing with 19 additions and 9 deletions
+19 -9
...@@ -2809,6 +2809,7 @@ table th[class*="col-"] { ...@@ -2809,6 +2809,7 @@ table th[class*="col-"] {
.table-hover > tbody > tr > td.active:hover, .table-hover > tbody > tr > td.active:hover,
.table-hover > tbody > tr > th.active:hover, .table-hover > tbody > tr > th.active:hover,
.table-hover > tbody > tr.active:hover > td, .table-hover > tbody > tr.active:hover > td,
.table-hover > tbody > tr:hover > .active,
.table-hover > tbody > tr.active:hover > th { .table-hover > tbody > tr.active:hover > th {
background-color: #e8e8e8; background-color: #e8e8e8;
} }
...@@ -2831,6 +2832,7 @@ table th[class*="col-"] { ...@@ -2831,6 +2832,7 @@ table th[class*="col-"] {
.table-hover > tbody > tr > td.success:hover, .table-hover > tbody > tr > td.success:hover,
.table-hover > tbody > tr > th.success:hover, .table-hover > tbody > tr > th.success:hover,
.table-hover > tbody > tr.success:hover > td, .table-hover > tbody > tr.success:hover > td,
.table-hover > tbody > tr:hover > .success,
.table-hover > tbody > tr.success:hover > th { .table-hover > tbody > tr.success:hover > th {
background-color: #d0e9c6; background-color: #d0e9c6;
} }
...@@ -2853,6 +2855,7 @@ table th[class*="col-"] { ...@@ -2853,6 +2855,7 @@ table th[class*="col-"] {
.table-hover > tbody > tr > td.info:hover, .table-hover > tbody > tr > td.info:hover,
.table-hover > tbody > tr > th.info:hover, .table-hover > tbody > tr > th.info:hover,
.table-hover > tbody > tr.info:hover > td, .table-hover > tbody > tr.info:hover > td,
.table-hover > tbody > tr:hover > .info,
.table-hover > tbody > tr.info:hover > th { .table-hover > tbody > tr.info:hover > th {
background-color: #c4e3f3; background-color: #c4e3f3;
} }
...@@ -2875,6 +2878,7 @@ table th[class*="col-"] { ...@@ -2875,6 +2878,7 @@ table th[class*="col-"] {
.table-hover > tbody > tr > td.warning:hover, .table-hover > tbody > tr > td.warning:hover,
.table-hover > tbody > tr > th.warning:hover, .table-hover > tbody > tr > th.warning:hover,
.table-hover > tbody > tr.warning:hover > td, .table-hover > tbody > tr.warning:hover > td,
.table-hover > tbody > tr:hover > .warning,
.table-hover > tbody > tr.warning:hover > th { .table-hover > tbody > tr.warning:hover > th {
background-color: #faf2cc; background-color: #faf2cc;
} }
...@@ -2897,6 +2901,7 @@ table th[class*="col-"] { ...@@ -2897,6 +2901,7 @@ table th[class*="col-"] {
.table-hover > tbody > tr > td.danger:hover, .table-hover > tbody > tr > td.danger:hover,
.table-hover > tbody > tr > th.danger:hover, .table-hover > tbody > tr > th.danger:hover,
.table-hover > tbody > tr.danger:hover > td, .table-hover > tbody > tr.danger:hover > td,
.table-hover > tbody > tr:hover > .danger,
.table-hover > tbody > tr.danger:hover > th { .table-hover > tbody > tr.danger:hover > th {
background-color: #ebcccc; background-color: #ebcccc;
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -2136,6 +2136,7 @@ table th[class*="col-"] { ...@@ -2136,6 +2136,7 @@ table th[class*="col-"] {
.table-hover > tbody > tr > td.active:hover, .table-hover > tbody > tr > td.active:hover,
.table-hover > tbody > tr > th.active:hover, .table-hover > tbody > tr > th.active:hover,
.table-hover > tbody > tr.active:hover > td, .table-hover > tbody > tr.active:hover > td,
.table-hover > tbody > tr:hover > .active,
.table-hover > tbody > tr.active:hover > th { .table-hover > tbody > tr.active:hover > th {
background-color: #e8e8e8; background-color: #e8e8e8;
} }
...@@ -2156,6 +2157,7 @@ table th[class*="col-"] { ...@@ -2156,6 +2157,7 @@ table th[class*="col-"] {
.table-hover > tbody > tr > td.success:hover, .table-hover > tbody > tr > td.success:hover,
.table-hover > tbody > tr > th.success:hover, .table-hover > tbody > tr > th.success:hover,
.table-hover > tbody > tr.success:hover > td, .table-hover > tbody > tr.success:hover > td,
.table-hover > tbody > tr:hover > .success,
.table-hover > tbody > tr.success:hover > th { .table-hover > tbody > tr.success:hover > th {
background-color: #d0e9c6; background-color: #d0e9c6;
} }
...@@ -2176,6 +2178,7 @@ table th[class*="col-"] { ...@@ -2176,6 +2178,7 @@ table th[class*="col-"] {
.table-hover > tbody > tr > td.info:hover, .table-hover > tbody > tr > td.info:hover,
.table-hover > tbody > tr > th.info:hover, .table-hover > tbody > tr > th.info:hover,
.table-hover > tbody > tr.info:hover > td, .table-hover > tbody > tr.info:hover > td,
.table-hover > tbody > tr:hover > .info,
.table-hover > tbody > tr.info:hover > th { .table-hover > tbody > tr.info:hover > th {
background-color: #c4e3f3; background-color: #c4e3f3;
} }
...@@ -2196,6 +2199,7 @@ table th[class*="col-"] { ...@@ -2196,6 +2199,7 @@ table th[class*="col-"] {
.table-hover > tbody > tr > td.warning:hover, .table-hover > tbody > tr > td.warning:hover,
.table-hover > tbody > tr > th.warning:hover, .table-hover > tbody > tr > th.warning:hover,
.table-hover > tbody > tr.warning:hover > td, .table-hover > tbody > tr.warning:hover > td,
.table-hover > tbody > tr:hover > .warning,
.table-hover > tbody > tr.warning:hover > th { .table-hover > tbody > tr.warning:hover > th {
background-color: #faf2cc; background-color: #faf2cc;
} }
...@@ -2216,6 +2220,7 @@ table th[class*="col-"] { ...@@ -2216,6 +2220,7 @@ table th[class*="col-"] {
.table-hover > tbody > tr > td.danger:hover, .table-hover > tbody > tr > td.danger:hover,
.table-hover > tbody > tr > th.danger:hover, .table-hover > tbody > tr > th.danger:hover,
.table-hover > tbody > tr.danger:hover > td, .table-hover > tbody > tr.danger:hover > td,
.table-hover > tbody > tr:hover > .danger,
.table-hover > tbody > tr.danger:hover > th { .table-hover > tbody > tr.danger:hover > th {
background-color: #ebcccc; background-color: #ebcccc;
} }
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -1516,7 +1516,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re ...@@ -1516,7 +1516,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
var content = this.getContent() var content = this.getContent()
$tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
$tip.find('.popover-content')[ // we use append for html objects to maintain js events $tip.find('.popover-content').empty()[ // we use append for html objects to maintain js events
this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text' this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
](content) ](content)
......
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment