Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
author: hwc487 2012-05-11 13:52:55 -0700
committer: hwc487 2012-05-11 13:52:55 -0700
commit: 137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
tree: e9fa109fc65218f45e386df48b713ff5858f3d62 /imports/codemirror/mode/less/index.html
parent: d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff)
parent: 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
download: ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz
1 files changed, 27 insertions, 12 deletions
diff --git a/imports/codemirror/mode/less/index.html b/imports/codemirror/mode/less/index.html
index bd3ef198..f7705205 100644
--- a/imports/codemirror/mode/less/index.html
+++ b/imports/codemirror/mode/less/index.html
@@ -7,23 +7,36 @@
    <script src="less.js"></script>
    <style>.CodeMirror {background: #f8f8f8; border: 1px solid #ddd;}</style>
    <link rel="stylesheet" href="../../doc/docs.css">
+    <link rel="stylesheet" href="../../theme/lesser-dark.css">
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  </head>
  <body>
    <h1>CodeMirror: LESS mode</h1>
-    <form><textarea id="code" name="code">
+    <form><textarea id="code" name="code">/* Some LESS code */
-/* Some LESS code */
-video {
+@test_a: #eeeQQQ;//this is not a valid hex value and thus parsed as an element id
-  background-image:url('paper.gif');
+@test_b: #eeeFFF//this is a valid hex value but the declaration doesn't end with a semicolon and thus parsed as an element id
+#eee aaa .box
+{
+  #test bbb {
+    width: 500px;
+    height: 250px;
+    background-image: url(sheep.png), url(betweengrassandsky.png);
+    background-position: center bottom, left top;
+    background-repeat: no-repeat;
+  }
 }
-.pre_class {
+@base: #f938ab;
-  width: 500px;
-  height: 250px;
+.box-shadow(@style, @c) when (iscolor(@c)) {
-  background-image: url(sheep.png), url(betweengrassandsky.png);
+  box-shadow:         @style @c;
-  background-position: center bottom, left top;
+  -webkit-box-shadow: @style @c;
-  background-repeat: no-repeat;
+  -moz-box-shadow:    @style @c;
+}
+.box-shadow(@style, @alpha: 50%) when (isnumber(@alpha)) {
+  .box-shadow(@style, rgba(0, 0, 0, @alpha));
 }
 @color: #4D926F;
@@ -171,7 +184,7 @@ blockquote {
 body > footer {
  text-align: left;
  margin-left: 10px;
-        font-style: italic;
+  font-style: italic;
  font-size: 18px;
  color: #888;
 }
@@ -580,7 +593,9 @@ td {
 }
 </textarea></form>
    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        theme: "lesser-dark"
+      });
    </script>
    <p><strong>MIME types defined:</strong> <code>text/less</code>.</p>
author	hwc487	2012-05-11 13:52:55 -0700
committer	hwc487	2012-05-11 13:52:55 -0700
commit	137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
tree	e9fa109fc65218f45e386df48b713ff5858f3d62 /imports/codemirror/mode/less/index.html
parent	d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff)
parent	27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
download	ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz

diff --git a/imports/codemirror/mode/less/index.html b/imports/codemirror/mode/less/index.html index bd3ef198..f7705205 100644 --- a/imports/codemirror/mode/less/index.html +++ b/imports/codemirror/mode/less/index.html
@@ -7,23 +7,36 @@
7	<script src="less.js"></script>	7	<script src="less.js"></script>
8	<style>.CodeMirror {background: #f8f8f8; border: 1px solid #ddd;}</style>	8	<style>.CodeMirror {background: #f8f8f8; border: 1px solid #ddd;}</style>
9	<link rel="stylesheet" href="../../doc/docs.css">	9	<link rel="stylesheet" href="../../doc/docs.css">
		10	<link rel="stylesheet" href="../../theme/lesser-dark.css">
10	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">	11	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
11	</head>	12	</head>
12	<body>	13	<body>
13	<h1>CodeMirror: LESS mode</h1>	14	<h1>CodeMirror: LESS mode</h1>
14	<form><textarea id="code" name="code">	15	<form><textarea id="code" name="code">/* Some LESS code */
15	/* Some LESS code */
16		16
17	video {	17	@test_a: #eeeQQQ;//this is not a valid hex value and thus parsed as an element id
18	background-image:url('paper.gif');	18	@test_b: #eeeFFF//this is a valid hex value but the declaration doesn't end with a semicolon and thus parsed as an element id
		19
		20	#eee aaa .box
		21	{
		22	#test bbb {
		23	width: 500px;
		24	height: 250px;
		25	background-image: url(sheep.png), url(betweengrassandsky.png);
		26	background-position: center bottom, left top;
		27	background-repeat: no-repeat;
		28	}
19	}	29	}
20		30
21	.pre_class {	31	@base: #f938ab;
22	width: 500px;	32
23	height: 250px;	33	.box-shadow(@style, @c) when (iscolor(@c)) {
24	background-image: url(sheep.png), url(betweengrassandsky.png);	34	box-shadow: @style @c;
25	background-position: center bottom, left top;	35	-webkit-box-shadow: @style @c;
26	background-repeat: no-repeat;	36	-moz-box-shadow: @style @c;
		37	}
		38	.box-shadow(@style, @alpha: 50%) when (isnumber(@alpha)) {
		39	.box-shadow(@style, rgba(0, 0, 0, @alpha));
27	}	40	}
28		41
29	@color: #4D926F;	42	@color: #4D926F;
@@ -171,7 +184,7 @@ blockquote {
171	body > footer {	184	body > footer {
172	text-align: left;	185	text-align: left;
173	margin-left: 10px;	186	margin-left: 10px;
174	font-style: italic;	187	font-style: italic;
175	font-size: 18px;	188	font-size: 18px;
176	color: #888;	189	color: #888;
177	}	190	}
@@ -580,7 +593,9 @@ td {
580	}	593	}
581	</textarea></form>	594	</textarea></form>
582	<script>	595	<script>
583	var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});	596	var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
		597	theme: "lesser-dark"
		598	});
584	</script>	599	</script>
585		600
586	<p><strong>MIME types defined:</strong> <code>text/less</code>.</p>	601	<p><strong>MIME types defined:</strong> <code>text/less</code>.</p>