jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: Dialog styling & animation

Browse Source 
Dialogs slide & fade in. All appear in the same spot (50px from top)
This commit is contained in:
Gary Sharp
2014-04-13 23:18:24 +10:00
parent 201acc1976
commit f35f9d3661
9 changed files with 177 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/ClientSource/Scripts/Modules/Disco-CreateJob.js
+1 -1
View File
@@ -28,7 +28,7 @@
autoOpen: true,
title: 'Create Job',
width: 850,
height: $(window).height() - 50,
height: $(window).height() - 100,
close: function () {
createJobDialog.find('iframe').attr('src', 'about:blank');
createJobDialog.dialog('destroy').remove();
Disco.Web/ClientSource/Scripts/Modules/Disco-CreateJob.min.js
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
(function(n,t,i){n(function(){var r=null,u={close:function(){r.dialog("close")},setButtons:function(n){r&&r.dialog("option","buttons",n)}};i.DiscoFunctions||(i.DiscoFunctions={});i.DiscoFunctions.CreateOpenJobDialog=function(f){r=n("<div>").attr("id","createJobDialog").css({width:"100%",height:"100%",paddingTop:"0"}).appendTo(i.body);r.dialog({resizable:!1,draggable:!1,modal:!0,autoOpen:!0,title:"Create Job",width:850,height:n(t).height()-50,close:function(){r.find("iframe").attr("src","about:blank");r.dialog("destroy").remove();r=null},buttons:{}});var e=n("<iframe>").attr({src:f}).width("100%").height("100%").css("border","none").appendTo(r);r[0].discoDialogMethods=u};n("#buttonCreateJob").click(function(){var t=n(this),r=t.attr("href");return i.DiscoFunctions.CreateOpenJobDialog(r),!1})})})($,window,document);
(function(n,t,i){n(function(){var r=null,u={close:function(){r.dialog("close")},setButtons:function(n){r&&r.dialog("option","buttons",n)}};i.DiscoFunctions||(i.DiscoFunctions={});i.DiscoFunctions.CreateOpenJobDialog=function(f){r=n("<div>").attr("id","createJobDialog").css({width:"100%",height:"100%",paddingTop:"0"}).appendTo(i.body);r.dialog({resizable:!1,draggable:!1,modal:!0,autoOpen:!0,title:"Create Job",width:850,height:n(t).height()-100,close:function(){r.find("iframe").attr("src","about:blank");r.dialog("destroy").remove();r=null},buttons:{}});var e=n("<iframe>").attr({src:f}).width("100%").height("100%").css("border","none").appendTo(r);r[0].discoDialogMethods=u};n("#buttonCreateJob").click(function(){var t=n(this),r=t.attr("href");return i.DiscoFunctions.CreateOpenJobDialog(r),!1})})})($,window,document);
/*
//# sourceMappingURL=Disco-CreateJob.min.js.map
*/
Disco.Web/ClientSource/Scripts/Modules/Disco-CreateJob.min.js.map
+1 -1
View File
@@ -2,7 +2,7 @@
"version":3,
"file":"Disco-CreateJob.min.js",
"lineCount":1,
"mappings":"CAGC,QAAS,CAACA,CAAC,CAAEC,CAAM,CAAEC,CAAZ,CAAsB,CAC5BF,CAAC,CAAC,QAAS,CAAA,CAAG,CACV,IAAIG,EAAkB,KAClBC,EAAgB,CAChB,KAAK,CAAEC,QAAS,CAAA,CAAG,CACfF,CAAeG,OAAO,CAAC,OAAD,CADP,CAElB,CACD,UAAU,CAAEC,QAAS,CAACC,CAAD,CAAU,CACvBL,C,EACAA,CAAeG,OAAO,CAAC,QAAQ,CAAE,SAAS,CAAEE,CAAtB,CAFC,CAJf,CADM,CAWrBN,CAAQO,e,GACTP,CAAQO,eAAgB,CAAE,CAAA,EAAE,CAEhCP,CAAQO,eAAeC,oBAAqB,CAAEC,QAAS,CAACC,CAAD,CAAM,CACzDT,CAAgB,CAAEH,CAAC,CAAC,OAAD,CAASa,KAAK,CAAC,IAAI,CAAE,iBAAP,CAAyBC,IAAI,CAAC,CAAE,KAAK,CAAE,MAAM,CAAE,MAAM,CAAE,MAAM,CAAE,UAAU,CAAE,GAA7C,CAAD,CAAoDC,SAAS,CAACb,CAAQc,KAAT,CAAe,CAE1Ib,CAAeG,OAAO,CAAC,CACnB,SAAS,CAAE,CAAA,CAAK,CAChB,SAAS,CAAE,CAAA,CAAK,CAChB,KAAK,CAAE,CAAA,CAAI,CACX,QAAQ,CAAE,CAAA,CAAI,CACd,KAAK,CAAE,YAAY,CACnB,KAAK,CAAE,GAAG,CACV,MAAM,CAAEN,CAAC,CAACC,CAAD,CAAQgB,OAAO,CAAA,CAAG,CAAE,EAAE,CAC/B,KAAK,CAAEZ,QAAS,CAAA,CAAG,CACfF,CAAee,KAAK,CAAC,QAAD,CAAUL,KAAK,CAAC,KAAK,CAAE,aAAR,CAAsB,CACzDV,CAAeG,OAAO,CAAC,SAAD,CAAWa,OAAO,CAAA,CAAE,CAC1ChB,CAAgB,CAAE,IAHH,CAIlB,CACD,OAAO,CAAE,CAAA,CAbU,CAAD,CAcpB,CAEF,IAAIiB,EAASpB,CAAC,CAAC,UAAD,CAAYa,KAAK,CAAC,CAAE,GAAK,CAAED,CAAT,CAAD,CAAgBS,MAAM,CAAC,MAAD,CAAQJ,OAAO,CAAC,MAAD,CAAQH,IAAI,CAAC,QAAQ,CAAE,MAAX,CAAkBC,SAAS,CAACZ,CAAD,CAAiB,CAE5HA,CAAgB,CAAA,CAAA,CAAEmB,mBAAoB,CAAElB,CArBiB,C,CAyB7DJ,CAAC,CAAC,kBAAD,CAAoBuB,MAAM,CAAC,QAAS,CAAA,CAAG,CACpC,IAAIC,EAAQxB,CAAC,CAAC,IAAD,EACTyB,EAAOD,CAAKX,KAAK,CAAC,MAAD,CADF,CAKnB,OAFAX,CAAQO,eAAeC,oBAAoB,CAACe,CAAD,CAAM,CAE1C,CAAA,CAN6B,CAAb,CAxCjB,CAAb,CAD2B,EAkD9B,CAACzB,CAAC,CAAEC,MAAM,CAAEC,QAAZ,CAAqB",
"mappings":"CAGC,QAAS,CAACA,CAAC,CAAEC,CAAM,CAAEC,CAAZ,CAAsB,CAC5BF,CAAC,CAAC,QAAS,CAAA,CAAG,CACV,IAAIG,EAAkB,KAClBC,EAAgB,CAChB,KAAK,CAAEC,QAAS,CAAA,CAAG,CACfF,CAAeG,OAAO,CAAC,OAAD,CADP,CAElB,CACD,UAAU,CAAEC,QAAS,CAACC,CAAD,CAAU,CACvBL,C,EACAA,CAAeG,OAAO,CAAC,QAAQ,CAAE,SAAS,CAAEE,CAAtB,CAFC,CAJf,CADM,CAWrBN,CAAQO,e,GACTP,CAAQO,eAAgB,CAAE,CAAA,EAAE,CAEhCP,CAAQO,eAAeC,oBAAqB,CAAEC,QAAS,CAACC,CAAD,CAAM,CACzDT,CAAgB,CAAEH,CAAC,CAAC,OAAD,CAASa,KAAK,CAAC,IAAI,CAAE,iBAAP,CAAyBC,IAAI,CAAC,CAAE,KAAK,CAAE,MAAM,CAAE,MAAM,CAAE,MAAM,CAAE,UAAU,CAAE,GAA7C,CAAD,CAAoDC,SAAS,CAACb,CAAQc,KAAT,CAAe,CAE1Ib,CAAeG,OAAO,CAAC,CACnB,SAAS,CAAE,CAAA,CAAK,CAChB,SAAS,CAAE,CAAA,CAAK,CAChB,KAAK,CAAE,CAAA,CAAI,CACX,QAAQ,CAAE,CAAA,CAAI,CACd,KAAK,CAAE,YAAY,CACnB,KAAK,CAAE,GAAG,CACV,MAAM,CAAEN,CAAC,CAACC,CAAD,CAAQgB,OAAO,CAAA,CAAG,CAAE,GAAG,CAChC,KAAK,CAAEZ,QAAS,CAAA,CAAG,CACfF,CAAee,KAAK,CAAC,QAAD,CAAUL,KAAK,CAAC,KAAK,CAAE,aAAR,CAAsB,CACzDV,CAAeG,OAAO,CAAC,SAAD,CAAWa,OAAO,CAAA,CAAE,CAC1ChB,CAAgB,CAAE,IAHH,CAIlB,CACD,OAAO,CAAE,CAAA,CAbU,CAAD,CAcpB,CAEF,IAAIiB,EAASpB,CAAC,CAAC,UAAD,CAAYa,KAAK,CAAC,CAAE,GAAK,CAAED,CAAT,CAAD,CAAgBS,MAAM,CAAC,MAAD,CAAQJ,OAAO,CAAC,MAAD,CAAQH,IAAI,CAAC,QAAQ,CAAE,MAAX,CAAkBC,SAAS,CAACZ,CAAD,CAAiB,CAE5HA,CAAgB,CAAA,CAAA,CAAEmB,mBAAoB,CAAElB,CArBiB,C,CAyB7DJ,CAAC,CAAC,kBAAD,CAAoBuB,MAAM,CAAC,QAAS,CAAA,CAAG,CACpC,IAAIC,EAAQxB,CAAC,CAAC,IAAD,EACTyB,EAAOD,CAAKX,KAAK,CAAC,MAAD,CADF,CAKnB,OAFAX,CAAQO,eAAeC,oBAAoB,CAACe,CAAD,CAAM,CAE1C,CAAA,CAN6B,CAAb,CAxCjB,CAAb,CAD2B,EAkD9B,CAACzB,CAAC,CAAEC,MAAM,CAAEC,QAAZ,CAAqB",
"sources":["/ClientSource/Scripts/Modules/Disco-CreateJob/disco.createjob.js"],
"names":["$","window","document","createJobDialog","dialogMethods","close","dialog","setButtons","buttons","DiscoFunctions","CreateOpenJobDialog","document.DiscoFunctions.CreateOpenJobDialog","url","attr","css","appendTo","body","height","find","remove","iframe","width","discoDialogMethods","click","$this","href"]
}
Disco.Web/ClientSource/Scripts/Modules/Disco-CreateJob/disco.createjob.js
+1 -1
View File
@@ -27,7 +27,7 @@
autoOpen: true,
title: 'Create Job',
width: 850,
height: $(window).height() - 50,
height: $(window).height() - 100,
close: function () {
createJobDialog.find('iframe').attr('src', 'about:blank');
createJobDialog.dialog('destroy').remove();
Disco.Web/ClientSource/Style/BundleSite.css
+53
View File
@@ -4610,6 +4610,58 @@ input:-moz-placeholder {
{
font-weight: bold;
}*/
.ui-dialog {
animation-name: ui-dialog-show;
-webkit-animation-name: ui-dialog-show;
animation-duration: .2s;
-webkit-animation-duration: .2s;
animation-timing-function: ease-in-out;
-webkit-animation-timing-function: ease-in-out;
}
@keyframes ui-dialog-show {
0% {
transform: translateY(-30px);
opacity: 0.0;
}
100% {
transform: translateY(0);
opacity: 1;
}
}
@-webkit-keyframes ui-dialog-show {
0% {
-webkit-transform: translateY(-30px);
opacity: 0.0;
}
100% {
-webkit-transform: translateY(0);
opacity: 1;
}
}
.ui-widget-overlay.ui-front {
animation-name: ui-dialog-fadeIn;
-webkit-animation-name: ui-dialog-fadeIn;
animation-duration: .2s;
-webkit-animation-duration: .2s;
animation-timing-function: ease-in-out;
-webkit-animation-timing-function: ease-in-out;
}
@keyframes ui-dialog-fadeIn {
0% {
opacity: 0.0;
}
100% {
opacity: 0.5;
}
}
@-webkit-keyframes ui-dialog-fadeIn {
0% {
opacity: 0.0;
}
100% {
opacity: 0.5;
}
}
.page .dialog {
display: none;
}
@@ -4618,6 +4670,7 @@ input:-moz-placeholder {
border-color: #333333;
background: #fcfcfc;
box-shadow: rgba(20, 20, 20, 0.7) 0px 0px 50px;
top: 50px !important;
}
.ui-dialog .ui-widget-header {
border-top: none;
Disco.Web/ClientSource/Style/BundleSite.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/jQueryUIExtensions.css
+53
View File
@@ -200,6 +200,58 @@ input:-moz-placeholder {
{
font-weight: bold;
}*/
.ui-dialog {
animation-name: ui-dialog-show;
-webkit-animation-name: ui-dialog-show;
animation-duration: .2s;
-webkit-animation-duration: .2s;
animation-timing-function: ease-in-out;
-webkit-animation-timing-function: ease-in-out;
}
@keyframes ui-dialog-show {
0% {
transform: translateY(-30px);
opacity: 0.0;
}
100% {
transform: translateY(0);
opacity: 1;
}
}
@-webkit-keyframes ui-dialog-show {
0% {
-webkit-transform: translateY(-30px);
opacity: 0.0;
}
100% {
-webkit-transform: translateY(0);
opacity: 1;
}
}
.ui-widget-overlay.ui-front {
animation-name: ui-dialog-fadeIn;
-webkit-animation-name: ui-dialog-fadeIn;
animation-duration: .2s;
-webkit-animation-duration: .2s;
animation-timing-function: ease-in-out;
-webkit-animation-timing-function: ease-in-out;
}
@keyframes ui-dialog-fadeIn {
0% {
opacity: 0.0;
}
100% {
opacity: 0.5;
}
}
@-webkit-keyframes ui-dialog-fadeIn {
0% {
opacity: 0.0;
}
100% {
opacity: 0.5;
}
}
.page .dialog {
display: none;
}
@@ -208,6 +260,7 @@ input:-moz-placeholder {
border-color: #333333;
background: #fcfcfc;
box-shadow: rgba(20, 20, 20, 0.7) 0px 0px 50px;
top: 50px !important;
}
.ui-dialog .ui-widget-header {
border-top: none;
Disco.Web/ClientSource/Style/jQueryUIExtensions.less
+65
View File
@@ -153,6 +153,70 @@ input:-moz-placeholder {
font-weight: bold;
}*/
// Dialogs
.ui-dialog {
animation-name: ui-dialog-show;
-webkit-animation-name: ui-dialog-show;
animation-duration: .2s;
-webkit-animation-duration: .2s;
animation-timing-function: ease-in-out;
-webkit-animation-timing-function: ease-in-out;
}
@keyframes ui-dialog-show {
0% {
transform: translateY(-30px);
opacity: 0.0;
}
100% {
transform: translateY(0);
opacity: 1;
}
}
@-webkit-keyframes ui-dialog-show {
0% {
-webkit-transform: translateY(-30px);
opacity: 0.0;
}
100% {
-webkit-transform: translateY(0);
opacity: 1;
}
}
.ui-widget-overlay.ui-front {
animation-name: ui-dialog-fadeIn;
-webkit-animation-name: ui-dialog-fadeIn;
animation-duration: .2s;
-webkit-animation-duration: .2s;
animation-timing-function: ease-in-out;
-webkit-animation-timing-function: ease-in-out;
}
@keyframes ui-dialog-fadeIn {
0% {
opacity: 0.0;
}
100% {
opacity: 0.5;
}
}
@-webkit-keyframes ui-dialog-fadeIn {
0% {
opacity: 0.0;
}
100% {
opacity: 0.5;
}
}
// Initially hide dialogs
.page .dialog {
@@ -164,6 +228,7 @@ input:-moz-placeholder {
border-color: @HeaderBackgroundColour;
background: #fcfcfc;
box-shadow: rgba(20,20,20,.7) 0px 0px 50px;
top: 50px !important;
}
.ui-dialog .ui-widget-header {
Disco.Web/ClientSource/Style/jQueryUIExtensions.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long