app/assets/javascripts/activeadmin/trumbowyg/ui/sass/trumbowyg.scss in activeadmin_trumbowyg-0.1.3 vs app/assets/javascripts/activeadmin/trumbowyg/ui/sass/trumbowyg.scss in activeadmin_trumbowyg-0.1.6

- old
+ new

@@ -1,7 +1,7 @@ /** - * Trumbowyg v2.8.1 - A lightweight WYSIWYG editor + * Trumbowyg v2.11.1 - A lightweight WYSIWYG editor * Default stylesheet for Trumbowyg editor * ------------------------ * @link http://alex-d.github.io/Trumbowyg * @license MIT * @author Alexandre Demode (Alex-D) @@ -102,11 +102,10 @@ .trumbowyg-textarea { position: relative; display: block; overflow: auto; border: none; - white-space: normal; font-size: 14px; font-family: "Inconsolata", "Consolas", "Courier", "Courier New", sans-serif; line-height: 18px; } @@ -173,19 +172,23 @@ .trumbowyg-fullscreen-button svg { color: transparent; } - &:not(:empty) + .trumbowyg-button-group::before { + &::after { content: " "; display: inline-block; width: 1px; background: darken($light-color, 7%); margin: 0 5px; height: 35px; vertical-align: top; } + + &:last-child::after { + content: none; + } } button { display: inline-block; position: relative; @@ -206,10 +209,11 @@ user-select: none; } } &.trumbowyg-disable button:not(.trumbowyg-not-disable):not(.trumbowyg-active), + button.trumbowyg-disable, .trumbowyg-disabled & button:not(.trumbowyg-not-disable):not(.trumbowyg-viewHTML-button) { opacity: 0.2; cursor: default; } &.trumbowyg-disable, @@ -250,14 +254,10 @@ } } .trumbowyg-right { float: right; - - &::before { - display: none !important; - } } } .trumbowyg-dropdown { width: 200px; @@ -265,11 +265,11 @@ padding: 5px 0; border-top: none; background: #FFF; margin-left: -1px; box-shadow: rgba(0, 0, 0, .1) 0 2px 3px; - z-index: 11; + z-index: 12; button { display: block; width: 100%; height: 35px; @@ -303,11 +303,11 @@ left: 50%; transform: translateX(-50%); max-width: 520px; width: 100%; height: 350px; - z-index: 11; + z-index: 12; overflow: hidden; backface-visibility: hidden; } .trumbowyg-modal-box { @@ -410,10 +410,21 @@ } &:focus { background: lighten($light-color, 5%); } } + + input[type="checkbox"]{ + left: 5px; + top: 5px; + right: auto; + + + .trumbowyg-input-infos span{ + width: auto; + padding-left: 25px; + } + } } .error { margin-top: 25px; display: block; @@ -535,11 +546,10 @@ &.trumbowyg-reset-css { background: #FEFEFE !important; font-family: "Trebuchet MS", Helvetica, Verdana, sans-serif !important; font-size: 14px !important; line-height: 1.45em !important; - white-space: normal !important; color: #333; a { color: #15c !important; text-decoration: underline !important; @@ -567,10 +577,13 @@ blockquote { margin-left: 32px !important; font-style: italic !important; color: #555; } + ul { + list-style: disc; + } ul, ol { padding-left: 20px !important; } ul ul, @@ -664,19 +677,19 @@ &::after { background: lighten($dark-color, 7%); } .trumbowyg-button-group:not(:empty) { - &::before { + &::after { background-color: lighten($dark-color, 7%); } .trumbowyg-fullscreen-button svg { color: transparent; } } &.trumbowyg-disable { - .trumbowyg-button-group::before { + .trumbowyg-button-group::after { background-color: lighten($dark-color, 3%); } } button:not(.trumbowyg-disable):hover,