Skip to content

Commit

Permalink
Imperavi redactor updated to 10.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
samdark committed Jul 16, 2015
1 parent 8dd35bb commit aa670ee
Show file tree
Hide file tree
Showing 6 changed files with 151 additions and 86 deletions.
2 changes: 0 additions & 2 deletions ImperaviRedactorWidget.php
Expand Up @@ -9,8 +9,6 @@
* @author Veaceslav Medvedev <slavcopost@gmail.com>
* @author Alexander Makarov <sam@rmcreative.ru>
*
* @version 1.3.12
*
* @link https://github.com/yiiext/imperavi-redactor-widget
* @link http://imperavi.com/redactor
* @license https://github.com/yiiext/imperavi-redactor-widget/blob/master/license.md
Expand Down
21 changes: 10 additions & 11 deletions assets/redactor.css
Expand Up @@ -28,7 +28,7 @@
box-shadow: none;
color: #ccc;
font-size: 13px;
font-family: Menlo, Monaco, monospace, sans-serif;
font-family: Menlo, Monaco, monospace, sans-serif !important;
resize: none;
}
.redactor-box textarea:focus {
Expand Down Expand Up @@ -91,7 +91,7 @@ body .redactor-box-fullscreen {
outline: none;
white-space: normal;
border: 1px solid #eee;
font-family: Arial, Helvetica, Verdana, Tahoma, sans-serif;
font-family: Arial, Helvetica, Verdana, Tahoma, sans-serif !important;
font-size: 14px;
line-height: 1.6em;
}
Expand All @@ -111,7 +111,6 @@ body .redactor-box-fullscreen {
content: attr(placeholder);
display: block;
/* For Firefox */

color: #999 !important;
font-weight: normal !important;
}
Expand Down Expand Up @@ -345,7 +344,7 @@ body .redactor-box-fullscreen {
color: #fff;
padding: 5px 8px;
line-height: 1;
font-family: Arial, Helvetica, Verdana, Tahoma, sans-serif;
font-family: Arial, Helvetica, Verdana, Tahoma, sans-serif !important;
font-size: 12px;
border-radius: 2px;
}
Expand All @@ -363,7 +362,7 @@ body .redactor-box-fullscreen {
background-color: #fff;
box-shadow: 0 1px 7px rgba(0, 0, 0, 0.25);
font-size: 14px;
font-family: Arial, Helvetica, Verdana, Tahoma, sans-serif;
font-family: Arial, Helvetica, Verdana, Tahoma, sans-serif !important;
line-height: 1.6em;
}
.redactor-dropdown a {
Expand Down Expand Up @@ -449,7 +448,7 @@ body .redactor-box-fullscreen {
.redactor-link-tooltip,
.redactor-link-tooltip a {
font-size: 12px;
font-family: Arial, Helvetica, Verdana, Tahoma, sans-serif;
font-family: Arial, Helvetica, Verdana, Tahoma, sans-serif !important;
}
.redactor-link-tooltip a {
color: #ccc;
Expand Down Expand Up @@ -561,7 +560,7 @@ body .redactor-box-fullscreen {
background: #fff;
color: #000;
font-size: 14px !important;
font-family: Arial, Helvetica, Verdana, Tahoma, sans-serif;
font-family: Arial, Helvetica, Verdana, Tahoma, sans-serif !important;
box-shadow: 0 1px 70px rgba(0, 0, 0, 0.5);
}
#redactor-modal header {
Expand Down Expand Up @@ -603,7 +602,7 @@ body .redactor-box-fullscreen {
color: #333;
width: 100%;
font-size: 14px;
font-family: Arial, Helvetica, Verdana, Tahoma, sans-serif;
font-family: Arial, Helvetica, Verdana, Tahoma, sans-serif !important;
-moz-transition: border 0.3s ease-in;
transition: border 0.3s ease-in;
}
Expand Down Expand Up @@ -715,7 +714,7 @@ body .redactor-box-fullscreen {
text-decoration: none;
font-weight: normal;
font-size: 12px;
font-family: Arial, Helvetica, Verdana, Tahoma, sans-serif;
font-family: Arial, Helvetica, Verdana, Tahoma, sans-serif !important;
line-height: 1;
cursor: pointer;
}
Expand Down Expand Up @@ -791,7 +790,8 @@ body .redactor-box-fullscreen {
*/
.redactor-editor code,
.redactor-editor pre {
font-family: Menlo, Monaco, monospace, sans-serif;
font-family: Menlo, Monaco, monospace, sans-serif !important;
cursor: text;
}
.redactor-editor div,
.redactor-editor p,
Expand Down Expand Up @@ -894,7 +894,6 @@ body .redactor-box-fullscreen {
border: 1px solid #ddd;
border-radius: 3px;
background: #f8f8f8;
white-space: pre;
font-size: 90%;
}
.redactor-editor hr {
Expand Down

0 comments on commit aa670ee

Please sign in to comment.