Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Adding new toolbar to start anim

  • Loading branch information...
commit c7aae09f52e78f431ede628754bbffd597ae1cd3 1 parent d6687fe
@jakearchibald authored
Showing with 21 additions and 10 deletions.
  1. +4 −2 www/assets/7/script/base.js
  2. +17 −8 www/assets/7/script/pageLayout.js
View
6 www/assets/7/script/base.js
@@ -36,8 +36,10 @@
toolbarTop.$container.addClass('top');
- //toolbarBottom.
- // addItem('percent', 'Percent');
+ toolbarBottom.
+ addItem('percent', 'Percent');
+
+ toolbarBottom.$container.addClass('bottom');
spriteCow.pageLayout.init();
View
25 www/assets/7/script/pageLayout.js
@@ -10,7 +10,8 @@ spriteCow.pageLayout = (function() {
$startButtons,
$spriteCanvasContainer,
$window = $(window),
- $toolbar,
+ $toolbarTop,
+ $toolbarBottom,
currentView = 'intro';
function getContainerWidthPercent() {
@@ -67,12 +68,19 @@ spriteCow.pageLayout = (function() {
[$canvasCell, {
height: $canvasCell.height()
}],
- [$toolbar, {
- height: $toolbar.height(),
- 'padding-top': $toolbar.css('padding-top'),
- 'padding-bottom': $toolbar.css('padding-bottom'),
- 'border-top-width': $toolbar.css('border-top-width'),
- 'border-bottom-width': $toolbar.css('border-bottom-width')
+ [$toolbarTop, {
+ height: $toolbarTop.height(),
+ 'padding-top': $toolbarTop.css('padding-top'),
+ 'padding-bottom': $toolbarTop.css('padding-bottom'),
+ 'border-top-width': $toolbarTop.css('border-top-width'),
+ 'border-bottom-width': $toolbarTop.css('border-bottom-width')
+ }],
+ [$toolbarBottom, {
+ height: $toolbarBottom.height(),
+ 'padding-top': $toolbarBottom.css('padding-top'),
+ 'padding-bottom': $toolbarBottom.css('padding-bottom'),
+ 'border-top-width': $toolbarBottom.css('border-top-width'),
+ 'border-bottom-width': $toolbarBottom.css('border-bottom-width')
}]
],
before: function() {
@@ -122,7 +130,8 @@ spriteCow.pageLayout = (function() {
return {
init: function() {
- $toolbar = $('.toolbar');
+ $toolbarTop = $('.toolbar.top');
+ $toolbarBottom = $('.toolbar.bottom');
$startButtons = $('.start-buttons');
$cssOutput = $('.css-output');
$spriteCanvasContainer = $('.sprite-canvas-container');
Please sign in to comment.
Something went wrong with that request. Please try again.