Skip to content

Commit 82bc8b7

Browse files
committed
Merge branch 'dev' of github.com:vuejs/vue into dev
2 parents d0b8dce + 890e68a commit 82bc8b7

File tree

3 files changed

+24
-16
lines changed

3 files changed

+24
-16
lines changed

benchmarks/dbmon/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<html>
33
<head>
44
<meta name="description" content="dbmon vue" />
5-
<link href="./lib/bootstrap.min.css" rel="stylesheet" type="text/css" />
65
<link href="./lib/styles.css" rel="stylesheet" type="text/css" />
76
<title>dbmon (Vue)</title>
87
</head>

benchmarks/dbmon/lib/bootstrap.min.css

Lines changed: 0 additions & 7 deletions
This file was deleted.

benchmarks/dbmon/lib/styles.css

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,26 @@
1-
.Query {
2-
position: relative;
3-
}
1+
body {color:#333;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;margin:0;}
2+
label {display:inline-block;font-weight:700;margin-bottom:5px;}
3+
input[type=range] {display:block;width:100%;}
4+
table {border-collapse:collapse;border-spacing:0;}
5+
:before,:after {box-sizing: border-box;}
46

5-
.Query:hover .popover {
6-
left: -100%;
7-
width: 100%;
8-
display: block;
9-
}
7+
.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;}
8+
.table {width:100%;}
9+
.table-striped > tbody > tr:nth-child(odd) > td,.table-striped > tbody > tr:nth-child(odd) > th {background:#f9f9f9;}
1010

11+
.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;}
12+
.label-success {background-color:#5cb85c;}
13+
.label-warning {background-color:#f0ad4e;}
14+
15+
.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;}
16+
.popover>.arrow:after {border-width:10px;content:"";}
17+
.popover.left {margin-left:-10px;}
18+
.popover.left > .arrow {border-right-width:0;border-left-color:rgba(0,0,0,.25);margin-top:-11px;right:-11px;top:50%;}
19+
.popover.left > .arrow:after {border-left-color:#fff;border-right-width:0;bottom:-10px;content:" ";right:1px;}
20+
.popover > .arrow {border-width:11px;}
21+
.popover > .arrow,.popover>.arrow:after {border-color:transparent;border-style:solid;display:block;height:0;position:absolute;width:0;}
22+
23+
.popover-content {padding:9px 14px;}
24+
25+
.Query {position:relative;}
26+
.Query:hover .popover {display:block;left:-100%;width:100%;}

0 commit comments

Comments
 (0)