Merge branch 'dev' of github.com:vuejs/vue into dev

vuejs · Mar 9, 2017 · 82bc8b7 · 82bc8b7
2 parents d0b8dce + 890e68a
commit 82bc8b7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/benchmarks/dbmon/index.html b/benchmarks/dbmon/index.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <meta name="description" content="dbmon vue" />
-<link href="./lib/bootstrap.min.css" rel="stylesheet" type="text/css" />
 <link href="./lib/styles.css" rel="stylesheet" type="text/css" />
 <title>dbmon (Vue)</title>
 </head>

diff --git a/benchmarks/dbmon/lib/bootstrap.min.css b/benchmarks/dbmon/lib/bootstrap.min.css
diff --git a/benchmarks/dbmon/lib/styles.css b/benchmarks/dbmon/lib/styles.css
@@ -1,10 +1,26 @@
-.Query {
-  position: relative;
-}
+body {color:#333;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;margin:0;}
+label {display:inline-block;font-weight:700;margin-bottom:5px;}
+input[type=range] {display:block;width:100%;}
+table {border-collapse:collapse;border-spacing:0;}
+:before,:after {box-sizing: border-box;}
 
-.Query:hover .popover {
-  left: -100%;
-  width: 100%;
-  display: block;
-}
+.table > thead > tr > th,.table > tbody > tr > th,.table > tfoot > tr > th,.table > thead > tr > td,.table > tbody > tr > td,.table > tfoot > tr > td {border-top:1px solid #ddd;line-height:1.42857143;padding:8px;vertical-align:top;}
+.table {width:100%;}
+.table-striped > tbody > tr:nth-child(odd) > td,.table-striped > tbody > tr:nth-child(odd) > th {background:#f9f9f9;}
 
+.label {border-radius:.25em;color:#fff;display:inline;font-size:75%;font-weight:700;line-height:1;padding:.2em .6em .3em;text-align:center;vertical-align:baseline;white-space:nowrap;}
+.label-success {background-color:#5cb85c;}
+.label-warning {background-color:#f0ad4e;}
+
+.popover {background-color:#fff;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;box-shadow:0 5px 10px rgba(0,0,0,.2);display:none;left:0;max-width:276px;padding:1px;position:absolute;text-align:left;top:0;white-space:normal;z-index:1010;}
+.popover>.arrow:after {border-width:10px;content:"";}
+.popover.left {margin-left:-10px;}
+.popover.left > .arrow {border-right-width:0;border-left-color:rgba(0,0,0,.25);margin-top:-11px;right:-11px;top:50%;}
+.popover.left > .arrow:after {border-left-color:#fff;border-right-width:0;bottom:-10px;content:" ";right:1px;}
+.popover > .arrow {border-width:11px;}
+.popover > .arrow,.popover>.arrow:after {border-color:transparent;border-style:solid;display:block;height:0;position:absolute;width:0;}
+
+.popover-content {padding:9px 14px;}
+
+.Query {position:relative;}
+.Query:hover .popover {display:block;left:-100%;width:100%;}