Release v2.14.0

Merge pull request #220 from liaham/master
Fix sorting behavior on enumeration page
2021-01-27 18:00:53 +00:00 · 2021-01-27 17:58:26 +00:00 · 2021-01-10 15:26:59 +01:00 · 2021-01-10 15:03:55 +01:00 · 2020-12-12 12:35:41 +00:00 · 2020-12-11 07:20:36 +00:00
5 changed files with 11 additions and 6 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+v2.14.0 (2021-01-27):
+
+* Merged #220: fixed drag & drop behavior.
+
 v2.13.0 (2020-09-26):

 * Replaced node-sass with sass.
--- a/package-lock.json
+++ b/package-lock.json
@@ -3172,9 +3172,9 @@
      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
    },
    "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz",
+      "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="
    },
    "interpret": {
      "version": "1.1.0",
--- a/src/sass/components/_content.scss
+++ b/src/sass/components/_content.scss
@@ -28,6 +28,7 @@

 #content {
  padding: $padding-side;
+  overflow-x: auto; // needed for drag & drop of enumerations

  @if $css-grid-layout {
    grid-area: content;
--- a/src/sass/components/_top.scss
+++ b/src/sass/components/_top.scss
@@ -76,7 +76,7 @@
  }

  li {
-    margin: 0 .5em 0 0;
+    margin: 0 .8em 0 0;
    padding: 0;
    float: left;
    list-style-type: none;
@@ -104,7 +104,7 @@

  > ul > li {
    margin-right: 0;
-    margin-left: .5em;
+    margin-left: .8em;
  }
 }

--- a/stylesheets/application.css
+++ b/stylesheets/application.css
Author	SHA1	Message	Date
mrliptontea	745962541b	Release v2.14.0	2021-01-27 18:00:53 +00:00
Grzegorz Rajchman	665ff99d15	Merge pull request #220 from liaham/master Fix sorting behavior on enumeration page	2021-01-27 17:58:26 +00:00
Liane Hampe	b823dda2d9	Fix sorting behavior layout independent The respective css styling is moved out of the case distinction between grid and flexbox layout to be indpendent of the layout choice.	2021-01-10 15:26:59 +01:00
Liane Hampe	bf14f9fa3c	Fix sorting behavior on enumeration page Sorting a list item on administration/enumerations page causes for the tables at second and third position on the page an unexpected behavior when trying to sort an element by drag & drop. That is, the distance between the dragged element and its placeholder increases that much that it was difficult to position the list item as wished.	2021-01-10 15:03:55 +01:00
Grzegorz Rajchman	58c45cf28f	Merge pull request #217 from mrliptontea/dependabot/npm_and_yarn/ini-1.3.7 Bump ini from 1.3.5 to 1.3.7	2020-12-12 12:35:41 +00:00
dependabot[bot]	0dc89601b4	Bump ini from 1.3.5 to 1.3.7 Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7. - [Release notes](https://github.com/isaacs/ini/releases) - [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7) Signed-off-by: dependabot[bot] <support@github.com>	2020-12-11 07:20:36 +00:00
Grzegorz Rajchman	df3bf34032	Merge pull request #213 from geekbrother/master Increase top menu elements margin	2020-10-14 21:56:07 +01:00
Max Kalashnikov	acd262667a	Fix margin between top menu elements.	2020-10-14 11:41:24 +03:00
Max Kalashnikov	052fdbc2cc	Fixing top menu items margin.	2020-10-14 11:37:36 +03:00
Max Kalashnikov	3a541692fa	Fix top menu list margins.	2020-10-14 11:32:06 +03:00