mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Add the links handler to rich editor

Browse Source 
Other small fixes
This commit is contained in:
Samuel Georges 2015-06-24 18:38:41 +10:00
parent 7b54d4c7c4
commit 453d2fda56
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/backend/formwidgets/richeditor/assets/css/richeditor.css
View File

@ -136,6 +136,7 @@
.redactor-dropdown a{display:block;padding:10px 15px;color:#000;text-decoration:none;border-bottom:1px solid rgba(0,0,0,0.07000000000000001)}
.redactor-dropdown a:last-child{border-bottom:none}
.redactor-dropdown a:hover{background-color:#1f78d8;color:#fff !important;text-decoration:none}
.redactor-dropdown a.selected{background-color:#000;color:#fff}
#redactor-image-box{position:relative;max-width:100%;display:inline-block;line-height:0;outline:1px dashed rgba(0,0,0,0.6)}
#redactor-image-editter{position:absolute;z-index:5;top:50%;left:50%;margin-top:-11px;margin-left:-18px;line-height:1;background-color:#000;color:#fff;font-size:11px;padding:7px 10px;cursor:pointer}
#redactor-image-resizer{position:absolute;z-index:2;line-height:1;cursor:nw-resize;bottom:-4px;right:-5px;border:1px solid #fff;background-color:#000;width:8px;height:8px}
@ -160,7 +161,7 @@ to{background-position:0 0}
}
#redactor-modal-overlay{position:fixed;top:0;left:0;margin:auto;overflow:auto;width:100%;height:100%;background-color:#000 !important;filter:alpha(opacity=30);-moz-opacity:0.3;opacity:0.3}
#redactor-modal-box{position:fixed;top:0;left:0;bottom:0;right:0;overflow-x:hidden;overflow-y:auto}
#redactor-modal{position:relative;margin:auto;margin-bottom:20px;padding:0;background:#fff;color:#000;font-size:14px !important;font-family:Arial,Helvetica,Verdana,Tahoma,sans-serif;box-shadow:0 1px 70px rgba(0,0,0,0.5)}
#redactor-modal{outline:0;position:relative;margin:auto;margin-bottom:20px;padding:0;background:#fff;color:#000;font-size:14px !important;font-family:Arial,Helvetica,Verdana,Tahoma,sans-serif;box-shadow:0 1px 70px rgba(0,0,0,0.5)}
#redactor-modal header{padding:30px 40px 5px 40px;font-size:18px;font-weight:bold}
#redactor-modal section{padding:30px 40px 50px 40px}
#redactor-modal label{display:block;float:none !important;margin:15px 0 3px 0 !important;padding:0}
@ -212,7 +213,7 @@ to{background-position:0 0}
.redactor-editor table td,.redactor-editor table th{padding:5px;border:1px solid #ddd;vertical-align:top}
.redactor-editor table thead td,.redactor-editor table th{font-weight:bold;border-bottom-color:#888}
.redactor-editor code{background-color:#d8d7d7}
.redactor-editor pre{overflow:auto;padding:1em;border:1px solid #ddd;border-radius:3px;background:#f8f8f8;white-space:pre;font-size:90%}
.redactor-editor pre{padding:1em;border:1px solid #ddd;border-radius:3px;background:#f8f8f8;white-space:pre;font-size:90%}
.redactor-editor hr{display:block;height:1px;border:0;border-top:1px solid #ccc}
.redactor-editor h1,.redactor-editor h2,.redactor-editor h3,.redactor-editor h4,.redactor-editor h5,.redactor-editor h6{font-weight:bold;color:#000;padding:0;background:none;text-rendering:optimizeLegibility;margin:0 0 .5em 0}
.redactor-editor h1,.redactor-editor h2,.redactor-editor h3,.redactor-editor h4{line-height:1.3}

1
modules/backend/formwidgets/richeditor/partials/_richeditor.htm
View File

@ -7,6 +7,7 @@
class="field-richeditor size-<?= $size ?> <?= $stretch?'layout-relative stretch':'' ?>"
<?php if ($fullPage): ?>data-fullpage="true"<?php endif ?>
data-data-locker="#<?= $this->getId('dataLocker') ?>"
data-links-handler="<?= $this->getEventHandler('onGetPageLinks') ?>"
data-control="richeditor">
<textarea id="<?= $this->getId('textarea') ?>"></textarea>
</div>

2
modules/backend/widgets/table/assets/css/table.css
View File

@ -305,7 +305,7 @@
outline: none;
}
html.cssanimations .control-table td[data-column-type=dropdown] [data-view-container].loading:after {
background-image: url(../../../../assets/images/loader-transparent.svg);
background-image: url('../../../../../../modules/system/assets/ui/images/loader-transparent.svg');
background-size: 15px 15px;
background-position: 50% 50%;
position: absolute;

2
modules/backend/widgets/table/assets/less/table.less
View File

@ -369,7 +369,7 @@
html.cssanimations {
.control-table td[data-column-type=dropdown] {
[data-view-container].loading:after {
background-image:url(../../../../assets/images/loader-transparent.svg);
background-image: url('../../../../../../modules/system/assets/ui/images/loader-transparent.svg');
background-size: 15px 15px;
background-position: 50% 50%;
position: absolute;

6
modules/system/assets/ui/less/inspector.less
View File

@ -295,10 +295,10 @@
line-height: 29px;
padding-left: 12px;
padding-right: 3px;
.border-radius(0)!important;
.border-radius(0) !important;
&.select2-default {
font-weight: normal!important;
font-weight: normal !important;
}
}
@ -309,7 +309,7 @@
}
&.select2-dropdown-open {
.border-radius(0)!important;
.border-radius(0) !important;
.select2-choice {
background: white;