Merge pull request #2809 from tvdeyen/revert-list-flex-box

Revert list flex box
AlchemyCMS · Mar 27, 2024 · 528d54b · 528d54b
2 parents 68a1324 + 741cf72
commit 528d54b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/app/assets/stylesheets/alchemy/archive.scss b/app/assets/stylesheets/alchemy/archive.scss
@@ -307,7 +307,7 @@ div#filter_bar {
 
 #overlay_file_list {
   .assign_file_file {
-    display: flex;
+    display: block;
     margin-bottom: 4px;
     word-break: break-all;
 
@@ -323,14 +323,14 @@ div#filter_bar {
     a {
       @extend %text-overflow;
       display: flex;
-      width: 100%;
+      justify-content: space-between;
       line-height: 25px;
       text-decoration: none;
       padding: $default-padding 2 * $default-padding;
     }
 
     alchemy-icon {
-      margin-right: 4px;
+      margin-right: 2 * $default-margin;
       vertical-align: bottom;
     }
   }

diff --git a/app/assets/stylesheets/alchemy/lists.scss b/app/assets/stylesheets/alchemy/lists.scss
@@ -1,5 +1,4 @@
-ul,
-ol {
+ul, ol {
   padding-left: 16px;
   margin-top: 1em;
   margin-bottom: 1em;
@@ -16,15 +15,15 @@ ul.list {
 
   li {
     list-style-type: none;
-    display: flex;
+    display: block;
     margin-bottom: 0;
 
     &.list-header {
       overflow: hidden;
       background-color: transparent;
       font-weight: bold;
-      padding: $default-padding 2 * $default-padding;
-      margin-bottom: 2 * $default-margin;
+      padding: $default-padding 2*$default-padding;
+      margin-bottom: 2*$default-margin;
 
       .list-secondary {
         color: $text-color;
@@ -49,12 +48,12 @@ ul.list {
   }
 
   .list-primary {
+    float: left;
     max-width: 65%;
   }
 
-  .list-secondary,
-  .right {
-    margin-left: auto;
+  .list-secondary, .right {
+    float: right;
     text-align: left;
     width: 30%;
     color: $dark-gray;