kiteditor 1.0.11 → 1.0.12

data/app/assets/stylesheets/mercury/bootstrap-overrides.css

@@ -0,0 +1,61 @@
+/*
+ * Bootsrap Overrides (overrides what's in bootstrap-ish)
+ *---------------------------------------------------------------------------*/
+.btn-group > .btn {
+  margin-right: 0;
+}
+form {
+  margin-bottom: 0;
+}
+fieldset {
+  margin-bottom: 15px;
+  background: #F6F6F6;
+  border: 1px solid #CCC;
+  border-radius: 7px;
+  padding: 10px;
+}
+legend {
+  display: block;
+  position: relative;
+  margin-left: 10px;
+  margin-bottom: 0;
+  font-weight: bold;
+  width: auto;
+  padding: 0;
+  font-size: 12px;
+  color: #333333;
+  border: 0;
+  line-height: 1px;
+}
+select {
+  width: auto;
+}
+.form-actions {
+  margin-top: 0;
+  margin-bottom: 0;
+  background-color: transparent;
+}
+.control-group {
+  margin-bottom: 0;
+}
+legend + .control-group {
+  margin-top: 0;
+  -webkit-margin-top-collapse: separate;
+}
+.form-horizontal .control-group {
+  margin-bottom: 0;
+}
+.form-horizontal .controls {
+  margin-left: 150px;
+}
+.form-horizontal hr {
+  margin-left: 150px;
+  border: 0;
+  border-top: 1px solid #ccc;
+}
+label input[type=radio] {
+  margin-right: 5px;
+}
+.form-actions {
+  padding-bottom: 0;
+}

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

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

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

@@ -10,13 +10,13 @@
   height: 100%;
   opacity: 0;
   display: none;
-  background: rgba(0, 0, 0, .65);
+  background: rgba(255, 255, 255, .8);
 }
 .mercury-lightview {
   position: fixed;
   z-index: 10040;
   top: 20px;
-  background: #000;
+  background: rgba(239, 239, 239, .7);
   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: #CCC;
+  color: #000;
 }
 .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 #222;
-  color: #FFF;
+  border-bottom: 1px solid #CCC;
+  color: #000;
   -webkit-user-select: none;
   -moz-user-select: none;
   user-select: none;
@@ -70,38 +70,6 @@
   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
  *----------------------------------------------------------------------------*/
@@ -129,23 +97,5 @@
   color: #09F;
 }
 #mercury_about a:hover {
-  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;
+  color: #333;
 }

data/app/assets/stylesheets/mercury/mercury.css

@@ -0,0 +1,43 @@
+/*
+ *= require_self
+ *= require ./bootstrap-overrides
+ *= require ./dialog
+ *= require ./lightview
+ *= require ./modal
+ *= require ./statusbar
+ *= require ./toolbar
+ *= require ./tooltip
+ *= require ./uploader
+ *= require ./all_images
+ */
+
+/*
+ * General Layout
+ *---------------------------------------------------------------------------*/
+
+/* Disable text sizing in webkit (ipad/iphone etc -- should apply to mercury only) */
+html {
+  -webkit-text-size-adjust: none;
+}
+
+html, body {
+  -webkit-transition: -webkit-transform 3s;
+  margin: 0;
+  padding: 0;
+}
+
+.mercury-iframe {
+  position: absolute;
+  top: 0;
+  width: 100%;
+  visibility: hidden;
+}
+.mercury-focusable {
+  position: absolute;
+  opacity: 0;
+}
+
+.filter {
+  margin: 0;
+  padding: 0;
+}

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

@@ -10,7 +10,7 @@
   height: 100%;
   opacity: 0;
   display: none;
-  background: rgba(0,0,0, .65);
+  background: rgba(255, 255, 255, .8);
 }
 .mercury-modal {
   position: fixed;
@@ -98,40 +98,30 @@
 .mercury-modal .mercury-display-pane-container {
   overflow: auto;
   margin: -20px -20px 0;
-  padding: 20px 20px 10px;
+  padding: 20px 20px 0;
 }
 .mercury-modal .mercury-display-pane-container .mercury-display-pane {
   float: left;
 }
 .mercury-modal .mercury-display-controls {
-  padding: 15px 0 0;
+  padding-right: 0;
   border-top: 1px solid #CCC;
   text-align: right;
 }
 /*
- * Forms
+ * Specific Modals (eg. htmlEditor)
  *----------------------------------------------------------------------------*/
-.mercury-modal textarea {
+/* html editor */
+#mercury_html_editor 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;
@@ -156,28 +146,21 @@
 }
 /* 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 td.selected {
+#mercury_table #table_display .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/{vendor → app}/assets/stylesheets/mercury/toolbar.css

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

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

@@ -12,7 +12,7 @@
   width: 100%;
   height: 100%;
   opacity: .95;
-  background: rgba(0, 0, 0, .65);
+  background: rgba(255, 255, 255, .8);
 }
 .mercury-uploader {
   position: absolute;
@@ -23,13 +23,13 @@
   height: 150px;
   overflow: hidden;
   padding: 15px;
-  background: rgba(0,0,0, .70);
+  background: rgba(239, 239, 239, .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: #CCC;
+  color: #000;
 }
 .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/helpers/mercury_helper.rb

@@ -0,0 +1,7 @@
+module MercuryHelper
+
+  def mercury_edit_path(path = nil)
+    mercury_engine.mercury_editor_path(path.nil? ? request.path.gsub(/^\/\/?(editor)?/, '') : path)
+  end
+
+end