Update editor-style.css

- Bring in latest Bootstrap changes

- Add instructions on how to update the file
This commit is contained in:
Ben Word
2013-02-14 14:43:48 -06:00
parent 8bb57d3cf8
commit 87a561241c

View File

@@ -1,7 +1,12 @@
/*
Theme Name: Roots
Description: Used to style the TinyMCE editor
*/
/**
* Updating this file with Bootstrap changes:
*
* 1. Go to http://twitter.github.com/bootstrap/customize.html
* 2. Un-toggle everything
* 3. Check: 'Body type and links', 'Headings, body, etc', 'Code and pre'
* 4. Download
* 5. Remove margin property on body tag
*/
.clearfix {
*zoom: 1;
@@ -41,7 +46,8 @@ a {
color: #0088cc;
text-decoration: none;
}
a:hover {
a:hover,
a:focus {
color: #005580;
text-decoration: underline;
}
@@ -88,30 +94,47 @@ cite {
.muted {
color: #999999;
}
a.muted:hover,
a.muted:focus {
color: #808080;
}
.text-warning {
color: #c09853;
}
a.text-warning:hover {
a.text-warning:hover,
a.text-warning:focus {
color: #a47e3c;
}
.text-error {
color: #b94a48;
}
a.text-error:hover {
a.text-error:hover,
a.text-error:focus {
color: #953b39;
}
.text-info {
color: #3a87ad;
}
a.text-info:hover {
a.text-info:hover,
a.text-info:focus {
color: #2d6987;
}
.text-success {
color: #468847;
}
a.text-success:hover {
a.text-success:hover,
a.text-success:focus {
color: #356635;
}
.text-left {
text-align: left;
}
.text-right {
text-align: right;
}
.text-center {
text-align: center;
}
h1,
h2,
h3,
@@ -194,6 +217,21 @@ ol.unstyled {
margin-left: 0;
list-style: none;
}
ul.inline,
ol.inline {
margin-left: 0;
list-style: none;
}
ul.inline > li,
ol.inline > li {
display: inline-block;
*display: inline;
/* IE7 inline-block hack */
*zoom: 1;
padding-left: 5px;
padding-right: 5px;
}
dl {
margin-bottom: 20px;
}
@@ -253,9 +291,9 @@ blockquote {
}
blockquote p {
margin-bottom: 0;
font-size: 16px;
font-size: 17.5px;
font-weight: 300;
line-height: 25px;
line-height: 1.25;
}
blockquote small {
display: block;
@@ -309,6 +347,7 @@ code {
color: #d14;
background-color: #f7f7f9;
border: 1px solid #e1e1e8;
white-space: nowrap;
}
pre {
display: block;
@@ -333,6 +372,8 @@ pre.prettyprint {
pre code {
padding: 0;
color: inherit;
white-space: pre;
white-space: pre-wrap;
background-color: transparent;
border: 0;
}