mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-29 17:27:22 +02:00
ok multiviews are dunzo
This commit is contained in:
parent
56c6da35d2
commit
b1427556ef
6 changed files with 43 additions and 12 deletions
|
@ -8703,7 +8703,7 @@ var LeftRightView = PositiveNegativeBase.extend({
|
||||||
|
|
||||||
var ModalView = Backbone.View.extend({
|
var ModalView = Backbone.View.extend({
|
||||||
tagName: 'div',
|
tagName: 'div',
|
||||||
className: 'modalView box horizontal center transitionOpacity',
|
className: 'modalView box horizontal center transitionOpacityLinear',
|
||||||
template: _.template($('#modal-view-template').html()),
|
template: _.template($('#modal-view-template').html()),
|
||||||
|
|
||||||
initialize: function(options) {
|
initialize: function(options) {
|
||||||
|
@ -11533,7 +11533,6 @@ var CommandPromptView = Backbone.View.extend({
|
||||||
|
|
||||||
onKey: function(e) {
|
onKey: function(e) {
|
||||||
if (!this.listening) {
|
if (!this.listening) {
|
||||||
e.preventDefault();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -11543,7 +11542,6 @@ var CommandPromptView = Backbone.View.extend({
|
||||||
|
|
||||||
onKeyUp: function(e) {
|
onKeyUp: function(e) {
|
||||||
if (!this.listening) {
|
if (!this.listening) {
|
||||||
e.preventDefault();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -13776,6 +13774,16 @@ var MultiView = Backbone.View.extend({
|
||||||
options: {
|
options: {
|
||||||
markdown: 'Im second'
|
markdown: 'Im second'
|
||||||
}
|
}
|
||||||
|
}, {
|
||||||
|
type: 'ModalAlert',
|
||||||
|
options: {
|
||||||
|
markdown: 'Im second'
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
type: 'ModalAlert',
|
||||||
|
options: {
|
||||||
|
markdown: 'Im second'
|
||||||
|
}
|
||||||
}];
|
}];
|
||||||
this.deferred = options.deferred;
|
this.deferred = options.deferred;
|
||||||
|
|
||||||
|
@ -16707,7 +16715,6 @@ var CommandPromptView = Backbone.View.extend({
|
||||||
|
|
||||||
onKey: function(e) {
|
onKey: function(e) {
|
||||||
if (!this.listening) {
|
if (!this.listening) {
|
||||||
e.preventDefault();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -16717,7 +16724,6 @@ var CommandPromptView = Backbone.View.extend({
|
||||||
|
|
||||||
onKeyUp: function(e) {
|
onKeyUp: function(e) {
|
||||||
if (!this.listening) {
|
if (!this.listening) {
|
||||||
e.preventDefault();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17121,7 +17127,7 @@ var LeftRightView = PositiveNegativeBase.extend({
|
||||||
|
|
||||||
var ModalView = Backbone.View.extend({
|
var ModalView = Backbone.View.extend({
|
||||||
tagName: 'div',
|
tagName: 'div',
|
||||||
className: 'modalView box horizontal center transitionOpacity',
|
className: 'modalView box horizontal center transitionOpacityLinear',
|
||||||
template: _.template($('#modal-view-template').html()),
|
template: _.template($('#modal-view-template').html()),
|
||||||
|
|
||||||
initialize: function(options) {
|
initialize: function(options) {
|
||||||
|
@ -17265,6 +17271,16 @@ var MultiView = Backbone.View.extend({
|
||||||
options: {
|
options: {
|
||||||
markdown: 'Im second'
|
markdown: 'Im second'
|
||||||
}
|
}
|
||||||
|
}, {
|
||||||
|
type: 'ModalAlert',
|
||||||
|
options: {
|
||||||
|
markdown: 'Im second'
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
type: 'ModalAlert',
|
||||||
|
options: {
|
||||||
|
markdown: 'Im second'
|
||||||
|
}
|
||||||
}];
|
}];
|
||||||
this.deferred = options.deferred;
|
this.deferred = options.deferred;
|
||||||
|
|
||||||
|
|
|
@ -94,7 +94,6 @@ var CommandPromptView = Backbone.View.extend({
|
||||||
|
|
||||||
onKey: function(e) {
|
onKey: function(e) {
|
||||||
if (!this.listening) {
|
if (!this.listening) {
|
||||||
e.preventDefault();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -104,7 +103,6 @@ var CommandPromptView = Backbone.View.extend({
|
||||||
|
|
||||||
onKeyUp: function(e) {
|
onKeyUp: function(e) {
|
||||||
if (!this.listening) {
|
if (!this.listening) {
|
||||||
e.preventDefault();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -107,7 +107,7 @@ var LeftRightView = PositiveNegativeBase.extend({
|
||||||
|
|
||||||
var ModalView = Backbone.View.extend({
|
var ModalView = Backbone.View.extend({
|
||||||
tagName: 'div',
|
tagName: 'div',
|
||||||
className: 'modalView box horizontal center transitionOpacity',
|
className: 'modalView box horizontal center transitionOpacityLinear',
|
||||||
template: _.template($('#modal-view-template').html()),
|
template: _.template($('#modal-view-template').html()),
|
||||||
|
|
||||||
initialize: function(options) {
|
initialize: function(options) {
|
||||||
|
|
|
@ -35,6 +35,16 @@ var MultiView = Backbone.View.extend({
|
||||||
options: {
|
options: {
|
||||||
markdown: 'Im second'
|
markdown: 'Im second'
|
||||||
}
|
}
|
||||||
|
}, {
|
||||||
|
type: 'ModalAlert',
|
||||||
|
options: {
|
||||||
|
markdown: 'Im second'
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
type: 'ModalAlert',
|
||||||
|
options: {
|
||||||
|
markdown: 'Im second'
|
||||||
|
}
|
||||||
}];
|
}];
|
||||||
this.deferred = options.deferred;
|
this.deferred = options.deferred;
|
||||||
|
|
||||||
|
|
|
@ -84,6 +84,15 @@ body,
|
||||||
transition: opacity 700ms cubic-bezier(0.260, 0.860, 0.440, 0.985);
|
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 {
|
.transitionOpacitySlow {
|
||||||
-webkit-transition: opacity 1700ms cubic-bezier(0.260, 0.860, 0.440, 0.985);
|
-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);
|
-moz-transition: opacity 1700ms cubic-bezier(0.260, 0.860, 0.440, 0.985);
|
||||||
|
@ -109,7 +118,6 @@ body,
|
||||||
}
|
}
|
||||||
|
|
||||||
#canvasWrapper {
|
#canvasWrapper {
|
||||||
/*box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.8) inset;*/
|
|
||||||
background-color: #4183C4;
|
background-color: #4183C4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -420,7 +428,7 @@ li.rebaseEntry.notPicked {
|
||||||
-webkit-transform-style: preserve-3d;
|
-webkit-transform-style: preserve-3d;
|
||||||
|
|
||||||
background: rgba(0, 0, 0, 0.6);
|
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;
|
z-index: -1;
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
|
|
1
todo.txt
1
todo.txt
|
@ -4,7 +4,6 @@ Big things:
|
||||||
|
|
||||||
Big Graphic things:
|
Big Graphic things:
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
[ ] 3d transition between terminals (reveal.JS hakim)
|
|
||||||
|
|
||||||
Medium things:
|
Medium things:
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue