diff --git a/less/category.less b/less/category.less index e543618..a77dba2 100644 --- a/less/category.less +++ b/less/category.less @@ -172,3 +172,19 @@ max-height: 500px; overflow-y: auto; } + +.merge-topic-card { + position: fixed; + bottom: 10%; + right: 2rem; + z-index: 1; + .topics-section { + text-align: center; + } +} + +@media screen and (min-width: @screen-sm-min) { + .merge-topic-card { + max-width: 33%; + } +} diff --git a/templates/partials/category/tools.tpl b/templates/partials/category/tools.tpl index 0d6f025..7052f22 100644 --- a/templates/partials/category/tools.tpl +++ b/templates/partials/category/tools.tpl @@ -45,6 +45,11 @@ [[topic:thread_tools.move_all]] +
  • + + [[topic:thread_tools.merge]] + +
  • diff --git a/templates/partials/merge_topics_modal.tpl b/templates/partials/merge_topics_modal.tpl new file mode 100644 index 0000000..4e47406 --- /dev/null +++ b/templates/partials/merge_topics_modal.tpl @@ -0,0 +1,25 @@ +
    +
    +

    [[topic:thread_tools.merge_topics]]

    +
    +
    +

    + [[topic:merge_topics_instruction]]
    +

    + + +
    + + {topics.title}
    + +
    +

    +
    + +
    \ No newline at end of file