Merge branch 'master' into brushtool

Conflicts:
	js/controllers/elements/shapes-controller.js

1 files changed, 47 insertions, 0 deletions

diff --git a/node_modules/montage/examples/youtube-channel-example/style.css b/node_modules/montage/examples/youtube-channel-example/style.css
new file mode 100755
index 00000000..c281cd65
--- /dev/null
+++ b/node_modules/montage/examples/youtube-channel-example/style.css
@@ -0,0 +1,47 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
+
+/* Base ----------------------------- */
+
+html {
+    background-color: hsl(0,0%,85%);
+    height: 100%;
+}
+
+body {
+    margin: 0;
+    width: 100%;
+    height: 100%;
+    display: -webkit-box;
+    -webkit-box-align: center;
+    -webkit-box-pack: center;
+
+    display: -moz-box;
+    -moz-box-align: center;
+    -moz-box-pack: center;
+}
+
+
+/* Converter ----------------------------- */
+
+.youtube-channel-example {
+   padding: 10px;
+   text-shadow: #fff 0 1px 0;
+   border-radius: 8px;
+   background-color: hsl(0,0%,95%);
+   box-shadow:  inset 0px 1px 2px 1px hsla(0,0%,100%,1), 0px 2px 5px hsla(0,0%,0%,.1);
+}
+
+.youtube-channel-example #title {
+   margin: 0 0 5px 0;
+   text-align: center;
+   font: 24px/40px "Lucida Grande", "Trebuchet MS", Verdana, sans-serif;
+}
+
+.youtube-channel-example-url {
+    width: 100%;
+}