kiteditor 1.0.12 → 1.0.13

data/{app → vendor}/assets/stylesheets/mercury/dialog.css

@@ -15,12 +15,11 @@
   border-radius: 2px;
   -moz-border-radius: 2px;
   margin-top: -1px;
-  background-color: #FFFFFF;
+  background-color: #E2E1E2;
 	box-shadow: 1px 1px 4px rgba(0,0,0, .5);
 	-moz-box-shadow: 1px 1px 4px rgba(0,0,0, .5);
   font-family: Helvetica, Tahoma, Arial, sans-serif;
   font-size: 8.5pt;
-  color: #333;
 }
 .mercury-dialog.loading,
 .mercury-select.loading,
@@ -41,15 +40,15 @@
  * Panels
  *----------------------------------------------------------------------------*/
 .mercury-panel {
-  position: fixed;
+  position: absolute;
   z-index: 10011;
-  background-color: #f5f5f5;
+  background-color: #111;
   opacity: .9;
   box-shadow: 1px 1px 4px rgba(0,0,0, .5);
   -moz-box-shadow: 1px 1px 4px rgba(0,0,0, .5);
-  border-radius: 6px;
-  -moz-border-radius: 6px;
-  color: #333;
+  border-radius: 4px;
+  -moz-border-radius: 4px;
+  color: #FFF;
   font-family: Helvetica, Tahoma, Arial, sans-serif;
   font-size: 9.5pt;
   max-width: 500px;
@@ -65,29 +64,19 @@
   margin: 0;
   background: #333;
   white-space: nowrap;
-  line-height: normal;
 }
 .mercury-panel h1 {
   -webkit-user-select: none;
   -moz-user-select: none;
   user-select: none;
-  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+  font-size: 10pt;
   -moz-border-radius-topleft: 4px;
   -moz-border-radius-topright: 4px;
   border-top-left-radius: 4px;
   border-top-right-radius: 4px;
-  color: #f5f5f5;
-  font-size: 10pt;
-  text-shadow: 1px 1px 2px rgba(0,0,0, .9);
-  border-bottom: 1px solid #222;
   height: 15px;
   cursor: move;
-}
-.mercury-panel h1 span {
-  display: block;
-  width: 100%;
+  text-shadow: 1px 1px 2px rgba(0,0,0, .9);
 }
 .mercury-panel h1 a.mercury-panel-close {
   position: absolute;
@@ -187,7 +176,6 @@
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
   width: 100%;
-  height: auto;
   padding-left: 20px;
   background-color: #FFF;
   background-repeat: no-repeat;
@@ -204,7 +192,6 @@
 }
 .mercury-snippet-panel ul li img {
   float: left;
-  cursor: move;
 }
 .mercury-snippet-panel ul li h4,
 .mercury-snippet-panel ul li .description {

data/{app → vendor}/assets/stylesheets/mercury/lightview.css

@@ -10,13 +10,13 @@
   height: 100%;
   opacity: 0;
   display: none;
-  background: rgba(255, 255, 255, .8);
+  background: rgba(0, 0, 0, .65);
 }
 .mercury-lightview {
   position: fixed;
   z-index: 10040;
   top: 20px;
-  background: rgba(239, 239, 239, .7);
+  background: #000;
   opacity: 0;
   overflow: hidden;
   display: none;
@@ -28,7 +28,7 @@
   font: normal normal normal 12px/normal Helvetica, Tahoma, Arial, sans-serif;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
-  color: #000;
+  color: #CCC;
 }
 .mercury-lightview.loading {
   background-repeat: no-repeat;
@@ -40,8 +40,8 @@
 .mercury-lightview h1.mercury-lightview-title {
   margin: 0;
   padding: 10px 20px 8px;
-  border-bottom: 1px solid #CCC;
-  color: #000;
+  border-bottom: 1px solid #222;
+  color: #FFF;
   -webkit-user-select: none;
   -moz-user-select: none;
   user-select: none;
@@ -70,6 +70,38 @@
   border-top: 1px solid #333;
   text-align: right;
 }
+/*
+ * Forms
+ *----------------------------------------------------------------------------*/
+.mercury-lightview form fieldset {
+  background: #111;
+  border: 1px solid #333;
+}
+.mercury-lightview form fieldset.buttons {
+  background: none;
+  border: none;
+}
+.mercury-lightview form select,
+.mercury-lightview form input[type="text"],
+.mercury-lightview form input[type="password"],
+.mercury-lightview form textarea,
+.mercury-lightview form input.text {
+  background: #444;
+  color: #FFF;
+  border: 2px solid #555;
+  -moz-box-shadow: inset 0 0 3px #000000;
+  -webkit-box-shadow: inset 0 0 3px #000000;
+  box-shadow: inset 0 0 3px #000000;
+}
+.mercury-lightview form input[type="button"] {
+  border: 2px solid #555;
+  border-radius: 4px;
+  background: #222;
+  color: #FFF;
+}
+.mercury-lightview hr {
+  border-color: #333;
+}
 /*
  * Specific Lightviews
  *----------------------------------------------------------------------------*/
@@ -97,5 +129,23 @@
   color: #09F;
 }
 #mercury_about a:hover {
-  color: #333;
+  color: #FFF;
+}
+/* character */
+.mercury-lightview #mercury_character .character {
+  border: 1px solid #444;
+  background: #222;
+}
+.mercury-lightview #mercury_character .character:hover {
+  background: #555;
+  border: 1px solid #CCC;
+}
+/* table */
+.mercury-lightview #mercury_table #table_display {
+  background: #222;
+  border: 1px solid #444;
+  height: 301px;
+}
+.mercury-lightview #mercury_table #table_display td.selected {
+  background: #09F;
 }

data/vendor/assets/stylesheets/mercury/mercury.css

@@ -0,0 +1,151 @@
+/*
+ *= require_self
+ *= require ./dialog
+ *= require ./lightview
+ *= require ./modal
+ *= require ./statusbar
+ *= require ./toolbar
+ *= require ./tooltip
+ *= require ./uploader
+ *= require ./all_images
+ */
+
+/*
+ * General Layout
+ *---------------------------------------------------------------------------*/
+html, body {
+  -webkit-transition: -webkit-transform 3s;
+  margin: 0;
+  padding: 0;
+  overflow: hidden;
+}
+.mercury-iframe {
+  position: absolute;
+  top: 0;
+  width: 100%;
+  visibility: hidden;
+}
+.mercury-focusable {
+  position: absolute;
+  opacity: 0;
+}
+
+/*
+ * Forms
+ *---------------------------------------------------------------------------*/
+form,
+form ul,
+form ol,
+form li,
+form fieldset,
+form p,
+.filter {
+  margin: 0;
+  padding: 0;
+}
+form abbr {
+  border: 0;
+  font-variant: normal;
+}
+form fieldset {
+  margin-bottom: 10px;
+  background: #F6F6F6;
+  border: 1px solid #CCC;
+  border-radius: 7px;
+  -moz-border-radius: 7px;
+}
+form fieldset:last-child {
+  margin-bottom: 0;
+}
+form fieldset legend {
+  font-weight: bold;
+  margin-left: 10px;
+  margin-bottom: -4px;
+}
+form ol {
+  margin: 12px 9px;
+}
+form ol li {
+  display: block;
+  margin-bottom: 10px;
+}
+form label {
+  display: block;
+  float: left;
+  width: 23%;
+  margin-right: 9px;
+  text-align: right;
+  line-height: 27px;
+  font-size: 1.1em;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+form label input {
+  width: auto !important;
+  margin: 0 5px 0 2px !important;
+}
+form select,
+form input[type=text],
+form input[type=password],
+form textarea,
+form input.text {
+  margin: 0;
+  border: 2px solid #CCC;
+  padding: 2px 4px;
+  font-family: Arial, Geneva, sans-serif;
+  font-size: 1.5em;
+  width: 74%;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+}
+form li.boolean {
+  margin-left: 23%;
+  padding-left: 9px;
+}
+form li.boolean label {
+  width: auto;
+}
+form fieldset.buttons {
+  clear: both;
+  padding: 0;
+  background: none;
+  border: none;
+  text-align: left;
+}
+form fieldset.buttons ol {
+  margin: 0 -2px 0 0;
+  float: right;
+}
+form fieldset.buttons ol li {
+  float: left;
+  padding-left: 0.5em;
+  padding-right: 0;
+}
+form fieldset.buttons .commit {
+  margin: 0;
+}
+form fieldset.buttons .commit input {
+  padding: 8px 14px 9px !important;
+  font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', sans-serif;
+  font-size: 1.3em;
+  background-color: #222;
+  background-repeat: repeat-x;
+  display: inline-block;
+  color: #FFF;
+  text-decoration: none;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
+  text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.25);
+  border: 0;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.25);
+  position: relative;
+  cursor: pointer;
+  line-height: normal;
+}
+form fieldset.buttons .commit input:hover {
+  background-color: #000;
+}

data/{app → vendor}/assets/stylesheets/mercury/modal.css

@@ -10,7 +10,7 @@
   height: 100%;
   opacity: 0;
   display: none;
-  background: rgba(255, 255, 255, .8);
+  background: rgba(0,0,0, .65);
 }
 .mercury-modal {
   position: fixed;
@@ -98,30 +98,40 @@
 .mercury-modal .mercury-display-pane-container {
   overflow: auto;
   margin: -20px -20px 0;
-  padding: 20px 20px 0;
+  padding: 20px 20px 10px;
 }
 .mercury-modal .mercury-display-pane-container .mercury-display-pane {
   float: left;
 }
 .mercury-modal .mercury-display-controls {
-  padding-right: 0;
+  padding: 15px 0 0;
   border-top: 1px solid #CCC;
   text-align: right;
 }
 /*
- * Specific Modals (eg. htmlEditor)
+ * Forms
  *----------------------------------------------------------------------------*/
-/* html editor */
-#mercury_html_editor textarea {
+.mercury-modal textarea {
   resize: none;
   padding: 0;
   box-sizing: border-box;
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
+}
+/*
+ * Specific Modals (eg. htmlEditor)
+ *----------------------------------------------------------------------------*/
+/* html editor */
+#mercury_html_editor textarea {
   margin: 0 0 -2px 0;
+  padding: 0;
   border: 2px solid #CCC;
   width: 100%;
 }
+#mercury_html_editor .mercury-modal-controls {
+  border: 0;
+  margin-top: -2px;
+}
 /* character */
 #mercury_character .character {
   float: left;
@@ -146,21 +156,28 @@
 }
 /* table */
 #mercury_table #table_display {
+  width: 285px;
+  height: 285px;
   float: left;
-  margin-right: 13px;
-  overflow: auto;
-  padding: 0;
-}
-#mercury_table #table_display .controls {
-  margin: 0;
-  width: 225px;
-  height: 259px;
   padding: 10px;
+  background: #F6F6F6;
+  border: 1px solid #CCC;
+  border-radius: 7px;
+  -moz-border-radius: 7px;
+  overflow:  auto;
 }
 #mercury_table #table_display table {
   width: 100%;
   height: 100%;
 }
-#mercury_table #table_display .selected {
+#mercury_table #table_display td.selected {
   background: #09F;
 }
+#mercury_table #table_options {
+  width: 383px;
+  float: left;
+  margin-left: 10px;
+}
+#mercury_table #table_options .inputs:first-child label {
+  width: 36%
+}

data/{app → vendor}/assets/stylesheets/mercury/toolbar.css

@@ -46,9 +46,6 @@
   width: 1px;
   background: #727272;
 }
-.mercury-button {
-  cursor: pointer;
-}
 .mercury-button em {
   display: block;
   font-style: normal;
@@ -256,7 +253,7 @@
 .mercury-editable-toolbar .mercury-htmlEditor-button                 { background-position: -612px 0 }
 .mercury-editable-toolbar .mercury-htmlEditor-button.active          { background-position: -612px -18px }
 /*
- * Toolbar: Snippets Region Toolbar
+ * Toolbar: Snippetable Region Toolbar
  *----------------------------------------------------------------------------*/
 .mercury-snippet-toolbar {
   position: absolute;

data/{app → vendor}/assets/stylesheets/mercury/uploader.css

@@ -12,7 +12,7 @@
   width: 100%;
   height: 100%;
   opacity: .95;
-  background: rgba(255, 255, 255, .8);
+  background: rgba(0, 0, 0, .65);
 }
 .mercury-uploader {
   position: absolute;
@@ -23,13 +23,13 @@
   height: 150px;
   overflow: hidden;
   padding: 15px;
-  background: rgba(239, 239, 239, .70);
+  background: rgba(0,0,0, .70);
   border-radius: 10px;
   -moz-border-radius: 10px;
   -moz-box-shadow: 0 0 40px rgba(0, 0, 0, .9);
   box-shadow: 0 0 40px rgba(0, 0, 0, .9);
   font: normal normal normal 12px/normal Helvetica, Tahoma, Arial, sans-serif;
-  color: #000;
+  color: #CCC;
 }
 .mercury-uploader .mercury-uploader-preview {
   float: left;
@@ -95,9 +95,9 @@
   background: -moz-repeating-linear-gradient(top left -30deg, rgba(255,255,255, 0.17), rgba(255,255,255, 0.17) 15px, rgba(255,255,255, 0) 15px, rgba(255,255,255, 0) 30px),
               -moz-linear-gradient(rgba(255,255,255, 0.1) 0%, rgba(255,255,255, 0.37) 100%);
   background-color: #09F;
-  border: 1px solid #0083DA;
   box-shadow: inset 0 1px 0 0 rgba(255,255,255, 0.4), inset 0 -1px 1px rgba(0,0,0, 0.2);
   -moz-box-shadow: inset 0 1px 0 0 rgba(255,255,255, 0.4), inset 0 -1px 1px rgba(0,0,0, 0.2);
+  border: 1px solid #0083DA;
 }
 .mercury-uploader .mercury-uploader-progress div.mercury-uploader-indicator div b {
   display: none;

data/{app → vendor}/assets/stylesheets/mercury.css

@@ -2,6 +2,11 @@
  * Mercury Editor is a Coffeescript and jQuery based WYSIWYG editor.  Documentation and other useful information can be
  * found at https://github.com/jejacks0n/mercury
  *
+ * Supported browsers:
+ *   - Firefox 4+
+ *   - Chrome 10+
+ *   - Safari 5+
+ *
  * Copyright (c) 2011 Jeremy Jackson
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
@@ -18,7 +23,6 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  *= require_self
- *= require mercury/bootstrap-ish
  *= require mercury/mercury
  */
 

data/vendor/assets/stylesheets/mercury_overrides.css

@@ -0,0 +1,17 @@
+/*!
+ * Mercury Editor is a Coffeescript and jQuery based WYSIWYG editor.  Documentation and other useful information can be
+ * found at https://github.com/jejacks0n/mercury
+ *
+ * This file is intended to provide a standard way to override the CSS that comes default with Mercury Editor, and
+ * includes an example button style, should you ever need to add new ones yourself.  Read the toolbar configuration in
+ * mercury.js for more on how to add your own buttons to the toolbar.
+ */
+
+/* Disable text sizing in webkit (ipad/iphone etc -- should apply to mercury only) */
+html { -webkit-text-size-adjust: none; }
+
+/* Button example */
+.mercury-primary-toolbar .mercury-inspector-button em,
+.mercury-expander-button[data-button="inspector"] em {
+  background-image: url(/assets/mercury/toolbar/primary/inspectorpanel.png);
+}