Skip to content
This repository was archived by the owner on May 13, 2024. It is now read-only.

Convert testrtc to polymer 1.0 #106

Merged
merged 16 commits into from
Jul 27, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,16 @@
],
"license": "BSD-3-Clause",
"dependencies": {
"polymer": "Polymer/polymer#0.5.5",
"webcomponentsjs": "Polymer/webcomponentsjs#0.5.5",
"core-toolbar": "Polymer/core-toolbar#^0.5.0",
"core-icon-button": "Polymer/core-icon-button#^0.5.0",
"core-icon": "Polymer/core-icon#^0.5.0",
"core-collapse": "Polymer/core-collapse#^0.5.0",
"paper-dialog": "Polymer/paper-dialog#^0.5.0",
"paper-progress": "Polymer/paper-progress#^0.5.0",
"paper-icon-button": "Polymer/paper-icon-button#^0.5.0",
"paper-input": "Polymer/paper-input#^0.5.0",
"paper-button": "Polymer/paper-button#^0.5.0",
"webrtc-adapter": "webrtc/adapter#*"
"polymer": "Polymer/polymer#^1.0.0",
"webrtc-adapter": "webrtc/adapter#~0.1.6",
"paper-toolbar": "PolymerElements/paper-toolbar#~1.0.3",
"iron-icon": "PolymerElements/iron-icon#~1.0.2",
"iron-icons": "PolymerElements/iron-icons#~1.0.3",
"iron-collapse": "PolymerElements/iron-collapse#~1.0.2",
"paper-dialog": "PolymerElements/paper-dialog#~1.0.1",
"paper-progress": "PolymerElements/paper-progress#~1.0.1",
"paper-button": "PolymerElements/paper-button#~1.0.3",
"paper-icon-button": "PolymerElements/paper-icon-button#~1.0.3",
"paper-input": "PolymerElements/paper-input#~1.0.6"
}
}
76 changes: 2 additions & 74 deletions src/css/main.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
* Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
Expand All @@ -10,84 +10,12 @@ body {
font-weight: 300;
}

.title {
height: 60px;
font-size: 18px;
font-weight: 500;
background-color: #4F7DC9;
color: #FFF;
transition: height .2s;
font-family: 'Roboto', sans-serif;
max-width: 40em;
margin: 1em auto 1em auto;
}

#start-button {
line-height: 3em;
background-color: #9E9;
color: #000;
}

div#content {
margin: 0 auto 0 auto;
max-width: 40em;
padding: 1em 1.5em 1.3em 1.5em;
}

/* Test suite style */
core-toolbar.test-suite {
margin-top: 1.5em;
cursor: pointer;
}
core-toolbar.test-suite[state='pending'] {
background-color: #e2e2e2;
}
core-toolbar.test-suite[state='success'] {
background-color: #90ec90;
}
core-toolbar.test-suite[state='warning'] {
background-color: #ecec90;
}
core-toolbar.test-suite[state='failure'] {
background-color: #ec9090;
}

core-toolbar.test-suite + core-collapse {
background-color: #f4f4f4;
padding: 0 0 1em 0;
}

core-toolbar.test-suite core-icon[icon="check"],
core-toolbar.test core-icon[icon="check"] {
color: #080;
}

core-toolbar.test-suite core-icon[icon="close"],
core-toolbar.test core-icon[icon="close"] {
color: #F00;
}

/* Test style */
core-toolbar.test {
cursor: pointer;
background-color: transparent;
height: 2em;
}

core-toolbar.test span {
min-width: 80%;
}

.test-output {
margin: 0 2em 0 2em;
word-wrap: break-word;
}

.test-progress {
display: block;
min-width: 2em;
}

div#content {
/**
* Content has a calculated min-height so it can push the footer considerable
Expand All @@ -104,5 +32,5 @@ footer {
footer a {
color: #666;
text-decoration: none;
padding-left: 27px;
padding-left: 2em;
}
6 changes: 1 addition & 5 deletions src/css/main_nolint.css
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
/*
* Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
* Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree.
*/
/* File to keep rules that fail to parse in csslint, so one can keep the main
* style file under check. */
html /deep/ core-icon[icon="av:videocam-off"] {
color: #888;
}

html /deep/ paper-dialog,
html /deep/ paper-action-dialog {
top: 2em;
Expand Down
44 changes: 8 additions & 36 deletions src/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
* Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
* Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
Expand All @@ -18,8 +18,6 @@

<link rel="icon" type="image/png" href="/images/webrtc-icon-192x192.png" />
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:300,400,500,700">
<link rel="stylesheet" href="css/main.css" />
<link rel="stylesheet" href="css/main_nolint.css" />

<!-- Google Analytics -->
<script>
Expand All @@ -33,30 +31,15 @@
</script>

<script src="../components/webrtc-adapter/adapter.js"></script>
<script src="../components/webcomponentsjs/webcomponents.js"></script>
<link rel="import" href="../components/core-toolbar/core-toolbar.html">
<link rel="import" href="../components/core-icon/core-icon.html">
<link rel="import" href="../components/core-icons/av-icons.html">
<link rel="import" href="../components/core-collapse/core-collapse.html">
<link rel="import" href="../components/paper-dialog/paper-dialog.html">
<link rel="import" href="../components/paper-dialog/paper-dialog-transition.html">
<link rel="import" href="../components/paper-progress/paper-progress.html">
<link rel="import" href="../components/paper-button/paper-button.html">
<link rel="import" href="../components/paper-icon-button/paper-icon-button.html">
<link rel="import" href="ui/line-chart.html">
<link rel="import" href="ui/gum-dialog.html">
<link rel="import" href="ui/report-dialog.html">
<script src="../components/webcomponentsjs/webcomponents-lite.js"></script>

<link rel="import" href="ui/testrtc-main.html">

<link rel="stylesheet" href="css/main.css" />
<link rel="stylesheet" href="css/main_nolint.css" />
</head>
<body unresolved>
<gum-dialog heading="Welcome to WebRTC Troubleshooter"></gum-dialog>

<!-- Title toolbar -->
<core-toolbar class="title">
<span flex>WebRTC Troubleshooter</span>
<paper-icon-button icon="menu" onclick="settingsDialog.toggle()"></paper-icon-button>
<paper-icon-button icon="bug-report" onclick="report.open()"></paper-icon-button>
<paper-button id="start-button" raised disabled>Start</paper-button>
</core-toolbar>
<testrtc-main></testrtc-main>

<!-- Placeholder for dynamically generated test suites. -->
<div id="content"></div>
Expand All @@ -66,17 +49,6 @@
<span><a href="//www.google.com/policies/privacy/">Privacy</a></span>
</footer>

<!-- Settings dialog -->
<paper-dialog id="settings-dialog" heading="Settings" transition="paper-dialog-transition-center">
<div class="select"><label>Audio source: <select id="audioSource"></select></label></div>
<div class="select"><label>Video source: <select id="videoSource"></select></label></div>
</paper-dialog>

<!-- Bug report dialog -->
<report-dialog></report-dialog>

<!-- Add common files after this line. -->
<script src="js/report.js"></script>
<script src="js/main.js"></script>
<script src="js/call.js"></script>
<script src="js/stats.js"></script>
Expand Down
Loading