Reverted r17252 and r17253 (#26655).

The change breaks the test suite. 


git-svn-id: http://svn.redmine.org/redmine/trunk@17254 e93f8b46-1217-0410-a6f0-8f06a7374b81

4 files changed, 3 insertions, 9 deletions

diff --git a/public/images/3_bullets.png b/public/images/3_bullets.png
deleted file mode 100644
index 616593b2a..000000000
--- a/public/images/3_bullets.png
+++ /dev/null
diff --git a/public/javascripts/context_menu.js b/public/javascripts/context_menu.js
index 9bc64b171..cd2cf0884 100644
--- a/public/javascripts/context_menu.js
+++ b/public/javascripts/context_menu.js
@@ -5,7 +5,7 @@ var contextMenuObserving;
 
 function contextMenuRightClick(event) {
   var target = $(event.target);
-  if (target.is('a:not(.js-contextmenu)')) {return;}
+  if (target.is('a')) {return;}
   var tr = target.closest('.hascontextmenu').first();
   if (tr.length < 1) {return;}
   event.preventDefault();
@@ -218,7 +218,6 @@ function contextMenuInit() {
   if (!contextMenuObserving) {
     $(document).click(contextMenuClick);
     $(document).contextmenu(contextMenuRightClick);
-    $(document).on('click', '.js-contextmenu', contextMenuRightClick);
     contextMenuObserving = true;
   }
 }
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index fa9e44bdc..35bd4ca04 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -228,7 +228,6 @@ table.list td.checkbox { width: 15px; padding: 2px 0 0 0; }
 table.list td.checkbox input {padding:0px;}
 table.list td.buttons, div.buttons { white-space:nowrap; text-align: right; }
 table.list td.buttons a, div.buttons a { margin-right: 0.6em; }
-table.list td.buttons a:last-child, div.buttons a:last-child { margin-right: 0; }
 table.list td.buttons img, div.buttons img {vertical-align:middle;}
 table.list td.reorder {width:15%; white-space:nowrap; text-align:center; }
 table.list table.progress td {padding-right:0px;}
@@ -474,7 +473,7 @@ div.issue.overdue .due-date .value { color: #c22; }
 
 #issue_tree table.issues, #relations table.issues { border: 0; }
 #issue_tree td.checkbox, #relations td.checkbox {display:none;}
-#relations td.buttons, #issue_tree td.buttons {padding:0;}
+#relations td.buttons {padding:0;}
 
 fieldset.collapsible {border-width: 1px 0 0 0;}
 fieldset.collapsible>legend { padding-left: 16px; background: url(../images/arrow_expanded.png) no-repeat 0% 40%; cursor:pointer; }
@@ -1309,7 +1308,6 @@ div.wiki img {vertical-align:middle; max-width:100%;}
 .icon-project { background-image: url(../images/projects.png); }
 .icon-add-bullet { background-image: url(../images/bullet_add.png); }
 .icon-shared { background-image: url(../images/link.png); }
-.icon-actions { background-image: url(../images/3_bullets.png); }
 
 .icon-file { background-image: url(../images/files/default.png); }
 .icon-file.text-plain { background-image: url(../images/files/text.png); }
diff --git a/public/stylesheets/responsive.css b/public/stylesheets/responsive.css
index fb156863a..76e2d5945 100644
--- a/public/stylesheets/responsive.css
+++ b/public/stylesheets/responsive.css
@@ -793,13 +793,11 @@
     width: 33.33%; /* three columns for all cells that are not subject */
   }
 
-  #issue_tree .issues, #issue_tree .issue,
   #relations .issues, #relations .issue {
     position: relative; /* needed for .buttons positioning */
   }
 
   /* positioniong of unline button */
-  #issue_tree .issue > td.buttons,
   #relations .issue > td.buttons {
     text-align: right;
     position: absolute;
@@ -808,12 +806,11 @@
     padding-right: 0;
   }
 
-  #issue_tree .issue .buttons a,
   #relations .issue .buttons a {
     vertical-align: middle;
+    padding-right: 5px;
   }
 
-  #issue_tree .issue > td.subject,
   #relations .issue > td.subject {
     padding-right: 25px; /* this is the spaces that .buttons uses next to subject */
   }