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

Merge branch 'develop' into next

Browse source
This commit is contained in:
Kijin Sung 2020-08-29 23:53:31 +09:00
commit ffe9cda5e0
37 changed files with 2047 additions and 1931 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common/constants.php
View file

@ -3,7 +3,7 @@
/**
* RX_VERSION is the version number of the Rhymix CMS.
*/
define('RX_VERSION', '1.9.9.8');
define('RX_VERSION', '1.9.9.9');
/**
* RX_MICROTIME is the startup time of the current script, in microseconds since the Unix epoch.
@ -139,11 +139,6 @@ define('__XE_RECOMMEND_PHP_VERSION__', '7.2.0');
define('__ZBXE__', true);
define('__ZBXE_VERSION__', RX_VERSION);
define('_XE_PATH_', RX_BASEDIR);
define('_XE_PACKAGE_', 'XE');
define('_XE_LOCATION_', 'en');
define('_XE_LOCATION_SITE_', 'https://xe1.xpressengine.com/');
define('_XE_DOWNLOAD_SERVER_', 'https://download.xpressengine.com/');
define('__DEBUG__', 0);
/**
* Status constants for various content types.

6
common/css/rhymix.less
View file

@ -234,6 +234,12 @@ a img {
border-bottom-right-radius: 4px;
box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.18), 0 0 6px 0 rgba(0, 0, 0, 0.12);
z-index: 1073741824;
&.visible {
display: block;
@media print {
display: none;
}
}
&:hover {
background: #dddddd;
background: linear-gradient(to bottom, #e8e8e8 0%, #d9d9d9 100%);

2
common/js/debug.js
View file

@ -15,7 +15,7 @@ $(function() {
// Find debug panel elements.
var panel = $("#rhymix_debug_panel");
var button = $("#rhymix_debug_button").show();
var button = $("#rhymix_debug_button").addClass('visible');
// Initialize the debug button.
var button_link = $('<a href="#"></a>').text("DEBUG").appendTo(button).click(function(event) {

2
common/lang/ko.php
View file

@ -90,7 +90,7 @@ $lang->password = '비밀번호';
$lang->password1 = '새 비밀번호';
$lang->password2 = '새 비밀번호 확인';
$lang->password3 = '비밀번호 확인';
$lang->admin_id = '관리자ID';
$lang->admin_id = '관리자 ID';
$lang->admin_email_address = '관리자 Email 주소';
$lang->writer = '글쓴이';
$lang->user_name = '이름';

4
common/tpl/common_layout.html
View file

@ -5,7 +5,9 @@
<!-- META -->
<meta charset="utf-8">
<meta name="generator" content="Rhymix">
<meta name="viewport" content="{config('mobile.viewport') ?: 'width=device-width, initial-scale=1.0, user-scalable=yes'}" cond="$m" />
<!--@if(Mobile::isFromMobilePhone() && $__mv = config('mobile.viewport') ?? HTMLDisplayHandler::DEFAULT_VIEWPORT)-->
<meta name="viewport" content="{$__mv}" />
<!--@endif-->
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<block loop="Context::getMetaTag() => $no, $val">
<meta http-equiv="{$val['name']}"|cond="$val['is_http_equiv']" name="{$val['name']}"|cond="!$val['is_http_equiv']" content="{$val['content']}" />