Skip to content

T
taskonsite-архив-перенесен
Commit dbf1e574 authored by john's avatar john
Browse files
Options

t_3068

parent 798582e3
Show whitespace changes
Inline Side-by-side
Showing with 3971 additions and 3733 deletions
backend/web/plugins/editormd/documentation.js
View file @ dbf1e574
......@@ -22,6 +22,7 @@ $(function ()
//toolbar : false, //关闭工具栏
//previewCodeHighlight : false, // 关闭预览 HTML 的代码块高亮，默认开启
// emoji: true,
atLink: false,
taskList: true,
tocm: true, // Using [TOCM]
tex: true, // 开启科学公式TeX语言支持，默认关闭
......
backend/web/plugins/editormd/editormd.js
View file @ dbf1e574
......@@ -3520,7 +3520,7 @@
editormd.firstUpperCase = editormd.ucfirst = firstUpperCase;
editormd.urls = {
atLinkBase: "https://github.com/"
atLinkBase: "https://task-on.com/"
};
editormd.regexs = {
......@@ -3758,7 +3758,9 @@
markdownToC.push(toc);
var headingHTML = "<h" + level + " id=\"h" + level + "-" + this.options.headerPrefix + id + "\">";
var headingHTML = "<h" + level
// + " id=\"h" + level + "-" + this.options.headerPrefix + id + "\""
+">";
headingHTML += "<a name=\"" + text + "\" class=\"reference-link\"></a>";
headingHTML += "<span class=\"header-link octicon octicon-link\"></span>";
......
common/modules/documentation/assets/src/css/styles.css
View file @ dbf1e574
......@@ -4,9 +4,10 @@
* Theme Styles
*/
/* эту стиле лучше в вверху поменять */
body {
font-family: "RobotoRegular" !important;
color: #5a5a5a !important;
color: #0a0a0a !important;
}
header {
color: #ffffff;
......@@ -34,8 +35,9 @@ header {
top: -2px;
}
.offcanvas-wrapper p {
font-size: 15px;
line-height: 24px;
font-size: 17px;
line-height: 28px;
color: #0a0a0a;
}
.offcanvas-wrapper ol:not([class]) {
/*list-style: decimal outside ;
......@@ -43,11 +45,11 @@ header {
counter-reset: myCounter;
padding-left: 25px;
}
.offcanvas-wrapper ol:not([class]) li {
.offcanvas-wrapper ol:not([class])>li {
position: relative;
margin-bottom: 8px;
}
.offcanvas-wrapper ol:not([class]) li:before {
.offcanvas-wrapper ol:not([class])>li:before {
counter-increment: myCounter;
content:counter(myCounter);
/*color: #2980B9;*/
......@@ -7006,6 +7008,9 @@ video {
max-width: 100%;
padding: 10px 15px;
}
.tooltip {
left: 9px !important;
}
.user-info-wrapper .info-label {
display: block;
......@@ -8119,6 +8124,18 @@ video {
border-color: #2d323a;
color: #fff;
}
/* add */
.offcanvas-wrapper {
font-size: 15px;
line-height: 24px;
}
.txtbtnclose {
top: 11px;
}
.promo_title {
font-size: 22px;
}
#modalBlogSidebar {
opacity: 1 !important;
}
......@@ -8131,6 +8148,238 @@ video {
-ms-transform: translate(0, 0px);
transform: translate(0, 0px);
}
.tooltip.fade.in{
opacity: 1!important
.offcanvas-wrapper ol:not([class]) {
padding-left: 35px;
}
.offcanvas-wrapper ol:not([class])>li:before {
font-size: 15px;
font-family: "RobotoBold";
background: #00AEC7;
display: inline-block;
text-align: center;
top: 1px;
left: -35px;
line-height: 23px;
width: auto;
min-width: 23px;
padding: 0 4px;
height: 23px;
border: none;
color: #ffffff;
border-radius: 11px;
}
.offcanvas-wrapper ul:not([class]),
.offcanvas-wrapper ol:not([class]) {
margin-bottom: 20px;
font-size: 17px;
line-height: 28px;
color: #0a0a0a;
}
.offcanvas-wrapper p + ul:not([class]),
.offcanvas-wrapper p + ol:not([class]) {
margin-top: -15px;
}
.offcanvas-wrapper ol:not([class]) ol:not([class]) {
counter-reset: myCounterIn;
padding-left: 25px;
}
.offcanvas-wrapper ol:not([class])>li ol:not([class])>li:before {
counter-increment: myCounterIn;
content: counter(myCounter) "."counter(myCounterIn);
font-size: 12px;
font-weight: bold;
}
ol.linenums {
padding-left: 35px;
list-style: decimal;
}
.offcanvas-wrapper ul:not([class]) {
list-style: none;
padding-left: 0;
}
.offcanvas-wrapper ul:not([class])>li {
background: url(../images/icon/ul_list_blue.png) no-repeat left 6px;;
padding-left: 30px;
}
.offcanvas-wrapper table:not([class]) {
margin-bottom: 20px;
}
.offcanvas-wrapper table:not([class]) tr th {
background-color: transparent;
border: none;
border-bottom: 2px solid #dee2e6;
border-top: 1px solid #dee2e6;
padding: .75rem;
}
.offcanvas-wrapper table:not([class]) tr td {
border-top: 1px solid #dee2e6;
padding: .75rem;
}
li.L0, li.L1, li.L2, li.L3, li.L5, li.L6, li.L7, li.L8 {
list-style-type: decimal;
}
.text-muted {
font-size: 16px;
}
.faq_sec .way a {
text-decoration: none;
}
.faq_sec .way {
font-size: 13px;
color: #b4b4b4;
}
.faq_sec .way span {
padding: 0 15px;
}
.faq_sec .way a:hover{
color: #323232;
}
.offcanvas-wrapper blockquote{
padding: 25px 35px;
position: relative;
/*font-style: italic;*/
font-size: 14px;
line-height: 24px;
color: #050505;
border-radius: 0 5px 5px 0;
background-color: #bce094;
}
.offcanvas-wrapper blockquote p {
font-size: 14px;
line-height: 24px;
}
.offcanvas-wrapper blockquote:not(:last-child){
margin-bottom: 20px;
}
.offcanvas-wrapper blockquote:before{
content: '';
display: block;
position: absolute;
top: 0;
bottom: 0;
left: 0;
width: 7px;
background-color: #67ac1d;
}
.offcanvas-wrapper blockquote.pink {
background-color: #ffb0ae;
}
.offcanvas-wrapper blockquote.pink:before{
background-color: #ff5b57;
}
.offcanvas-wrapper blockquote.blue {
background-color: #bde7e5;
}
.offcanvas-wrapper blockquote.blue:before{
background-color: #2a8e89;
}
.top_line_inf2 {
min-height: 44px;
background-color: #051922;
}
.top_line_icon {
display: block;
position: absolute;
left: 0px;
top: 50%;
-webkit-transform: translate(0, -50%);
-ms-transform: translate(0, -50%);
-o-transform: translate(0, -50%);
transform: translate(0, -50%);
}
.icon_info_new {
width: 24px;
height: 24px;
background: url(../images/icon_info_new.png) 0 0 no-repeat;
}
.icon_video_new {
width: 23px;
height: 18px;
background: url(../images/icon_video_new.png) 0 0 no-repeat;
}
.icon_doc_new {
width:18px;
height: 24px;
background: url(../images/icon_doc_new.png) 0 0 no-repeat;
}
.top_line_inf2 li {
display: inline-block;
border-right: 1px solid #0e3242;
position: relative;
margin-left: 20px;
}
.top_line_inf2 li:last-child {
border: none;
}
.top_line_inf2 li a {
color: #fffcf4;
font-size: 13px;
line-height: 25px;
padding: 10px 20px;
padding-left: 35px;
display: inline-block;
text-decoration: none;
-webkit-transition: all 0s;
-o-transition: all 0s;
transition: all 0s;
}
.top_line_inf2 li:first-child {
margin-left: 0px;
}
.top_line_inf2 li a:hover {
text-decoration: none;
color: #6def0d;
}
.top_line_inf2 li a:hover span {
background-position: 0 100%;
}
.top_line_inf2 li.active a {
text-decoration: none;
color: #6def0d;
}
.top_line_inf2 li.active a span {
background-position: 0 100%;
}
.top_line_inf2 li.active:after {
position: absolute;
content: '';
left: 50%;
margin-left: -3px;
bottom: -6px;
width: 0px;
height: 0px;
border-left: 6px solid transparent;
border-right: 6px solid transparent;
border-top: 6px solid #051922;
}
@media only screen and (max-width: 1000px) {
.top_line_inf2 li {
display: block;
margin-left: 0;
}
}
.image-popuped{
cursor:pointer;
max-width: 100%;
}
.token.comment {
display: inline;
margin-bottom: 0;
}
\ No newline at end of file
common/modules/documentation/assets/src/js/documentation.js
View file @ dbf1e574
......@@ -14,7 +14,7 @@ $(function ()
$(this).html(listOfImages.join('')).removeClass('owl-carousel-need-replace hidden');
})
$('.container_documentation .container_documentation_right').find('img:not(".container_documentation_owl_img")').click(function ()
$('.container_documentation .container_documentation_right').find('img:not(".container_documentation_owl_img")').addClass('image-popuped').click(function ()
{
$.magnificPopup.open({
items: {
......
common/modules/documentation/models/DocList.php
View file @ dbf1e574
......@@ -226,22 +226,8 @@ class DocList extends \yii\db\ActiveRecord
public function getFormatedCreatedAt()
{
$mt = [
'01' => 'января',
'02' => 'февраля',
'03' => 'марта',
'04' => 'апреля',
'05' => 'мая',
'06' => 'июня',
'07' => 'июля',
'08' => 'августа',
'09' => 'сентября',
'10' => 'октября',
'11' => 'ноября',
'12' => 'декабря',
];
if (Yii::$app->language == 'ru-RU')
return date('d ' . $mt[date('m', $this->created_at)] . ' Y г.', $this->created_at);
return date('d.m.Y г.', $this->created_at);
return Yii::$app->formatter->asDate($this->created_at, "medium");
}
......
common/modules/documentation/views/page/view.php
View file @ dbf1e574
......@@ -115,17 +115,17 @@ $this->registerMetaTag(['property' => 'og:site_name', 'content' => 'Арт Пр
<!-- Off-Canvas Wrapper-->
<div class="offcanvas-wrapper" id="box1">
<!-- Page Content-->
<div class="container container_documentation padding-bottom-3x mb-2">
<div class="container padding-bottom-3x mb-2">
<div class="row">
<!-- Content-->
<div class="col-xl-8 col-lg-7 order-lg-2 container_documentation_right">
<div class="col-xl-9 col-lg-8 order-lg-2">
<!-- Post-->
<h1><?php echo $modelContent->name ?></h1>
<div class="single-post-meta">
<div class="meta-link"><i class="icon-clock"></i> <?= $model->list->getFormatedCreatedAt() ?></div>
<div class="meta-link"><i class="icon-clock"></i> Обновлено: <?= $model->list->getFormatedCreatedAt() ?></div>
</div>
<?php echo str_replace(['<!-- ¿¿¿CAROUSEL_BEGIN¿¿¿ -->', '<!-- ¿¿¿CAROUSEL_END¿¿¿ -->'], ['<div class="owl-carousel owl-carousel-need-replace hidden" data-owl-carousel="{ &quot;nav&quot;: true, &quot;dots&quot;: true, &quot;loop&quot;: true }">', '</div>'], $modelContent->html) ?>
......@@ -174,7 +174,7 @@ $this->registerMetaTag(['property' => 'og:site_name', 'content' => 'Арт Пр
</div>
<!-- Sidebar -->
<div class="col-xl-4 col-lg-5 order-lg-1">
<div class="col-xl-3 col-lg-4 order-lg-1">
<button class="sidebar-toggle position-left" data-toggle="modal" data-target="#modalBlogSidebar"><i class="icon-layout"></i></button>
<aside class="sidebar sidebar-offcanvas">
<!-- Widget Categories-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

task-on.com - ООО "Арт Проект"