+
-
+
+
+
+
+
-
+
diff --git a/js/scratchx.js b/js/scratchx.js
index b1c3605..4c6ded0 100644
--- a/js/scratchx.js
+++ b/js/scratchx.js
@@ -4,7 +4,7 @@ Scratch.FlashApp = Scratch.FlashApp || {};
function handleEmbedStatus(e) {
$('#scratch-loader').hide();
- var scratch = $('#scratch');
+ var scratch = $('#editor');
if (!e.success) {
scratch.css('marginTop', '10');
scratch.find('IMG.proj_thumb').css('width', '179px');
@@ -101,5 +101,5 @@ $.each(flashVars, function (prop, val) {
swfobject.switchOffAutoHideShow();
-swfobject.embedSWF('Scratch.swf', 'scratch', '100%', '100%', '11.7.0', 'libs/expressInstall.swf',
+swfobject.embedSWF('Scratch.swf', 'editor', '100%', '100%', '11.7.0', 'libs/expressInstall.swf',
flashVars, params, null, handleEmbedStatus);
diff --git a/sass/base/_base.scss b/sass/base/_base.scss
index 93ace8f..ea73f2c 100644
--- a/sass/base/_base.scss
+++ b/sass/base/_base.scss
@@ -10,3 +10,8 @@
@import "lists";
@import "tables";
@import "typography";
+
+dialog {
+ display: block;
+ position: static;
+}
\ No newline at end of file
diff --git a/sass/base/_grid-settings.scss b/sass/base/_grid-settings.scss
index 4ccf287..aa7c13a 100644
--- a/sass/base/_grid-settings.scss
+++ b/sass/base/_grid-settings.scss
@@ -1,14 +1,14 @@
@import "../neat/neat-helpers";
// Neat Overrides
-// $column: 90px;
-// $gutter: 30px;
-// $grid-columns: 12;
-// $max-width: em(1088);
+$column: 69px;
+$gutter: 12px;
+$grid-columns: 12;
+$max-width: em(960);
// Neat Breakpoints
$medium-screen: em(640);
-$large-screen: em(860);
+$large-screen: em(960);
$medium-screen-up: new-breakpoint(min-width $medium-screen 4);
$large-screen-up: new-breakpoint(min-width $large-screen 8);
diff --git a/sass/base/_normalize.scss b/sass/base/_normalize.scss
index 458eea1..1453786 100755
--- a/sass/base/_normalize.scss
+++ b/sass/base/_normalize.scss
@@ -33,6 +33,7 @@ body {
article,
aside,
details,
+dialog,
figcaption,
figure,
footer,
@@ -425,3 +426,24 @@ td,
th {
padding: 0;
}
+
+/* Dialogs
+ ========================================================================== */
+
+/**
+ * Destroy normal layout for dialogs
+ */
+
+dialog {
+ position: static;
+ border: none;
+ background-color: inherit;
+ width: auto;
+ height: auto;
+ left: auto;
+ right: auto;
+ top: auto;
+ bottom: auto;
+ padding: 0;
+ color: inherit;
+}
diff --git a/sass/base/_variables.scss b/sass/base/_variables.scss
index 7594759..699f625 100644
--- a/sass/base/_variables.scss
+++ b/sass/base/_variables.scss
@@ -16,15 +16,24 @@ $small-spacing: $base-spacing / 2;
$base-z-index: 0;
// Colors
-$blue: #477dca;
-$dark-gray: #333;
-$medium-gray: #999;
-$light-gray: #ddd;
+$white: #fff;
+$blue: #21b4f0;
+$bright-blue: #24a3ec;
+$dark-blue: #3f5975;
+$dark-gray: #58595b;
+$medium-gray: #c5c5c5;
+$light-gray: #dfe3e7;
+$green: #18ba37;
+$yellow: #fff447;
+
// Font Colors
$base-background-color: #fff;
+$alt-background-color: $dark-blue;
$base-font-color: $dark-gray;
$action-color: $blue;
+$warning-color: $yellow;
+$alt-action-color: $green;
// Border
$base-border-color: $light-gray;
diff --git a/sass/scratchx.scss b/sass/scratchx.scss
index 1db88b9..c0e1fe6 100644
--- a/sass/scratchx.scss
+++ b/sass/scratchx.scss
@@ -4,10 +4,14 @@
@import "base/base";
-#scratch {
+a[href=""] {
+ outline: 1px solid red;
+}
+
+#editor {
text-align: center ;
margin-top: 30px;
- visibility: hidden;
+ display: none;
position: relative;
}
@@ -18,3 +22,36 @@
line-height: 28px;
}
+body > main {
+ > header,
+ > article > header,
+ > article > section,
+ > footer {
+ > div {
+ @include outer-container;
+ }
+ }
+}
+
+dialog {
+ @include span-columns(4);
+}
+
+footer {
+ section {
+ @include span-columns(4);
+ @include shift(1);
+ }
+
+ nav {
+ @include span-columns(2);
+ &:first-of-type {
+ @include shift(1);
+ }
+ }
+}
+
+footer, main header {
+ background-color: $alt-background-color;
+ color: $white;
+}
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+ About ScratchX
++ ScratchX allows you to try out experimental extensions to the Scratch programming environment. With extensions, you can connect Scratch to the physical world (such as electronic devices and kits) and online resources (including web data and web services). +
+ +
+
+ Developer Documentation
+Developers can create new Experimental Extensions using Javascript. To learn more, read the Developer Documentation.
+
Oh Noes! Scratch project cannot display.
@@ -21,7 +139,7 @@
alt="Get Adobe Flash player"/>