effective_mergery 0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 185eb0a320784bf5e9f6cc24b1db3296761469d8
-  data.tar.gz: 79ed4931f61a2c803e50e8b132d9bae2d0060c97
+  metadata.gz: b580838fafa8a15dc1721ef4d766aa83046cfea8
+  data.tar.gz: 6789c91eb0cb4ae0928c13baf92a37a2eadd8416
 SHA512:
-  metadata.gz: 29c4448f5df36346b5567795a9548ed8f1bcef9d03d7e83142c479653a26027b3f940cc234b603ec54278988deb14ef1fdfeaf24caf654a3856d1998e04ffab1
-  data.tar.gz: bd52345540fcfd32a37751d8d25e70857158a9ccacd64332850f827988475aa28573dcbc9753b318a8c3eea8451f4c2630f47185baec4b958c049bf07cdea0e8
+  metadata.gz: 7ffccb07c012a9504b798045095ff6aec833211ecf4a4943d2acf548b6aa1337ab8e475e8486894ed16af3b360a4c2fad87fad1bf2cea6a3ccd3121802174220
+  data.tar.gz: f14348e9496c74bd329cad1f24d48288d03919a1e056ebd23fc99363bc9fa6f88da02fa110e46d2a609c49577c4563b89e6e82701a05a553f47e8b790ce86f4c

data/app/assets/stylesheets/effective_mergery/_merge.scss

@@ -3,3 +3,22 @@
     .table-attributes { opacity: 0.4; }
   }
 }
+
+.table-merge.table > thead > tr > th,
+.table-merge.table > thead > tr > td,
+.table-merge.table > tbody > tr > th,
+.table-merge.table > tbody > tr > td,
+.table-merge.table > tfoot > tr > th,
+.table-merge.table > tfoot > tr > td {
+  padding: 0 5px 5px 5px;
+}
+
+.effective-merge {
+  .encrypted_password,
+  .reset_password_token,
+  .confirmation_token,
+  .unique_session_id,
+  .invitation_token {
+    display: none;
+  }
+}

data/app/views/admin/merge/_attributes.html.haml

@@ -1,3 +1,3 @@
-= tableize_hash(resource.attributes, table: 'table table-attributes')
+= tableize_hash(resource.attributes, table: 'table table-merge table-attributes')
 %hr
-= tableize_hash(Effective::Resource.new(resource).instance_attributes.except(:attributes))
+= tableize_hash(Effective::Resource.new(resource).instance_attributes.except(:attributes), table: 'table table-merge', sub_table: 'table table-merge table-subtable')

data/app/views/admin/merge/new.html.haml

@@ -25,5 +25,5 @@
         - if f.object.target.present?
           = render partial: '/admin/merge/attributes', locals: { resource: f.object.target }
 
-    .text-center
+    .form-actions
       = f.button :submit, "Merge #{@merge}", data: { disable_with: 'Merging...', confirm: "Really merge? The source record will be destroyed."}

data/lib/effective_mergery/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMergery
-  VERSION = '0.1'.freeze
+  VERSION = '0.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_mergery
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails