From 939bf9e96816edbedf68acbca9b9b70fb96cab7a Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Thu, 29 Mar 2012 02:32:27 +0200 Subject: [PATCH] More style fixes --- wcfsetup/install/files/style/badge.less | 11 +++++- wcfsetup/install/files/style/bootstrap.less | 1 + wcfsetup/install/files/style/comments.less | 29 +++++++++++++-- wcfsetup/install/files/style/like.less | 40 +++++++++++++++++++++ wcfsetup/install/files/style/message.less | 9 +---- 5 files changed, 78 insertions(+), 12 deletions(-) create mode 100644 wcfsetup/install/files/style/like.less diff --git a/wcfsetup/install/files/style/badge.less b/wcfsetup/install/files/style/badge.less index 522fbb159a..6cc88199eb 100644 --- a/wcfsetup/install/files/style/badge.less +++ b/wcfsetup/install/files/style/badge.less @@ -19,7 +19,6 @@ padding: 2px 8px; position: relative; text-shadow: none; - top: -1px; white-space: nowrap; .badgeShadow(@wcfContentBackgroundColor); @@ -29,6 +28,16 @@ color: @wcfPageLinkHoverColor; } + &.badgeGreen { + background-color: @successColor; + color: #fff; + } + + &.badgeRed { + background-color: @errorColor; + color: #fff; + } + &.badgeInverse { background-color: @wcfPageLinkHoverColor; color: @wcfPageBackgroundColor; diff --git a/wcfsetup/install/files/style/bootstrap.less b/wcfsetup/install/files/style/bootstrap.less index 47a26f7688..90c1a2e841 100644 --- a/wcfsetup/install/files/style/bootstrap.less +++ b/wcfsetup/install/files/style/bootstrap.less @@ -26,6 +26,7 @@ @import "pagination.less"; @import "comments.less"; @import "user.less"; +@import "like.less"; @import "message.less"; @import "dialog.less"; diff --git a/wcfsetup/install/files/style/comments.less b/wcfsetup/install/files/style/comments.less index 708fdd25a1..5ee519c7d0 100644 --- a/wcfsetup/install/files/style/comments.less +++ b/wcfsetup/install/files/style/comments.less @@ -15,9 +15,18 @@ opacity: 0; .transition(opacity, .1s); + + a { + padding: 4px; + } } } +.commentResponseList .commentOptions { + top: @wcfGapSmall; + right: @wcfGapSmall; +} + .commentContent:hover .commentOptions li { opacity: 1; } @@ -50,18 +59,32 @@ padding: 7px; } -.commentList > li&:nth-child(2n) .commentResponseList > li&:nth-child(2n+1) { +.commentList > li:nth-child(2n) .commentResponseList > li:nth-child(2n+1) { background-color: @wcfContainerBackgroundColor; + + .transition(background-color, .1s); } -.commentList > li&:nth-child(2n+1) .commentResponseList > li&:nth-child(2n+1) { +.commentList > li:nth-child(2n+1) .commentResponseList > li:nth-child(2n+1) { background-color: @wcfContainerAccentBackgroundColor; + + .transition(background-color, .1s); } +.commentList > li:nth-child(2n):hover .commentResponseList > li:nth-child(2n+1), +.commentList > li:nth-child(2n+1):hover .commentResponseList > li:nth-child(2n+1) { + background-color: @wcfHighlightBackgroundColor; +} + +/* like display */ +.commentList .likesDisplay { + display: inline-block; + margin: -2px 0 -2px @wcfGapTiny; +} -/* Comment List */ +/* Comment List (old?) */ .wcf-commentList > .wcf-container { border-top: 1px solid rgba(204, 204, 204, 1); diff --git a/wcfsetup/install/files/style/like.less b/wcfsetup/install/files/style/like.less new file mode 100644 index 0000000000..af9639b60b --- /dev/null +++ b/wcfsetup/install/files/style/like.less @@ -0,0 +1,40 @@ +/* ############## ToDo: Likes Widget ############## */ + +/* @see theadPostList.tpl */ + +/** + * This defines the shape of the Likes widget + * Colors & effects are being defined by the + * "Global Button Color & Effect Library" + */ + +/* -- -- -- -- Widget -- -- -- -- -- */ + +/* Globals */ + +.likesWidget { + margin: 0 0 0 15px; +} + +/* Buttons */ + +.likesWidget > ul { + float: right; + margin-right: 7px; + margin-left: 10px; +} + +.likesWidget > ul > li { + text-align: right; + margin-top: 3px; + display: inline-block; +} + +.likesWidget > ul > li > a { + padding: 2px 4px 3px; +} + +.likesWidget > ul > li:first-child { + margin-right: -5px; +} + \ No newline at end of file diff --git a/wcfsetup/install/files/style/message.less b/wcfsetup/install/files/style/message.less index 47a026f11c..760d7b16c2 100644 --- a/wcfsetup/install/files/style/message.less +++ b/wcfsetup/install/files/style/message.less @@ -162,14 +162,7 @@ .likesDisplay { display: inline-block; - margin-left: @wcfGapMedium; - margin-top: 1px; - - .badge { - font-size: 76%; - margin-left: 0; - top: 0; - } + margin: -2px 0 -2px @wcfGapTiny; } .messageTitle { -- 2.20.1