Reverts r19769 (#31887).

The change broke the Highlighted code button in the Wiki toolbar.


git-svn-id: http://svn.redmine.org/redmine/trunk@19776 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2020-05-14 13:55:50 +00:00
parent 302f9bbc76
commit a924a3dfa1
26 changed files with 38 additions and 48 deletions

View File

@@ -1622,7 +1622,7 @@ module ApplicationHelper
# Returns the javascript tags that are included in the html layout head # Returns the javascript tags that are included in the html layout head
def javascript_heads def javascript_heads
tags = javascript_include_tag('jquery-2.2.4-ui-1.12.1-ujs-5.2.3', 'tribute-3.7.3.min', 'application', 'responsive') tags = javascript_include_tag('jquery-2.2.4-ui-1.11.0-ujs-5.2.3', 'tribute-3.7.3.min', 'application', 'responsive')
unless User.current.pref.warn_on_leaving_unsaved == '0' unless User.current.pref.warn_on_leaving_unsaved == '0'
tags << "\n".html_safe + javascript_tag("$(window).on('load', function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });") tags << "\n".html_safe + javascript_tag("$(window).on('load', function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
end end

View File

@@ -9,7 +9,7 @@
<meta name="keywords" content="issue,bug,tracker" /> <meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %> <%= csrf_meta_tag %>
<%= favicon %> <%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.12.1', 'tribute-3.7.3', 'application', 'responsive', :media => 'all' %> <%= stylesheet_link_tag 'jquery/jquery-ui-1.11.0', 'tribute-3.7.3', 'application', 'responsive', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %> <%= javascript_heads %>
<%= heads_for_theme %> <%= heads_for_theme %>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1450,6 +1450,7 @@ td.gantt_selected_column .gantt_hdr,.gantt_selected_column_container {
.ui-tooltip { .ui-tooltip {
background: #000; background: #000;
color: #fff; color: #fff;
font-size: 0.9em;
border-radius: 3px; border-radius: 3px;
border: 0; border: 0;
box-shadow: none box-shadow: none
@@ -1632,21 +1633,10 @@ color: #555; text-shadow: 1px 1px 0 #fff;
img.filecontent.image {background-image: url(../images/transparent.png);} img.filecontent.image {background-image: url(../images/transparent.png);}
/* Custom JQuery styles */ /* Custom JQuery styles */
.ui-autocomplete { .ui-datepicker-title select {width:70px !important; margin-top:-2px !important; margin-right:4px !important;}
border-radius: 2px; .ui-menu.ui-widget-content {background:#fff;}
border: 1px solid #ccc; .ui-menu .ui-menu-item:hover {font-weight:normal; background:#759FCF; color:#fff !important; border:1px solid #759FCF;}
} .ui-menu .ui-menu-item.ui-state-focus {font-weight:normal; color:#555; border-color:#759FCF;}
.ui-autocomplete .ui-menu-item > div {
padding: 4px 8px;
}
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active {
border-color: #759FCF;
background: #759FCF;
}
.ui-widget-overlay {
background: #000;
opacity: 70%;
}
/* Custom tribute styles */ /* Custom tribute styles */
.tribute-container ul { .tribute-container ul {

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 418 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 312 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 345 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 262 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 207 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 278 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 343 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long