tolaria 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d247616fc3a0ed63c654ab55e17000d30b4bdce1
-  data.tar.gz: 84b540c227fbdd9569a775923c0ee82b3dbf9d06
+  metadata.gz: ad9a0fd53507635be02a3f66a8e48013e91c7c47
+  data.tar.gz: ec22b6a019726b19695f2dd1bd7d258f143b86b8
 SHA512:
-  metadata.gz: 7bde42a805f542d6e3e8883bf4ffa76a7daf3b1b2c4d4b45a0e0c125d1f76acad12241d20b11e0ed5b8895638679b99f3818b506ef59ad4436a10fcdaac82786
-  data.tar.gz: d8ad521e0f0c519f1eff823593c5bc6246724fdc818f4e4a267f65343ccc78c37cb9093ab1d83642872b0f204b656a6f68a01a92f2fd870b79ccf25888034c98
+  metadata.gz: f07432b01569d8849aa1b06d12efe4a42aef9d20698260081f907d1614bbc98eb7ba67c201cd0f3d06f920b9028e8e4ba64da57b7b76e57bce46c6cf813991f9
+  data.tar.gz: 2357aa1ed19e27cb05bb112e4ed006816d2cb0300852516e6cc2cba8f8e1ba534f9cfa8921ef8c35caaa6b0e525023ea6557fda704adab59f6ea667427da4e04

data/app/assets/javascripts/admin/views/fields/markdown_composer.js

@@ -110,6 +110,9 @@ var MarkdownComposerView = Backbone.View.extend({
 
     event.preventDefault();
 
+    // Save current scroll position of textarea so we can reset it after we update the text
+    var scrollPos = this.$textarea.scrollTop();
+
     var selectedText = this.$textarea.selection("get");
     var buttonOps = ComposerButtons[mode];
 
@@ -133,6 +136,8 @@ var MarkdownComposerView = Backbone.View.extend({
 
     this.updatePreview();
 
+    // Reset scroll position
+    this.$textarea.scrollTop(scrollPos);
   },
 
   // Show an error message in the preview with dimmed text

data/app/assets/stylesheets/admin/components/forms/_attachment_field.scss

@@ -1,5 +1,9 @@
 .attachment-field {
 
+  @include min-width($bpFull) {
+    float: left;
+  }
+
   input[type=file] {
     display: none;
   }

data/app/assets/stylesheets/admin/components/forms/_markdown_composer.scss

@@ -2,21 +2,20 @@
 
   @include min-width($bpFull) {
     float: left;
-    width: 79%;
     max-width: 620px;
+    width: 79%;
   }
 
   &-controls {
-
     @include clearfix;
     background: $cWhite;
+    border-bottom: 0;
     border-radius: 2px 2px 0 0;
     border: 1px solid $cGrey;
-    border-bottom: 0;
+    margin: 0 auto -1px auto;
+    max-width: 1150px;
     padding: 12px 10px 12px 10px;
     transition: background-color 100ms linear, border-color 100ms linear;
-    max-width: 1150px;
-    margin: 0 auto -1px auto;
     -moz-user-select: none;
     -ms-user-select: none;
     -webkit-user-select: none;
@@ -32,11 +31,18 @@
 
     .-focused &,
     .-fullscreen & {
-      border-color: darken($cSapphire, 10);
       border-bottom: 0;
+      border-color: darken($cSapphire, 10);
       border-right-color: $cSapphire;
     }
+  }// end controls
+
+  &-workspace {
+    @include clearfix();
 
+    textarea {
+      float: none;
+    }
   }
 
   textarea {
@@ -44,61 +50,66 @@
     border-top: 1px dashed $cGrey;
     color: #000;
     font-family: $fMonospace;
-    max-width: none;
     font-size: 14px;
+    max-width: none;
     padding: 12px 12px 12px 12px;
     width: 100%;
+
     &:focus {
       border-top-color: $cGrey;
     }
-  }
+  }// end textarea
 
   // THIS ISN'T EVEN MY FINAL FORM!
 
   .-fullscreen-toggle {
     display: none;
+
     @include min-width($bpFull) {
       display: block;
     }
   }
 
   &.-fullscreen {
-
+    background: $cCoolGrey;
+    background: $cWhite;
     display: block;
+    height: 100%;
+    left: 0;
+    max-width: none;
+    padding: 3% 5%;
     position: fixed;
-    z-index: 1000000;
     top: 0;
-    left: 0;
     width: 100%;
-    height: 100%;
-    background: $cWhite;
-    padding: 3% 5%;
-    background: $cCoolGrey;
-    max-width: none;
+    z-index: 1000000;
 
     .markdown-composer-workspace {
-      @include clearfix;
-      position: relative;
       height: 100%;
-      max-width: 1150px;
       margin: 0 auto;
+      max-width: 1150px;
+      position: relative;
     }
 
     textarea {
+      border-bottom-color: $cSapphire;
+      border-left-color: darken($cSapphire, 10);
+      border-right-color: $cTaupe;
       display: block;
-      width: 50%;
+      font-size: 14px;
+      float: left;
       height: 94%;
+      left: 0;
       position: absolute;
       top: 0;
-      left: 0;
-      font-size: 14px;
-      border-left-color: darken($cSapphire, 10);
-      border-bottom-color: $cSapphire;
-      border-right-color: $cTaupe;
+      width: 50%;
     }
 
     .markdown-composer-preview {
-
+      background: #fdfdfd;
+      border-bottom: 1px solid $cSapphire;
+      border-radius: 0 0 2px 0;
+      border-right: 1px solid $cSapphire;
+      border-top: 1px dashed $cGrey;
       height: 94%;
       overflow-y: scroll;
       padding: 12px 16px;
@@ -106,21 +117,11 @@
       right: 0;
       top: 0;
       width: 50%;
-
-      background: #fdfdfd;
-      border-top: 1px dashed $cGrey;
-      border-radius: 0 0 2px 0;
-      border-bottom: 1px solid $cSapphire;
-      border-right: 1px solid $cSapphire;
-
     }
-
-  }
-
+  }// end -fullscreen
 }
 
 .markdown-composer-button {
-
   background: none;
   color: $cGrey;
   transition: color 100ms linear;
@@ -131,7 +132,6 @@
     line-height: 16px;
     text-transform: uppercase;
   }
-
 }
 
 .markdown-composer.-focused,
@@ -144,6 +144,4 @@
       color: $cSapphire;
     }
   }
-
 }
-

data/lib/tolaria/version.rb

@@ -2,7 +2,7 @@ module Tolaria
 
   # Returns Tolaria’s version number
   def self.version
-    Gem::Version.new("2.0.3")
+    Gem::Version.new("2.0.4")
   end
 
   module VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolaria
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Corey Csuhta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -503,4 +503,3 @@ test_files:
 - test/unit/markdown_test.rb
 - test/unit/menu_test.rb
 - test/unit/random_tokens_test.rb
-has_rdoc: