Merge remote-tracking branch 'refs/remotes/origin/next' into next-lantia

diff --cc files/style/conversation.scss
index 7d66c50551728ef024632a0dc2d74d7f97f64225,0000000000000000000000000000000000000000..2e9036f68cef1d97d8f7a3eac1f88161c837da6d
mode 100644,000000..100644
--- 1/files/style/conversation.scss
--- /dev/null
+++ b/files/style/conversation.scss
@@@ -1,103 -1,0 +1,107 @@@
 +#conversationLabelFilter {
 +      margin-bottom: $wcfGapMedium;
 +}
 +
 +.conversationLabelList {
 +      margin-bottom: $wcfGapMedium;
 +      
 +      li:not(:last-child) {
 +              margin-bottom: $wcfGapTiny;
 +      }
 +      
 +      &~small {
 +              display: block;
 +      }
 +}
 +
 +#unreadConversations .dropdownMenu > li {
 +      h3 {
 +              max-width: 250px;
 +              overflow: hidden;
 +              text-overflow: ellipsis;
 +      }
 +}
 +
 +.conversationParticipantList {
 +      > li {
 +              .inlineDataList {
 +                      @extend .wcfFontSmall;
 +              }
 +              
 +              &.conversationLeft > div {
 +                      > a > img,
 +                      > span > img {
 +                              @extend .grayscale;
 +                      }
 +              }
 +      }
 +}
 +
 +.conversationLeft .userLink,
 +.conversationLeft.userLink,
 +.conversationLeft p > span {
 +      text-decoration: line-through;
 +}
 +
 +.sidebar fieldset.conversationQuota {
 +      > div {
 +              text-align: center;
 +      }
 +}
 +
 +.conversationUsageBar {
 +      // TODO: background-color: $wcfColor;
 +      border-radius: 5px;
 +      box-shadow: inset 0 1px 5px rgba(0, 0, 0, .5), 0 1px 0 rgba(255, 255, 255, .5);
 +      height: 20px;
 +      padding: 4px;
 +      
 +      > span {
 +              background-image: linear-gradient(rgba(165, 223, 65, 1), rgba(76, 169, 22, 1));
 +              border-radius: 3px;
 +              box-shadow: inset 0 1px 0 rgba(255, 255, 255, .5);
 +              color: transparent;
 +              display: block;
 +              height: 100%;
 +      }
 +      
 +      &.yellow > span {
 +              background-image: linear-gradient(rgba(254, 207, 35, 1), rgba(253, 146, 21, 1));
 +      }
 +      
 +      &.red > span {
 +              background-image: linear-gradient(rgba(240, 163, 163, 1), rgba(244, 35, 35, 1));
 +      }
 +}
 +
++.conversationFolderList > li > a > span {
++      float: right;
++}
++
 +@media only screen and (max-width: 800px) {
 +      .conversationList {
 +              thead {
 +                      display: none;
 +              }
 +              
 +              tbody {
 +                      .columnMark,
 +                      .columnReplies,
 +                      .columnParticipants,
 +                      .columnLastPost,
 +                      .conversationParticipantSummary,
 +                      .columnSubject .statusDisplay {
 +                              display: none;
 +                      }
 +              }
 +      }
 +}
 +
 +@media only screen and (max-width: 1239px) {
 +      .conversationList {
 +              thead .columnParticipants,
 +              tbody .columnParticipants {
 +                      display: none;
 +              }
 +      }
 +}