From 6f2e1ca1f9af235072a0c62a9cacdde6b4cbcf4c Mon Sep 17 00:00:00 2001
From: PavelBegunkov <asml.Silence@gmail.com>
Date: Sat, 27 Sep 2014 23:04:22 +0400
Subject: [PATCH] 1) hide error 2) inspector z-index 3) width fail
---
~dev_rating/media/css/base.css | 2 +-
~dev_rating/media/css/error.css | 1 +
~dev_rating/media/js/errDialog.js | 10 ++++++++--
.../media/js/event_inspector/event_inspector.css | 4 +++-
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/~dev_rating/media/css/base.css b/~dev_rating/media/css/base.css
index a0b1c1e73..a10925192 100644
--- a/~dev_rating/media/css/base.css
+++ b/~dev_rating/media/css/base.css
@@ -11,7 +11,7 @@ body { /* �仍� 从仂��亠从�仆仂亞仂 仂�仂弍�舒亢亠仆亳� 仂从仂仆 */
body {
background-color: #f1f1f1;
overflow-y: auto;
- min-width: 1025px;
+ min-width: 1050px;
}
div {
height: auto;
diff --git a/~dev_rating/media/css/error.css b/~dev_rating/media/css/error.css
index bf6a7b6de..e28deb65b 100644
--- a/~dev_rating/media/css/error.css
+++ b/~dev_rating/media/css/error.css
@@ -48,6 +48,7 @@ body
#errButton {
position: fixed;
+ z-index: 300;
top: 300px;
left: 0;
width: 35px;
diff --git a/~dev_rating/media/js/errDialog.js b/~dev_rating/media/js/errDialog.js
index ed96aaf09..1caadedea 100644
--- a/~dev_rating/media/js/errDialog.js
+++ b/~dev_rating/media/js/errDialog.js
@@ -17,7 +17,12 @@ $(document).ready(function() {
show: {
effect: "fade",
duration: 300
- }
+ },
+ hide: {
+ effect: "fade",
+ duration: 300
+ }
+
});
$('#errButton').click(function ()
@@ -100,7 +105,8 @@ $(document).ready(function() {
jMessage.removeAttr('disabled');
jMessageTitle.removeAttr('disabled');
jSendBut.removeAttr('disabled');
- jMessageTitle.focus();
+
+ $('#errDialog').dialog("close");
}
});
});
diff --git a/~dev_rating/media/js/event_inspector/event_inspector.css b/~dev_rating/media/js/event_inspector/event_inspector.css
index 79b87fd3b..8dc47f3dd 100644
--- a/~dev_rating/media/js/event_inspector/event_inspector.css
+++ b/~dev_rating/media/js/event_inspector/event_inspector.css
@@ -3,7 +3,7 @@
height: auto;
width: 200px;
top: 50px;
- right: 20px
+ right: 20px;
}
.EventInspectorList .EventItem {
width: auto;
@@ -11,6 +11,8 @@
margin-bottom: 10px;
border-radius: 4px;
font-size: 14px;
+
+ z-index: 500;
}
.EventInspectorList .success {
color: #3c763d;
--
GitLab