resolve conflicts

2017-07-13 17:52:00 +02:00
parent 0340b45f2c 557f13f796
commit e2c17dbeb4
4 changed files with 166 additions and 32 deletions
--- a/customize.dist/src/less/mixins.less
+++ b/customize.dist/src/less/mixins.less
@@ -89,6 +89,7 @@
        font-size: @width/1.2;
    }
    .right-col {
+        order: 10;
        flex: 1;
        overflow: hidden;
        text-overflow: ellipsis;