diff --git a/Gemfile b/Gemfile index 258024dd4..2565124f9 100644 --- a/Gemfile +++ b/Gemfile @@ -97,6 +97,7 @@ gem 'devise-async', git: 'https://github.com/mhfs/devise-async.git', branch: 'devise-4.x' gem 'image_processing', '~> 1.12' +gem 'img2zpl', git: 'https://github.com/scinote-eln/img2zpl' gem 'rufus-scheduler', '~> 3.5' gem 'discard', '~> 1.0' diff --git a/Gemfile.lock b/Gemfile.lock index 8dcdb0f63..baae5b720 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,6 +39,13 @@ GIT devise-async (0.10.2) devise (>= 4.0) +GIT + remote: https://github.com/scinote-eln/img2zpl + revision: 23d61cfc3e90ac4caa62dd08546fa0d7590a5140 + specs: + img2zpl (1.0.1) + mini_magick (~> 4.9) + GEM remote: http://rubygems.org/ specs: diff --git a/app/assets/stylesheets/label_templates/show.scss b/app/assets/stylesheets/label_templates/show.scss index 97c01d1d0..8d25a15e4 100644 --- a/app/assets/stylesheets/label_templates/show.scss +++ b/app/assets/stylesheets/label_templates/show.scss @@ -139,7 +139,16 @@ } } - .inser-field-dropdown { + .insert-field-dropdown { + .dimensions-container { + align-items: center; + display: flex; + + img { + margin-top: 27px; + } + } + .open-dropdown-button:not(.collapsed) { .fas { @include rotate(-180deg); @@ -171,7 +180,12 @@ display: flex; padding: 10px 10px 10px 24px; - .fas { + .fas:not(.fa-plus-square) { + margin-left: -1.25em; + margin-right: .25em; + } + + .fa-plus-square { @include font-main; display: none; margin-left: auto; @@ -180,7 +194,7 @@ &:hover { background-color: $color-concrete; - .fas { + .fa-plus-square { display: inline-block; } } diff --git a/app/javascript/vue/label_template/components/logo_insert_modal.vue b/app/javascript/vue/label_template/components/logo_insert_modal.vue new file mode 100644 index 000000000..25f13e622 --- /dev/null +++ b/app/javascript/vue/label_template/components/logo_insert_modal.vue @@ -0,0 +1,72 @@ + + diff --git a/app/javascript/vue/label_template/container.vue b/app/javascript/vue/label_template/container.vue index 59bbe2d3b..b0502e98f 100644 --- a/app/javascript/vue/label_template/container.vue +++ b/app/javascript/vue/label_template/container.vue @@ -59,7 +59,7 @@