anoopmb
/
frappe
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

fixed z-index and renamed all-app.js to all-app.min.js

version-14
Rushabh Mehta 12 years ago
parent
9823d95066
commit
2a32c0275a
6 changed files with 6 additions and 14 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -3
      public/build.json
  2. +2
    -2
      public/css/legacy/dialog.css
  3. +1
    -1
      public/html/app.html
  4. +0
    -3
      public/js/legacy/globals.js
  5. +0
    -1
      public/js/legacy/widgets/dialog.js
  6. +0
    -4
      public/js/wn/ui/dialog.js

+ 3
- 3
public/build.json View File

@@ -1,7 +1,7 @@
[ [
{ {
"public/js/report-legacy.js": [
"public/js/report-legacy.min.js": [
"lib/public/js/legacy/widgets/tabbedpage.js", "lib/public/js/legacy/widgets/tabbedpage.js",
"lib/public/js/legacy/widgets/report_builder/report_builder.js", "lib/public/js/legacy/widgets/report_builder/report_builder.js",
"lib/public/js/legacy/widgets/report_builder/datatable.js", "lib/public/js/legacy/widgets/report_builder/datatable.js",
@@ -48,14 +48,14 @@
}, },


{ {
"public/js/all-web.js": [
"public/js/all-web.min.js": [
"lib/public/js/lib/bootstrap.min.js", "lib/public/js/lib/bootstrap.min.js",
"lib/public/js/lib/public/json2.js", "lib/public/js/lib/public/json2.js",
] ]
}, },
{ {
"public/js/all-app.js": [
"public/js/all-app.min.js": [
"lib/public/js/lib/jquery/jquery.ui.core.min.js", "lib/public/js/lib/jquery/jquery.ui.core.min.js",
"lib/public/js/lib/jquery/jquery.ui.datepicker.min.js", "lib/public/js/lib/jquery/jquery.ui.datepicker.min.js",
"lib/public/js/lib/jquery/jquery.ui.autocomplete.min.js", "lib/public/js/lib/jquery/jquery.ui.autocomplete.min.js",


+ 2
- 2
public/css/legacy/dialog.css View File

@@ -4,7 +4,7 @@ div.dialog_wrapper {
position: absolute; position: absolute;
width: 440px; width: 440px;
display: none; display: none;
z-index: 90;
z-index: 2;
background-color: #FFF; background-color: #FFF;
box-shadow:1px 1px 8px #444; box-shadow:1px 1px 8px #444;
-moz-box-shadow: 1px 1px 8px #444; -moz-box-shadow: 1px 1px 8px #444;
@@ -40,7 +40,7 @@ div#freeze {
right: 0px; right: 0px;
background-color: #aaa; background-color: #aaa;
opacity: 0.6; opacity: 0.6;
z-index: 50;
z-index: 1;
text-align: center; text-align: center;
} }




+ 1
- 1
public/html/app.html View File

@@ -18,7 +18,7 @@
} }
window.app = true; window.app = true;
</script> </script>
<script type="text/javascript" src="js/all-app.js"></script>
<script type="text/javascript" src="js/all-app.min.js"></script>
<link type="text/css" rel="stylesheet" href="css/all-app.css"> <link type="text/css" rel="stylesheet" href="css/all-app.css">
</head> </head>
<body> <body>


+ 0
- 3
public/js/legacy/globals.js View File

@@ -31,9 +31,6 @@ var user_img = {};
var pscript = {}; var pscript = {};
var selector=null; var selector=null;


// ui
var top_index=91;

// Name Spaces // Name Spaces
// ============ // ============




+ 0
- 1
public/js/legacy/widgets/dialog.js View File

@@ -25,7 +25,6 @@
// //


var cur_dialog; var cur_dialog;
var top_index=91;


var Dialog = wn.ui.Dialog.extend({ var Dialog = wn.ui.Dialog.extend({
init: function(w, h, title, content) { init: function(w, h, title, content) {


+ 0
- 4
public/js/wn/ui/dialog.js View File

@@ -66,10 +66,6 @@ wn.ui.Dialog = wn.ui.FieldGroup.extend({
// place it at the center // place it at the center
this.wrapper.style.left = (($(window).width() - cint(this.wrapper.style.width))/2) + 'px'; this.wrapper.style.left = (($(window).width() - cint(this.wrapper.style.width))/2) + 'px';
this.wrapper.style.top = ($(window).scrollTop() + 60) + 'px'; this.wrapper.style.top = ($(window).scrollTop() + 60) + 'px';

// place it on top
top_index++;
$y(this.wrapper,{zIndex:top_index});
}, },
show: function() { show: function() {
// already live, do nothing // already live, do nothing


Write Preview
Loading…
Cancel
Save