fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-25 06:09:55 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into fuxml/no-xml-lang

Browse source 
Conflicts:
	modules/comment/lang/lang.xml
	modules/document/lang/lang.xml
	modules/member/lang/lang.xml
This commit is contained in:
Kijin Sung 2016-01-31 16:13:03 +09:00
commit 4797e858b8
46 changed files with 1230 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

35
common/css/xe.css
View file

@ -63,14 +63,16 @@ a img {
/* Popup Menu Area */
#popup_menu_area {
position: absolute;
z-index:9999;
margin: 10px 0;
padding: 10px;
border: 1px solid #e9e9e9;
border-radius: 3px;
padding: 0;
border: 1px solid #eeeeee;
border-radius: 2px;
font-size: 12px;
box-shadow: 0 0 6px #666;
filter: progid: DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5);
box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
background: #fff;
min-width:80px;
outline:none;
}
#popup_menu_area ul {
margin: 0;
@ -80,20 +82,31 @@ a img {
#popup_menu_area li {
margin: 0;
padding: 0;
line-height: 1.25;
line-height: 1.5;
}
#popup_menu_area a {
display: block;
padding: 1px 3px;
border-radius: 2px;
padding: 5px;
text-decoration: none;
color: #333;
color: #212121;
}
#popup_menu_area a:hover,
#popup_menu_area a:active,
#popup_menu_area a:focus {
color: #fff;
background: #666;
background: #eeeeee;
}
@media screen and (max-width: 400px) {
#popup_menu_area {
min-width:120px;
max-width:95%;
font-size: 13px;
}
#popup_menu_area a {
display: block;
padding: 10px;
text-decoration: none;
color: #212121;
}
}
/* Message */

2
common/js/common.js
View file

@ -945,7 +945,7 @@ jQuery(function($){
// display popup menu that contains member actions and document actions
$(document).on('click', function(evt) {
var $area = $('#popup_menu_area');
if(!$area.length) $area = $('<div id="popup_menu_area" tabindex="0" style="display:none;z-index:9999" />').appendTo(document.body);
if(!$area.length) $area = $('<div id="popup_menu_area" tabindex="0" style="display:none;" />').appendTo(document.body);
// 이전에 호출되었을지 모르는 팝업메뉴 숨김
$area.hide();

2
common/js/xml_handler.js
View file

@ -11,7 +11,7 @@
/**
* Set this variable to false to hide the "do you want to leave the page?" dialog.
*/
window.show_leaving_warning = false;
window.show_leaving_warning = true;
/**
* This variable stores the .wfsr jQuery object.