From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- .../layout/document-bar.reel/document-bar.html | 4 +-- .../layout/document-bar.reel/document-bar.js | 30 +++++++++++----------- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'js/components/layout/document-bar.reel') diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html index 945ab689..c9e16120 100755 --- a/js/components/layout/document-bar.reel/document-bar.html +++ b/js/components/layout/document-bar.reel/document-bar.html @@ -72,8 +72,8 @@ POSSIBILITY OF SUCH DAMAGE. "zoomControl": {"@": "hottext1"} } } - } - + } + diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js index 86c55267..7e2b4dbb 100755 --- a/js/components/layout/document-bar.reel/document-bar.js +++ b/js/components/layout/document-bar.reel/document-bar.js @@ -127,21 +127,21 @@ exports.DocumentBar = Montage.create(Component, { value: 100 }, - zoomFactor: { - get: function() { return this._zoomFactor; }, - - set: function(value) - { - if(value !== this._zoomFactor) - { - this._zoomFactor = value; - if (!this._firstDraw) - { - this.application.ninja.stage.setZoom(value); - } - } - } - }, + zoomFactor: { + get: function() { return this._zoomFactor; }, + + set: function(value) + { + if(value !== this._zoomFactor) + { + this._zoomFactor = value; + if (!this._firstDraw) + { + this.application.ninja.stage.setZoom(value); + } + } + } + }, draw: { value: function() { -- cgit v1.2.3 From 04343eda8c2f870b0da55cfdc8003c99fe1cc4de Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:53:10 -0700 Subject: Remove trailing spaces --- js/components/layout/document-bar.reel/document-bar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/components/layout/document-bar.reel') diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js index 7e2b4dbb..890640b1 100755 --- a/js/components/layout/document-bar.reel/document-bar.js +++ b/js/components/layout/document-bar.reel/document-bar.js @@ -157,7 +157,7 @@ exports.DocumentBar = Montage.create(Component, { this.codeView.classList.add("selected"); if(this.designView.classList.contains("selected")) this.designView.classList.toggle("selected"); } - + } else if(this.type) { this.designView.classList.remove("active"); } -- cgit v1.2.3 From 6803c0abd279fcb640c38b3881b751bab982cbe0 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 12:42:16 -0700 Subject: Remove trailing spaces --- js/components/layout/document-bar.reel/document-bar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/components/layout/document-bar.reel') diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html index c9e16120..f4d52b57 100755 --- a/js/components/layout/document-bar.reel/document-bar.html +++ b/js/components/layout/document-bar.reel/document-bar.html @@ -74,7 +74,7 @@ POSSIBILITY OF SUCH DAMAGE. } } - + -- cgit v1.2.3 From 9461e7731f91dd03a15b0a62667e722a60c84721 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 12:44:57 -0700 Subject: Remove byte order markers (BOM) --- js/components/layout/document-bar.reel/document-bar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/components/layout/document-bar.reel') diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html index f4d52b57..f672b289 100755 --- a/js/components/layout/document-bar.reel/document-bar.html +++ b/js/components/layout/document-bar.reel/document-bar.html @@ -1,4 +1,4 @@ - + + - - - + + + + + - - + - + - -
- - Design View - Code View -
-
- + + +
+ +
+ +
+ + + +
+ +
+ +
+ + + +
+ +
+ +
+ + + +
+ +
+ +
+ + + -- cgit v1.2.3 From 2c5b9fac8a1085788ae00ecee527760e6c8953f6 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Fri, 13 Jul 2012 12:44:21 -0700 Subject: New: Added knob to timeline resizer Added visual feedback for the timeline resizer --- js/components/layout/document-bar.reel/document-bar.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'js/components/layout/document-bar.reel') diff --git a/js/components/layout/document-bar.reel/document-bar.css b/js/components/layout/document-bar.reel/document-bar.css index cb9accdd..d92a3dd6 100755 --- a/js/components/layout/document-bar.reel/document-bar.css +++ b/js/components/layout/document-bar.reel/document-bar.css @@ -30,7 +30,10 @@ POSSIBILITY OF SUCH DAMAGE. */ .timelineResizer { - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(19,19,19,1)), color-stop(50%,rgba(44,44,44,1)), color-stop(100%,rgba(19,19,19,1))) !important; + background: -webkit-radial-gradient(center, ellipse cover, rgba(100, 100, 100, .9) 40%, rgba(100, 100, 100, .4) 50%, rgba(100, 100, 100, 0) 51%), -webkit-radial-gradient(center, ellipse cover, rgba(100, 100, 100, .9) 40%, rgba(100, 100, 100, .4) 50%, rgba(100, 100, 100, 0) 51%), -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgb(60, 60, 60)), color-stop(70%, rgb(30, 30, 30)), color-stop(100%, rgb(25, 25, 25))), -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgb(10, 10, 10)), color-stop(50%, rgb(20, 20, 20)), color-stop(100%, rgb(10, 10, 10))) !important; + background-repeat: no-repeat, no-repeat, no-repeat, no-repeat, no-repeat !important; + background-position: 49.5% center, 50.5% center, center center, left top !important; + background-size: 5px 5px, 5px 5px, 3% 100%, 100% 100%; } .documentBar { -- cgit v1.2.3 From ec3f0a848f264f466c3cd5dec60e27a84216d288 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Mon, 16 Jul 2012 10:38:50 -0700 Subject: CSS Fixes for Windows Font size is not inherited in Chrome for Windows, but does inherit in Mac, adding size for avoid inconsistency. --- js/components/layout/document-bar.reel/document-bar.css | 1 + 1 file changed, 1 insertion(+) (limited to 'js/components/layout/document-bar.reel') diff --git a/js/components/layout/document-bar.reel/document-bar.css b/js/components/layout/document-bar.reel/document-bar.css index d92a3dd6..b86855b7 100755 --- a/js/components/layout/document-bar.reel/document-bar.css +++ b/js/components/layout/document-bar.reel/document-bar.css @@ -80,6 +80,7 @@ POSSIBILITY OF SUCH DAMAGE. text-align: left; float: left; cursor: pointer; + font-size: 11px; } .documentBar .viewicon { -- cgit v1.2.3