Merge http://github.com/angular/angular.js into angular

Conflicts:
	.gitignore

1 files changed, 76 insertions, 0 deletions

diff --git a/css/angular-scenario.css b/css/angular-scenario.css
new file mode 100644
index 00000000..3960c357
--- /dev/null
+++ b/css/angular-scenario.css
@@ -0,0 +1,76 @@
+@charset "UTF-8";
+/* CSS Document */
+
+#runner {
+  position: absolute;
+  top:5px;
+  left:10px;
+  right:10px;
+  height: 200px;
+}
+
+.console {
+  display: block;
+  overflow: scroll;
+  height: 200px;
+  border: 1px solid black;
+}
+
+#testView {
+  position: absolute;
+  bottom:10px;
+  top:230px;
+  left:10px;
+  right:10px;
+}
+
+#testView iframe {
+  width: 100%;
+  height: 100%;
+}
+
+li.running > span {
+  background-color: yellow;
+}
+
+#runner span {
+  background-color: green;
+}
+
+#runner .fail > span {
+  background-color: red;
+}
+
+.collapsed > ul {
+  display: none;
+}
+
+//////
+
+.run, .info, .error {
+  display: block;
+  padding: 0 1em;
+  font-family: monospace;
+  white-space: pre;
+}
+
+.run {
+  background-color: lightgrey;
+  padding: 0 .2em;
+}
+
+.run.pass {
+  background-color: lightgreen;
+}
+
+.run.fail {
+  background-color: lightred;
+}
+
+.name, .time, .state {
+  padding-right: 2em;
+}
+
+error {
+  color: red;
+}
\ No newline at end of file