From 9ea3a8b32146073f4b064d65bfdfba14205655d2 Mon Sep 17 00:00:00 2001 From: Nicolas Badia Date: Sat, 4 Feb 2017 13:41:19 +0100 Subject: [PATCH] CSS cleanup --- resources/css/wysiwyg-controls.css | 9 -- resources/css/wysiwyg-icons.css | 107 +----------------------- resources/css/wysiwyg-styles.css | 128 ----------------------------- 3 files changed, 2 insertions(+), 242 deletions(-) diff --git a/resources/css/wysiwyg-controls.css b/resources/css/wysiwyg-controls.css index e454e6f..78abb64 100644 --- a/resources/css/wysiwyg-controls.css +++ b/resources/css/wysiwyg-controls.css @@ -1,12 +1,3 @@ -// ========================================================================== -// Project: SproutCore WYSIWYG -// Copyright: ©2012 Matygo Educational Incorporated operating as Learndot -// Author: Joe Gaudet (joe@learndot.com) and contributors (see contributors.txt) -// License: Licensed under MIT license (see license.js) -// ========================================================================== - -@import "compass/css3"; - /* * SC.WYSIWYGView diff --git a/resources/css/wysiwyg-icons.css b/resources/css/wysiwyg-icons.css index 0bdd253..441107d 100644 --- a/resources/css/wysiwyg-icons.css +++ b/resources/css/wysiwyg-icons.css @@ -1,4 +1,3 @@ -@import "compass/css3"; $theme.sc-view.button.sc-button-view.sc-wysiwyg-button { @@ -8,9 +7,9 @@ $theme.sc-view.button.sc-button-view.sc-wysiwyg-button { label { margin: 0 0 0 0; - padding: 0 0 0 0; + padding: 0 0 0 4px; line-height: 22px; - + .icon { top: 0; right: 0; @@ -20,105 +19,3 @@ $theme.sc-view.button.sc-button-view.sc-wysiwyg-button { } } } - -/* - * Command toolbar icons, retina ready. Need some polishing. - */ -$theme.sc-wysiwyg-toolbar, $theme.sc-wysiwyg-segmented { - .bold { - width: 14px; - height: 19px; - @include slice("../images/icons2/bold.png"); - } - - .italic { - width: 12px; - height: 19px; - @include slice("../images/icons2/italic.png"); - } - - .underline { - width: 13px; - height: 15px; - @include slice("../images/icons/text_underline.png"); - } - - .insert-ordered-list { - width: 17px; - height: 17px; - @include slice("../images/icons2/ordered-list.png"); - - } - - .insert-unordered-list { - width: 17px; - height: 15px; - @include slice("../images/icons2/unordered-list.png"); - } - - .justify-left { - width: 15px; - height: 14px; - @include slice("../images/icons/align_left.png"); - } - - .justify-full { - width: 15px; - height: 14px; - @include slice("../images/icons/justify.png"); - } - - .justify-center { - width: 15px; - height: 14px; - @include slice("../images/icons/align_center.png"); - } - - .justify-right{ - width: 15px; - height: 14px; - @include slice("../images/icons/align_right.png"); - } - - .indent { - width: 25px; - height: 25px; - @include slice("../images/icons2/left_indent.png"); - } - - .outdent { - width: 25px; - height: 25px; - @include slice("../images/icons2/right_indent.png"); - } - - .insert-image { - width: 17px; - height: 15px; - @include slice("../images/icons2/picture.png"); - } - - .embed { - width: 19px; - height: 9px; - @include slice("../images/icons/embed.png"); - } - - .link { - width: 17px; - height: 19px; - @include slice("../images/icons2/link.png"); - } - - .embed-video { - width: 25px; - height: 25px; - @include slice("../images/icons2/film.png"); - } - - .fullscreen { - width: 25px; - height: 25px; - @include slice("../images/icons2/fullscreen.png"); - } -} \ No newline at end of file diff --git a/resources/css/wysiwyg-styles.css b/resources/css/wysiwyg-styles.css index cfe9a59..61e8f4b 100644 --- a/resources/css/wysiwyg-styles.css +++ b/resources/css/wysiwyg-styles.css @@ -1,4 +1,3 @@ -@import "compass/css3"; $theme.sc-wysiwyg-editor > .sc-wysiwyg-editor-hint { position: absolute; @@ -11,13 +10,6 @@ $theme.sc-wysiwyg-editor > .sc-wysiwyg-editor-hint { $theme.sc-wysiwyg-editor > .sc-wysiwyg-editor-hint, $theme.sc-wysiwyg-editor > .sc-wysiwyg-editor-inner { - word-wrap: break-word; - font-family: Helvetica, Arial, sans-serif; - color: #404040; - -webkit-font-smoothing: antialiased; - text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.004); - font-size: 18px; - white-space: normal; /* Hiding overflow is required to get images which float off the bottom of the text to behave correctly. */ overflow: hidden; @@ -25,124 +17,4 @@ $theme.sc-wysiwyg-editor > .sc-wysiwyg-editor-inner { &:focus { outline: none; } - - .smoothed { - -webkit-font-smoothing: antialiased; - font-smoothing: antialiased; - font-smooth: always; - } - - span.tab { - margin-left: 2em; - } - - img { - display: block; - margin: 2px auto 2px auto; - } - - a { - color: #3b74d5; - - &:hover { - color: #3b74d5; - cursor: pointer; - } - - &:active { - color: #3b74d5; - cursor: pointer; - } - - &:visited { - color: #3b74d5; - } - } - - h1 { - @extend .smoothed; - font-weight: bold !important; - font-size: 32px; - } - - h2 { - @extend .smoothed; - font-weight: bold !important; - font-size: 28px; - } - - h3 { - @extend .smoothed; - font-weight: bold !important; - font-size: 24px; - } - - h4 { - @extend .smoothed; - font-weight: bold !important; - font-size: 20px; - } - - h5 { - @extend .smoothed; - font-weight: bold !important; - font-size: 18px; - } - - h6 { - @extend .smoothed; - font-weight: bold !important; - font-size: 14px; - } - - /* div is included because they are momentarily inserted before we reformat them as p */ - p, div { - margin-bottom: 15px; - overflow: visible; - - &:last-child { - margin-bottom: 0; - } - } - - pre { - margin-bottom: 10px; - } - - ul { - list-style: disc outside none !important; - li { - list-style: disc outside none !important; - } - } - - ol { - padding: 0px 0px 15px 40px; - margin-left: 8px !important; - - li { - padding: 2px 2px 0px 2px; - } - - li:last-child { - padding: 2px 2px 2px 2px; - } - } - - ul { - padding: 0px 0px 15px 40px; - margin: 0 0 0 0 !important; - - li { - padding: 2px 2px 0px 2px; - } - - li:last-child { - padding: 2px 2px 2px 2px; - } - } - - blockquote { - margin-left: 40px; - } }