diff --git a/build/bundle.js b/build/bundle.js index 6c9f70d5..8dd7c14a 100644 --- a/build/bundle.js +++ b/build/bundle.js @@ -8703,7 +8703,7 @@ var LeftRightView = PositiveNegativeBase.extend({ var ModalView = Backbone.View.extend({ tagName: 'div', - className: 'modalView box horizontal center transitionOpacity', + className: 'modalView box horizontal center transitionOpacityLinear', template: _.template($('#modal-view-template').html()), initialize: function(options) { @@ -11533,7 +11533,6 @@ var CommandPromptView = Backbone.View.extend({ onKey: function(e) { if (!this.listening) { - e.preventDefault(); return; } @@ -11543,7 +11542,6 @@ var CommandPromptView = Backbone.View.extend({ onKeyUp: function(e) { if (!this.listening) { - e.preventDefault(); return; } @@ -13776,6 +13774,16 @@ var MultiView = Backbone.View.extend({ options: { markdown: 'Im second' } + }, { + type: 'ModalAlert', + options: { + markdown: 'Im second' + } + }, { + type: 'ModalAlert', + options: { + markdown: 'Im second' + } }]; this.deferred = options.deferred; @@ -16707,7 +16715,6 @@ var CommandPromptView = Backbone.View.extend({ onKey: function(e) { if (!this.listening) { - e.preventDefault(); return; } @@ -16717,7 +16724,6 @@ var CommandPromptView = Backbone.View.extend({ onKeyUp: function(e) { if (!this.listening) { - e.preventDefault(); return; } @@ -17121,7 +17127,7 @@ var LeftRightView = PositiveNegativeBase.extend({ var ModalView = Backbone.View.extend({ tagName: 'div', - className: 'modalView box horizontal center transitionOpacity', + className: 'modalView box horizontal center transitionOpacityLinear', template: _.template($('#modal-view-template').html()), initialize: function(options) { @@ -17265,6 +17271,16 @@ var MultiView = Backbone.View.extend({ options: { markdown: 'Im second' } + }, { + type: 'ModalAlert', + options: { + markdown: 'Im second' + } + }, { + type: 'ModalAlert', + options: { + markdown: 'Im second' + } }]; this.deferred = options.deferred; diff --git a/src/js/views/commandViews.js b/src/js/views/commandViews.js index 21ca06d6..93bb7f1a 100644 --- a/src/js/views/commandViews.js +++ b/src/js/views/commandViews.js @@ -94,7 +94,6 @@ var CommandPromptView = Backbone.View.extend({ onKey: function(e) { if (!this.listening) { - e.preventDefault(); return; } @@ -104,7 +103,6 @@ var CommandPromptView = Backbone.View.extend({ onKeyUp: function(e) { if (!this.listening) { - e.preventDefault(); return; } diff --git a/src/js/views/index.js b/src/js/views/index.js index 38c60606..8e5590e2 100644 --- a/src/js/views/index.js +++ b/src/js/views/index.js @@ -107,7 +107,7 @@ var LeftRightView = PositiveNegativeBase.extend({ var ModalView = Backbone.View.extend({ tagName: 'div', - className: 'modalView box horizontal center transitionOpacity', + className: 'modalView box horizontal center transitionOpacityLinear', template: _.template($('#modal-view-template').html()), initialize: function(options) { diff --git a/src/js/views/multiView.js b/src/js/views/multiView.js index 9f4c8baa..6420f60b 100644 --- a/src/js/views/multiView.js +++ b/src/js/views/multiView.js @@ -35,6 +35,16 @@ var MultiView = Backbone.View.extend({ options: { markdown: 'Im second' } + }, { + type: 'ModalAlert', + options: { + markdown: 'Im second' + } + }, { + type: 'ModalAlert', + options: { + markdown: 'Im second' + } }]; this.deferred = options.deferred; diff --git a/src/style/main.css b/src/style/main.css index 279cae92..e879c97a 100644 --- a/src/style/main.css +++ b/src/style/main.css @@ -84,6 +84,15 @@ body, transition: opacity 700ms cubic-bezier(0.260, 0.860, 0.440, 0.985); } +.transitionOpacityLinear { + -webkit-transition: opacity 700ms linear; + -moz-transition: opacity 700ms linear; + -ms-transition: opacity 700ms linear; + -o-transition: opacity 700ms linear; + transition: opacity 700ms linear; +} + + .transitionOpacitySlow { -webkit-transition: opacity 1700ms cubic-bezier(0.260, 0.860, 0.440, 0.985); -moz-transition: opacity 1700ms cubic-bezier(0.260, 0.860, 0.440, 0.985); @@ -109,7 +118,6 @@ body, } #canvasWrapper { - /*box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.8) inset;*/ background-color: #4183C4; } @@ -420,7 +428,7 @@ li.rebaseEntry.notPicked { -webkit-transform-style: preserve-3d; background: rgba(0, 0, 0, 0.6); - -webkit-box-shadow: inset 0px 0px 100px rgba(0, 0, 0, 0.9); +/* -webkit-box-shadow: inset 0px 0px 100px rgba(0, 0, 0, 0.9);*/ z-index: -1; opacity: 0; diff --git a/todo.txt b/todo.txt index daa64cf6..cdbaa9d8 100644 --- a/todo.txt +++ b/todo.txt @@ -4,7 +4,6 @@ Big things: Big Graphic things: ~~~~~~~~~~~~~~~~~~~~~~~~~ -[ ] 3d transition between terminals (reveal.JS hakim) Medium things: ~~~~~~~~~~~~~~~~~~~~~~~~~~~