Fixed margins in recent activity list

diff --git a/com.woltlab.wcf/templates/recentActivityListItem.tpl b/com.woltlab.wcf/templates/recentActivityListItem.tpl
index 34f36fb4e8ea095e50771ef98042e0f00c558068..a6be32e527fc8b08af6460f4ddd4dff6a033839b 100644 (file)
--- a/com.woltlab.wcf/templates/recentActivityListItem.tpl
+++ b/com.woltlab.wcf/templates/recentActivityListItem.tpl
@@ -9,12 +9,12 @@
                                                <a href="{link controller='User' object=$event->getUserProfile()}{/link}" class="userLink" data-user-id="{@$event->getUserProfile()->userID}">{$event->getUserProfile()->username}</a>
                                                <small class="separatorLeft">{@$event->time|time}</small>
                                        </h3> 
-                                       <p>{@$event->getTitle()}</p>
+                                       <div>{@$event->getTitle()}</div>
                                        <small class="containerContentType">{lang}wcf.user.recentActivity.{@$event->getObjectTypeName()}{/lang}</small>
                                </div>
                                
-                               <div>{@$event->getDescription()}</div>
+                               <div class="containerContent">{@$event->getDescription()}</div>
                        </div>
                </div>
        </li>
-{/foreach}
\ No newline at end of file
+{/foreach}

diff --git a/com.woltlab.wcf/templates/userProfileLikeItem.tpl b/com.woltlab.wcf/templates/userProfileLikeItem.tpl
index bd2e8e5ce153a98d669cd9ac5f16a78aeaed2309..791320e9a33bb684d5a161d52fc2bb8cb578a963 100644 (file)
--- a/com.woltlab.wcf/templates/userProfileLikeItem.tpl
+++ b/com.woltlab.wcf/templates/userProfileLikeItem.tpl
@@ -9,12 +9,12 @@
                                                <a href="{link controller='User' object=$like->getUserProfile()}{/link}" class="userLink" data-user-id="{@$like->getUserProfile()->userID}">{$like->getUserProfile()->username}</a>
                                                <small class="separatorLeft">{@$like->time|time}</small>
                                        </h3> 
-                                       <p>{@$like->getTitle()}</p>
+                                       <div>{@$like->getTitle()}</div>
                                        <small class="containerContentType">{lang}wcf.like.objectType.{@$like->getObjectTypeName()}{/lang}</small>
                                </div>
                                
-                               <div>{@$like->getDescription()}</div>
+                               <div class="containerContent">{@$like->getDescription()}</div>
                        </div>
                </div>
        </li>
-{/foreach}
\ No newline at end of file
+{/foreach}

diff --git a/wcfsetup/install/files/style/layout/content.scss b/wcfsetup/install/files/style/layout/content.scss
index 79f4ef721e91ca1277d515f0bc2f312df1b61ae9..4d644e75fe66361c7a28f7f9bfec8d30fd917cdb 100644 (file)
--- a/wcfsetup/install/files/style/layout/content.scss
+++ b/wcfsetup/install/files/style/layout/content.scss
@@ -29,14 +29,6 @@
                        > li:not(:last-child) {
                                margin-right: 10px;
                        }
-                       
-                       .labelList {
-                               display: inline-flex;
-                               
-                               .label {
-                                       top: -1px;
-                               }
-                       }
                }
                
                > li {

diff --git a/wcfsetup/install/files/style/ui/label.scss b/wcfsetup/install/files/style/ui/label.scss
index 333e1d127a4eac89b5ede067951c39dd1b9a778d..9abd5ca74ca13b23a8f1a370016696e9c6f9337f 100644 (file)
--- a/wcfsetup/install/files/style/ui/label.scss
+++ b/wcfsetup/install/files/style/ui/label.scss
@@ -3,6 +3,8 @@
 .labelList {
        @extend .inlineList;
        
+       display: inline-flex;
+       
        > li {
                &:not(:first-child) {
                        .label {
@@ -19,6 +21,10 @@
                                border-bottom-right-radius: 0;
                        }
                }
+               
+               .label {
+                       top: -1px;
+               }
        }
 }