Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CSS cleanup #37

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CSS cleanup #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions resources/css/wysiwyg-controls.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
// ==========================================================================
// Project: SproutCore WYSIWYG
// Copyright: ©2012 Matygo Educational Incorporated operating as Learndot
// Author: Joe Gaudet ([email protected]) and contributors (see contributors.txt)
// License: Licensed under MIT license (see license.js)
// ==========================================================================

@import "compass/css3";


/*
* SC.WYSIWYGView
Expand Down
107 changes: 2 additions & 105 deletions resources/css/wysiwyg-icons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "compass/css3";

$theme.sc-view.button.sc-button-view.sc-wysiwyg-button {

Expand All @@ -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;
Expand All @@ -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");
}
}
128 changes: 0 additions & 128 deletions resources/css/wysiwyg-styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "compass/css3";

$theme.sc-wysiwyg-editor > .sc-wysiwyg-editor-hint {
position: absolute;
Expand All @@ -11,138 +10,11 @@ $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;

/* Override the blue webkit focus outline. */
&: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;
}
}