sir-trevor-rails 0.1.3 → 0.2.1

data/app/assets/stylesheets/sir-trevor/icons.css.erb

@@ -1,47 +1,47 @@
 /* All icons */
 
-.sir-trevor .dropzone.image-block p,
-.sir-trevor .dropzone.gallery-block p  {
-  background: url(<%= asset_path 'sir-trevor/icons/new_image.png' %>) no-repeat 0 0;
+.image-block.dropzone p,
+.gallery-block.dropzone p {
+  background-image: url(<%= asset_path 'sir-trevor/icons/new_image.png' %>);
 }
 
-.sir-trevor .sir-trevor-block .delete {
-  background-image: url(<%= asset_path 'sir-trevor/icons/close.gif' %>);
+.tweet-block.dropzone p {
+  background-image: url(<%= asset_path 'sir-trevor/icons/new_tweet.png' %>);
 }
 
-.sir-trevor .sir-trevor-block .handle {
-  background-image: url(<%= asset_path 'sir-trevor/icons/handle.gif' %>);
+.video-block.dropzone p {
+  background-image: url(<%= asset_path 'sir-trevor/icons/new_video.png' %>);
 }
 
-.sir-trevor .dropzone.tweet-block p {
-  background-image: url(<%= asset_path 'sir-trevor/icons/new_tweet.png' %>);
+.sir-trevor-remove-block {
+  background-image: url(<%= asset_path 'sir-trevor/icons/close.gif' %>);
 }
 
-.sir-trevor .dropzone.video-block p {
-  background-image: url(<%= asset_path 'sir-trevor/icons/new_video.png' %>);
+.sir-trevor-drag-handle {
+  background-image: url(<%= asset_path 'sir-trevor/icons/handle.gif' %>);
 }
 
-.sir-trevor .sir-trevor-marker .buttons a.new-block-quote {
+.sir-trevor-button.new-quote {
   background-image: url(<%= asset_path 'sir-trevor/icons/block_editor_blockquote.png' %>);
 }
 
-.sir-trevor .sir-trevor-marker .buttons a.new-image,
-.sir-trevor .sir-trevor-marker .buttons a.new-gallery {
+.sir-trevor-button.new-image,
+.sir-trevor-button.new-gallery {
   background-image: url(<%= asset_path 'sir-trevor/icons/block_editor_image.png' %>);
 }
 
-.sir-trevor .sir-trevor-marker .buttons a.new-text {
+.sir-trevor-button.new-text {
   background-image: url(<%= asset_path 'sir-trevor/icons/block_editor_text.png' %>);
 }
 
-.sir-trevor .sir-trevor-marker .buttons a.new-list {
+.sir-trevor-button.new-list {
   background-image: url(<%= asset_path 'sir-trevor/icons/block_editor_list.png' %>);
 }
 
-.sir-trevor .sir-trevor-marker .buttons a.new-tweet {
+.sir-trevor-button.new-tweet {
   background-image: url(<%= asset_path 'sir-trevor/icons/block_editor_tweet.png' %>);
 }
 
-.sir-trevor .sir-trevor-marker .buttons a.new-video {
+.sir-trevor-button.new-video {
   background-image: url(<%= asset_path 'sir-trevor/icons/block_editor_video.png' %>);
 }

data/app/assets/stylesheets/sir-trevor/sir-trevor.css

@@ -2,189 +2,266 @@
 body { margin: 0; font-size: 1em; line-height: 1.4; }
 
 .sir-trevor {
+  min-width: 600px;
   padding: 0;
   z-index: 1;
 }
 
 .sir-trevor-blocks {
-  padding: 40px 0;
+  padding: 16px 0 44px 0;
   position: relative;
 }
 
-/* Typography reset */
 .sir-trevor { font-size: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
-.sir-trevor , .sir-trevor button, .sir-trevor input, .sir-trevor select, .sir-trevor textarea, .sir-trevor blockquote { font-family: "Helvetica Neue", 'Arial', sans-serif; color: #222; }
-/* Generics */
-.sir-trevor .hidden { display: none !important; visibility: hidden; }
+
+.sir-trevor {
+  font-family: "Helvetica Neue", 'Arial', sans-serif; 
+  color: #222; 
+}
 
 .sir-trevor * {
   -webkit-box-sizing: border-box;
-        -moz-box-sizing: border-box;
-         -ms-box-sizing: border-box;
-             box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  box-sizing: border-box;
 }
 
-/* Formatting Control Bar */
+.sir-trevor p,
+.sir-trevor h1, 
+.sir-trevor h2,
+.sir-trevor h3,
+.sir-trevor h4 {
+  margin: 0 0 10px 0;
+}
 
-.sir-trevor .sir-trevor-formatting-control {
-  background: #e9e9e9;
-  border: 1px solid #dadada;
-  padding: 11px 0;
-  text-align: center;
-  position: absolute;
+/* Formatting control bar */
+
+.sir-trevor-formatting-control {
+  background: #E9E9E9;
+  border: 1px solid #DADADA;
+  padding: 8px;
+  margin: 0;
   width: 100%;
-  z-index: 102;
-  display: box;
-  box-sizing: border-box;
-  margin: -44px 0 0 0;
+  position: relative;
+  z-index: 12;
+  margin-bottom: 35px;
+}
+
+.sir-trevor-formatting-control.fixed {
+  position: fixed;
   top: 0;
 }
 
-.sir-trevor-formatting-control .format-button {
-  min-width: 25px;
+.sir-trevor-format-button {
   padding: 2px 4px;
+  min-width: 30px;
   border-radius: 4px;
   color: white;
   border: 1px solid #9A9A9A;
   background: #B2B2B2;
-  text-align: center;
-  margin: 0 10px 0 0;
   cursor: pointer;
+  display: inline-block;
+  text-align: center;
+  font-size: 0.875em;
+  font-family: Arial;
+  margin-right: 10px;
 }
 
-.sir-trevor-formatting-control .format-button:hover {
+.sir-trevor-format-button:hover {
   background: #606060;
-  border: 1px solid #606060;
+  border: 1px solid #606060;  
 }
 
 /* Marker */
 
-.sir-trevor .sir-trevor-marker {
+.sir-trevor-marker {
   display: block;
   cursor: pointer;
   background: #F5F297;
   border: 1px dotted #DAC962;
   height: 46px;
   text-align: center;
-  vertical-align: top;
   color: #9B8816;
   position: absolute;
   width: 100%;
-  margin-top: -44px;
-  z-index: 101;
+  margin-top: -35px;
+  z-index: 11;
+  font-size: 11px;
 }
 
-.sir-trevor .sir-trevor-marker p {
-  display: inline-block;
-  line-height: 36px;
-  font-size: 10px;
-  font-weight: bold;
-  margin: 0;
-  padding: 0 16px 0 0;
-  color: #9B8816;
+.sir-trevor-marker p,
+.sir-trevor-buttons { 
+  display: inline-block; 
 }
 
-.sir-trevor .sir-trevor-marker .buttons {
-  height: 46px;
-  display: inline-block;
+.sir-trevor-marker p {
+  font-weight: bold;
+  position: relative;
+  top: -10px;
+  margin: 0 20px 0 0;
 }
 
-.sir-trevor .sir-trevor-marker .buttons a {
-  padding: 27px 13px 8px;
-  margin: 0;
+.sir-trevor-marker.drop-zone p { top: 15px; }
+
+.sir-trevor-button {
+  display: inline-block;
   border-left: 1px dotted #DAC962;
-  color: #AF9B24;
   height: 45px;
-  font-size: 8px;
-  display: inline-block;
-  text-decoration: none;
+  padding: 25px 13px 5px;
+  color: #AF9B24;
   background-repeat: no-repeat;
-  background-position: center 9px;
+  background-position: center 7px;
+  text-decoration: none;
 }
 
-/* Button graphics */
+.sir-trevor-button:last-child { border-right: 1px dotted #DAC962; }
 
-.sir-trevor .sir-trevor-marker .buttons a.new-block-quote {
+.sir-trevor-button.new-quote {
   background-image: url(images/sir-trevor/icons/block_editor_blockquote.png);
 }
 
-.sir-trevor .sir-trevor-marker .buttons a.new-image,
-.sir-trevor .sir-trevor-marker .buttons a.new-gallery {
+.sir-trevor-button.new-image,
+.sir-trevor-button.new-gallery {
   background-image: url(images/sir-trevor/icons/block_editor_image.png);
 }
 
-.sir-trevor .sir-trevor-marker .buttons a.new-text {
+.sir-trevor-button.new-text {
   background-image: url(images/sir-trevor/icons/block_editor_text.png);
 }
 
-.sir-trevor .sir-trevor-marker .buttons a.new-list {
+.sir-trevor-button.new-list {
   background-image: url(images/sir-trevor/icons/block_editor_list.png);
 }
 
-.sir-trevor .sir-trevor-marker .buttons a.new-tweet {
+.sir-trevor-button.new-tweet {
   background-image: url(images/sir-trevor/icons/block_editor_tweet.png);
 }
 
-.sir-trevor .sir-trevor-marker .buttons a.new-video {
+.sir-trevor-button.new-video {
   background-image: url(images/sir-trevor/icons/block_editor_video.png);
 }
 
-.sir-trevor .sir-trevor-marker .buttons a:last-child {
-  border-right: 1px dotted #DAC962;
-}
-
-.sir-trevor .sir-trevor-marker .buttons a:hover {
-
-}
-
 /* Blocks */
 
-.sir-trevor .sir-trevor-block {
+.sir-trevor-block {
   position: relative;
-  margin: 0 0 40px 0;
+  margin: 0px 0 23px 0;
   font-size: 14px;
   overflow: hidden;
 }
 
-/* Dragging */
+.sir-trevor-editor-block {
+  padding: 15px 20px;
+  border-top: 1px solid transparent;
+  border-bottom: 1px solid transparent;
+}
 
-.sir-trevor .sir-trevor-block.dragging {
-  opacity: 0.5;
-  background: #fff;
+.sir-trevor-editor-block [contenteditable=true] {
+  margin: 0 20px;
+  min-height: 75px;
 }
 
-/* Block editor */
+.sir-trevor-editor-block [contenteditable=true]:focus {
+  outline: none;
+}
 
-.sir-trevor .sir-trevor-block .block-editor {
-  padding: 15px 20px 15px 40px;
-  border: 1px solid transparent;
+.sir-trevor-remove-block {
+  width: 14px; height: 14px;
+  border: 1px solid #B3B3B3;
+  position: absolute; 
+  top: 10px; right : 8px;
+  cursor: pointer;
+  display: none;
+  background: #fff url(images/sir-trevor/icons/close.gif) no-repeat center center;
 }
 
-.sir-trevor .sir-trevor-block.active .block-editor {
-  border: 1px solid #E9E9E9;
+.sir-trevor-drag-handle {
+  width: 14px;
+  height: 100%;
+  cursor: move;
+  position: absolute;
+  border-radius: 4px 0 0 4px;
+  left: 0;
+  top: 0;
+  display: none;
+  background: #606060 url(images/sir-trevor/icons/handle.gif) repeat-y 2px 2px;
 }
 
-/* Dropzone */
+/*** BLOCK STATES ***/
+
+  /* Block Active State */
+
+  .active .sir-trevor-editor-block,
+  .focussed .sir-trevor-editor-block { 
+    border-top: 1px solid #e9e9e9;
+    border-bottom: 1px solid #e9e9e9;
+  }
+
+  .active .sir-trevor-remove-block,
+  .active .sir-trevor-drag-handle,
+  .focussed .sir-trevor-remove-block,
+  .focussed .sir-trevor-drag-handle {
+    display: block;
+  }
+
+  /* Block Error State */
+
+  .sir-trevor-block-with-errors {
+    background: #CFEEFA;
+  }
+
+  .sir-trevor-block-with-errors .sir-trevor-editor-block { 
+    border-top: 1px solid #7FD7F7;
+    border-bottom: 1px solid #7FD7F7;
+  }
+
+  /* Block Dragging State */
+
+  .sir-trevor-block.dragging {
+    opacity: 0.5;
+    background: #fff;
+  }
+
+  /* Block Loading State */
+
+  .sir-trevor-block.loading {
+    opacity: 0.6;
+  }
+
+  .sir-trevor-block.loading .spinner {
+    width: 32px;
+    height: 32px;
+    top: 50%; left: 50%;
+    position: absolute!important;
+  }
+
+/* Dropzone Blocks */
 
 .sir-trevor-block .dropzone {
   background-color: #E9E9E9;
   border: 1px dotted #B3B3B3;
   padding: 20px;
   text-align: center;
-  margin: 0 40px;
+  margin: 10px auto;
+  max-width: 550px;
 }
 
-.sir-trevor-block .dropzone.dragOver {
-  background: #F5F297;
+.sir-trevor-block .dropzone p {
+  display: inline-block;
+  font-size: 24px;
+  border: 1px dotted #B3B3B3;
+  color: #282828;
+  padding: 15px 60px 15px 100px;
 }
 
-.sir-trevor .sir-trevor-block .dropzone p {
-  font-size: 20px;
-  line-height: 50px;
-  display: inline-block;
-  color: #666;
+.sir-trevor-block .dropzone.drag-enter {
+  background: #F5F297;
+  border-color: #DAC962;
 }
 
+.sir-trevor-block .dropzone.drag-enter p {
+  color: #9B8816;
+}
 
 .sir-trevor-block .dropzone input[type="file"] {
   position: absolute;
@@ -200,6 +277,7 @@ body { margin: 0; font-size: 1em; line-height: 1.4; }
   background: #5F5F5F;
   border-radius: 4px;
   border: none;
+  font-family: Arial;
   padding: 4px 16px;
   color: white;
   cursor: pointer;
@@ -208,344 +286,154 @@ body { margin: 0; font-size: 1em; line-height: 1.4; }
 }
 
 .sir-trevor .sir-trevor-block .dropzone label { width: 50%; display: inline; font-weight: normal; color: #666; }
-.sir-trevor .sir-trevor-block .dropzone input[type=text] { width: 50%; display: inline-block; margin-right: 0 }
-
-/* Generic block styles */
-
-.sir-trevor .sir-trevor-ready .sir-trevor-block.loading {
-  opacity: 0.6;
-}
-
-.sir-trevor-block.loading .spinner {
-  width: 32px;
-  height: 32px;
-  top: 50%; left: 50%;
-  margin: -16px 0 0 -16px;
-  position: absolute!important;
-}
-
-.sir-trevor-block [contenteditable=true] { 
-  border: 1px solid transparent; 
-  padding: 5px;
-} 
-.sir-trevor-block [contenteditable=true]:focus,
-.sir-trevor-block input:focus,
-.sir-trevor-block textarea:focus {
-  outline: 0px solid transparent;
-}
-
-.sir-trevor-block [contenteditable=true].si-trevor-error {
-  border: 1px solid #990000;
-} 
-
-.sir-trevor-block h1, 
-.sir-trevor-block h2,
-.sir-trevor-block h3,
-.sir-trevor-block h4,
-.sir-trevor-block h5,
-.sir-trevor-block h6 {
-  margin: 0 0 10px 0; padding: 0;
-}      
-
-.sir-trevor ul,
-.sir-trevor ol {
-  margin: 0 0 10px 20px;
-  padding: 0;
-}
-
-.sir-trevor li {
-  margin: 0 0 2px 0;
-}
-
-.sir-trevor-block p {
-  margin: 0 0 10px 0;
-}
-
-.sir-trevor-block time {
-  font-size: 10px;
-  display: block;
-}
-
-.sir-trevor-block a {
-  color: #222;
-}
-
-/* Text Block */
-
-.sir-trevor-block .text-block,
-.sir-trevor-block textarea {
-  min-height: 75px;
-  margin-bottom: 0;
-}
-
-/* Generic label / form elements */
-
-.sir-trevor .sir-trevor-block label {
-  display: block;
-  margin: 10px 0 5px 0;
+.sir-trevor .sir-trevor-block .dropzone input[type=text] { width: 50%; display: inline-block; margin: 0 0 0 10px; }
+
+/* Block Specific Styles */
+
+  .sir-trevor-editor-block.quote-block {
+    padding: 15px 60px;
+  }
+
+  .sir-trevor-editor-block.quote-block [contenteditable=true] { font-size: 1.2em; }
+
+  .sir-trevor-editor-block.quote-block:before {
+    content: '"';
+    font-size: 48px;
+    font-family: serif;
+    position: absolute;
+    top: 5px; left: 50px;
+    color: #ccc;
+    display: block;
+  }
+
+  .sir-trevor-editor-block.quote-block .input {
+    margin: 15px 0 0 20px;
+  } 
+
+  /*
+    Image block
+  */
+
+  .image-block.dropzone p,
+  .gallery-block.dropzone p {
+    padding-left: 94px;
+    background: url(images/sir-trevor/icons/new_image.png) no-repeat 15px 8px;
+  }
+
+  /* Video */
+
+  .video-block.dropzone p {
+    padding-left: 240px;
+    padding-right: 45px;
+    background: url(images/sir-trevor/icons/new_video.png) no-repeat 15px 8px;
+  }
+
+  /* Tweet */
+
+  .tweet-block.dropzone p {
+    padding-left: 94px;
+    background: url(images/sir-trevor/icons/new_tweet.png) no-repeat 15px 8px;
+  }
+
+  .tweet-block .tweet {
+    padding: 24px;
+    overflow: hidden;
+  }
+  
+  .tweet-block .tweet-avatar {
+    float: left;
+    margin: 3px 15px 20px 0;
+  }
+  
+  .tweet-block .tweet .tweet-body {
+    float: left;
+    width: 450px;
+  }
+  
+  .tweet-block .tweet .tweet-user {
+    font-weight: bold;
+    font-size: 1.125em;
+    margin-bottom: 6px;
+    line-height: 1.125em;
+  }
+  
+  .tweet-block .tweet .tweet-text {
+    margin-bottom: 4px;
+  }
+
+  .tweet-block .tweet time {
+    color: #7f7f7f;
+    font-size: 0.75em;
+  }
+
+  .drag-enter.tweet-block.dropzone p,
+  .drag-enter.image-block.dropzone p,
+  .drag-enter.gallery-block.dropzone p {
+    background-position: 15px -192px;
+  }
+
+  .drag-enter.video-block.dropzone p {
+    background-position: 15px -243px;
+  }
+
+/* Generic Form / Input Styles */
+
+.sir-trevor-block label {
+  margin-bottom: 12px;
   display: block;
-  padding-right: 8px;
-  font-size: 12px;
   font-weight: bold;
 }
 
-.sir-trevor .sir-trevor-block input[type=text],
-.sir-trevor .sir-trevor-block select,
-.sir-trevor .sir-trevor-block textarea,
-.sir-trevor .sir-trevor-block pre {
+.sir-trevor-block input[type=text] {
+  font-size: 100%;
+  font-family: arial, sans-serif;
   border: 1px solid #E9E9E9;
   padding: 8px;
   width: 100%;
-  display: box;
-  -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-        -ms-box-sizing: border-box;
-            box-sizing: border-box;
-  margin-right: 10px;
-  font-size: 12px;
-}
-
-.sir-trevor .sir-trevor-block textarea,
-.sir-trevor .sir-trevor-block pre {
-  border: 1px solid transparent;
-  font-size: 14px;
-  white-space: pre-wrap;
-    word-wrap: break-word;
-} 
-
-.sir-trevor .sir-trevor-block input[type=text].sir-trevor-error,
-.sir-trevor .sir-trevor-block select.sir-trevor-error,
-.sir-trevor .sir-trevor-block textarea.sir-trevor-error {
-  border: 1px solid #990000;
-}
-
-/* Block quote */
-
-.sir-trevor .sir-trevor-block .block-editor.block-quote-block {
-  padding-left: 60px;
-}
-
-.sir-trevor .sir-trevor-block blockquote {
-  padding: 5px; margin: 0;
-  font-size: 14px;
-  font-style: none;
-}
-
-/* Tweet block */
-
-.sir-trevor .sir-trevor-block .tweet-block {}
-
-.sir-trevor .sir-trevor-block .tweet-block .tweet {
-  padding: 20px;
-}
-
-.tweet-block .tweet p {
-  margin: 0 0 10px 0;
-}
-
-.sir-trevor .dropzone.tweet-block p {
-  padding-left: 70px;
-  line-height: 50px;
-  background: url(images/sir-trevor/icons/new_tweet.png) no-repeat 0 0;
-}
-
-/* Markdown Block */
-
-.sir-trevor .expanding-textarea {
-  position: relative;
-  min-height: 75px;
-}
-
-.sir-trevor .expanding-textarea pre {
-  margin: 0; padding: 0;
-}
-
-.sir-trevor .expanding-textarea.active > textarea {
-  overflow: hidden;
-  position: absolute;
-  top: 0;
-  left: 0;
-  height: 100%;
-  resize: none;
-}
-
-.sir-trevor .expanding-textarea > pre {
-  display: none;
-}
-
-.sir-trevor .expanding-textarea.active > pre {
-  display: block;
-  visibility: hidden;
-}
-
-/*
-  Image block
-*/
-
-.sir-trevor .dropzone.image-block p,
-.sir-trevor .dropzone.gallery-block p  {
-  padding-left: 70px;
-  line-height: 50px;
-  background: url(images/sir-trevor/icons/new_image.png) no-repeat 0 0;
-}
-
-.sir-trevor .image-block img {
-  width: 100%;
-  height: auto;
-}
-
-/* Video */
-
-.sir-trevor .dropzone.video-block p,
-.sir-trevor .dropzone.video-block p  {
-  padding-left: 230px;
-  line-height: 50px;
-  background: url(images/sir-trevor/icons/new_video.png) no-repeat 0 0;
-}
-
-/* Gallery items */
-
-.sir-trevor .sir-trevor-block.active .gallery-block.block-editor {
-  border: 1px solid transparent;
-  border-left: 0; 
-}
-
-.sir-trevor .gallery-items {
-  overflow: hidden;
-}
-
-.sir-trevor .gallery-items ul {
-  margin: 0; padding: 0;
-}
-
-.sir-trevor .gallery-items ul li {
-  margin: 0 10px 10px 0; 
-  list-style: none;
-  width: 50px; height: 50px;
   display: block;
-  overflow: hidden;
-  border: 1px solid #E9E9E9;
-  float: left;
-  padding: 5px;
-  cursor: move;
-  position: relative;
 }
 
-.sir-trevor .gallery-items ul li img {
-  width: auto; height: 100%;
-}
+.sir-trevor-block input[type=text]:focus { outline: 0; }
 
-.sir-trevor .gallery-items ul li.dragover {
-  border: 1px solid #222;
-  background: #F5F297;
-}
+  /* Error States */
+  .sir-trevor-block input[type=text].sir-trevor-error {
+    border-color: #7FD7F7;
+  }
 
-.sir-trevor .gallery-items ul li.dragging {
-  opacity: 0.2;
-}
+/* Extended inputs */
 
+.sir-trevor-block .extended_input { position: relative; }
 
-.sir-trevor .gallery-items ul li .delete {
-  top: 0;
-  right: 0;
-}
-
-
-/* Handle and delete */
-
-.sir-trevor .sir-trevor-block .handle {
-  width: 10px;
-  height: 100%;
-  cursor: move;
+.sir-trevor-block .extended_input .count {
   position: absolute;
-  left: 0;
-  top: 0;
-  display: none;
-  background: #606060 url(images/sir-trevor/icons/handle.gif) repeat-y;
-}
-
-.sir-trevor .sir-trevor-block .delete {
-  width: 15px; height: 15px;
-  border: 1px solid #B3B3B3;
-  position: absolute; 
-  top: 5px; right : 5px;
-  cursor: pointer;
   display: none;
-  background: #fff url(images/sir-trevor/icons/close.gif) no-repeat;
-}
-
-.sir-trevor .sir-trevor-block.active .handle,
-.sir-trevor .sir-trevor-block.active .delete {
-  display: block;
-}
-
-
-/* Validation tooltip */
-
-.sir-trevor .error-marker {
-  position: absolute;
-  content: "!";
-  background: #B94A48;
-  color: #fff;
-  padding: 1px 4px 2px;
-  border-radius: 3px;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  right: -5px; bottom: -3px;
   font-size: 11px;
-  z-index: 1001;
-  font-weight: bold;
-  margin-left: -10px;
-  margin-top: 7px;
-}
-
-/* errors */
-
-.sir-trevor-errors {
-  font-size: 14px;
-  padding: 15px 40px;
-  color: #B94A48;
-  background-color: #F2DEDE;
+  color: #BDBDBD;
+  font-style: italic;
+  z-index: 15;
+  padding: 2px;
 }
 
-.sir-trevor-errors p {
-  font-weight: bold;
-  margin: 0;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-}
+.sir-trevor-block .extended_input .count em { font-weight: bold; }
 
-.sir-trevor-errors ul {
-  margin-bottom: 0;
-}
+.sir-trevor-block.active .extended_input .count,
+.sir-trevor-block.focussed .extended_input .count { display: block; }
 
-.sir-trevor-errors li {
-  margin: 0; padding: 0;
-}
 
 /* Generic fade-in ready function */
-.sir-trevor .sir-trevor-block,
-.sir-trevor .sir-trevor-marker,
-.sir-trevor .sir-trevor-formatting-control {
+
+.sir-trevor-block,
+.sir-trevor-marker,
+.sir-trevor-formatting-control {
   opacity: 0;
-  -webkit-transition: opacity 0.3s ease;
-    -moz-transition: opacity 0.3s ease;
-    -ms-transition: opacity 0.3s ease;
-    -o-transition: opacity 0.3s ease;
-    transition: opacity 0.3s ease;
+  -webkit-transition: opacity 0.2s ease-in-out;
+  -moz-transition: opacity 0.2s ease-in-out;
+  -ms-transition: opacity 0.2s ease-in-out;
+  -o-transition: opacity 0.2s ease-in-out;
+  transition: opacity 0.2s ease-in-out;
 }
-.sir-trevor .sir-trevor-ready .sir-trevor-item-ready {
-  opacity: 1;
-}
-
-.media {margin:10px;}
-.media, .bd {overflow:hidden; _overflow:visible; zoom:1;}
-.media .img {float:left; margin-right: 20px;}
-.media .img img{display:block;}
-.media .imgExt{float:right; margin-left: 20px;}
 
-.sir-trevor .extended_input {
-  position: relative;
+.sir-trevor-item-ready {
+  opacity: 1;
 }
-
-.sir-trevor .extended_input .count {
-  font-size: 11px;
-  margin: 0 0 0 5px;
-}