diff --git a/wcfsetup/install/files/js/WCF.Comment.js b/wcfsetup/install/files/js/WCF.Comment.js index c9cd72fa1d..6831fd8787 100644 --- a/wcfsetup/install/files/js/WCF.Comment.js +++ b/wcfsetup/install/files/js/WCF.Comment.js @@ -283,12 +283,12 @@ WCF.Comment.Handler = Class.extend({ if (comment.data('canEdit')) { var $editButton = $('

' + WCF.Language.get('wcf.global.button.edit') + '

'); - $editButton.data('commentID', commentID).appendTo(comment.find('ul.commentOptions:eq(0)')).click($.proxy(this._prepareEdit, this)); + $editButton.data('commentID', commentID).appendTo(comment.find('ul.buttonList:eq(0)')).click($.proxy(this._prepareEdit, this)); } if (comment.data('canDelete')) { var $deleteButton = $('

' + WCF.Language.get('wcf.global.button.delete') + '

'); - $deleteButton.data('commentID', commentID).appendTo(comment.find('ul.commentOptions:eq(0)')).click($.proxy(this._delete, this)); + $deleteButton.data('commentID', commentID).appendTo(comment.find('ul.buttonList:eq(0)')).click($.proxy(this._delete, this)); } }, @@ -317,14 +317,14 @@ WCF.Comment.Handler = Class.extend({ var $editButton = $('

' + WCF.Language.get('wcf.global.button.edit') + '

'); var self = this; - $editButton.data('responseID', responseID).appendTo(response.find('ul.commentOptions:eq(0)')).click(function(event) { self._prepareEdit(event, true); }); + $editButton.data('responseID', responseID).appendTo(response.find('ul.buttonList:eq(0)')).click(function(event) { self._prepareEdit(event, true); }); } if (response.data('canDelete')) { var $deleteButton = $('

' + WCF.Language.get('wcf.global.button.delete') + '

'); var self = this; - $deleteButton.data('responseID', responseID).appendTo(response.find('ul.commentOptions:eq(0)')).click(function(event) { self._delete(event, true); }); + $deleteButton.data('responseID', responseID).appendTo(response.find('ul.buttonList:eq(0)')).click(function(event) { self._delete(event, true); }); } }, @@ -917,8 +917,8 @@ WCF.Comment.Like = WCF.Like.extend({ this._containers[containerID].find('.containerHeadline:eq(0) > h3').append(badge); if (this._canLike) { - likeButton.appendTo(this._containers[containerID].find('.commentOptions:eq(0)')); - dislikeButton.appendTo(this._containers[containerID].find('.commentOptions:eq(0)')); + likeButton.appendTo(this._containers[containerID].find('ul.buttonList:eq(0)')); + dislikeButton.appendTo(this._containers[containerID].find('ul.buttonList:eq(0)')); } }, @@ -956,8 +956,8 @@ WCF.Comment.Response.Like = WCF.Like.extend({ this._containers[containerID].find('.containerHeadline:eq(0) > h3').append(badge); if (this._canLike) { - likeButton.appendTo(this._containers[containerID].find('.commentOptions:eq(0)')); - dislikeButton.appendTo(this._containers[containerID].find('.commentOptions:eq(0)')); + likeButton.appendTo(this._containers[containerID].find('ul.buttonList:eq(0)')); + dislikeButton.appendTo(this._containers[containerID].find('ul.buttonList:eq(0)')); } }, diff --git a/wcfsetup/install/files/lib/page/UserPage.class.php b/wcfsetup/install/files/lib/page/UserPage.class.php index 0915ea20de..5778cd2f06 100644 --- a/wcfsetup/install/files/lib/page/UserPage.class.php +++ b/wcfsetup/install/files/lib/page/UserPage.class.php @@ -130,20 +130,20 @@ class UserPage extends AbstractPage { // get followers $this->followerList = new UserFollowerList(); $this->followerList->getConditionBuilder()->add('user_follow.followUserID = ?', array($this->userID)); - $this->followerList->sqlLimit = 8; + $this->followerList->sqlLimit = 12; $this->followerList->readObjects(); // get following $this->followingList = new UserFollowingList(); $this->followingList->getConditionBuilder()->add('user_follow.userID = ?', array($this->userID)); - $this->followingList->sqlLimit = 8; + $this->followingList->sqlLimit = 12; $this->followingList->readObjects(); // get visitors if (PROFILE_ENABLE_VISITORS) { $this->visitorList = new UserProfileVisitorList(); $this->visitorList->getConditionBuilder()->add('user_profile_visitor.ownerID = ?', array($this->userID)); - $this->visitorList->sqlLimit = 8; + $this->visitorList->sqlLimit = 12; $this->visitorList->readObjects(); } diff --git a/wcfsetup/install/files/style/layout/containerList.scss b/wcfsetup/install/files/style/layout/containerList.scss index c6b432fe71..2c2428a684 100644 --- a/wcfsetup/install/files/style/layout/containerList.scss +++ b/wcfsetup/install/files/style/layout/containerList.scss @@ -60,7 +60,8 @@ } > a { - padding: 6px; + display: inline-block; + padding: 4px 6px; > .icon { color: rgba(0, 0, 0, .5); diff --git a/wcfsetup/install/files/style/layout/global.scss b/wcfsetup/install/files/style/layout/global.scss index a59b4bdf3c..2983324464 100644 --- a/wcfsetup/install/files/style/layout/global.scss +++ b/wcfsetup/install/files/style/layout/global.scss @@ -26,7 +26,7 @@ /* boxes with an image */ @mixin box($imageSize, $margin: 0) { - display: flex !important; + display: flex; > :first-child:not(:last-child) { flex: 0 0 auto;

{lang}wcf.user.stats{/lang}