From 15d36a356eaf7d99798f1f245ec825e3c7b39d23 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Tue, 3 Apr 2012 16:27:09 +0200 Subject: [PATCH] Many small style fixes --- wcfsetup/install/files/js/WCF.js | 2 +- wcfsetup/install/files/style/badge.less | 2 +- wcfsetup/install/files/style/button.less | 2 +- wcfsetup/install/files/style/content.less | 6 ++-- wcfsetup/install/files/style/footer.less | 2 +- wcfsetup/install/files/style/forms.less | 2 +- wcfsetup/install/files/style/message.less | 3 +- wcfsetup/install/files/style/navigation.less | 4 +-- wcfsetup/install/files/style/pagination.less | 15 +++++---- wcfsetup/install/files/style/sidebar.less | 2 +- wcfsetup/install/files/style/tabular.less | 8 +++-- wcfsetup/install/files/style/wbb.less | 35 +++++++++++++++++--- 12 files changed, 56 insertions(+), 27 deletions(-) diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js index d6d318c7fe..242b9d30c8 100644 --- a/wcfsetup/install/files/js/WCF.js +++ b/wcfsetup/install/files/js/WCF.js @@ -3042,7 +3042,7 @@ WCF.Collapsible.Remote = Class.extend({ */ _createButton: function(containerID, buttonContainer) { var $isOpen = this._containers[containerID].data('isOpen'); - var $button = $('').prependTo(buttonContainer); + var $button = $('').prependTo(buttonContainer); $button.data('containerID', containerID).click($.proxy(this._toggleContainer, this)); return $button; diff --git a/wcfsetup/install/files/style/badge.less b/wcfsetup/install/files/style/badge.less index 6cc88199eb..78496b406e 100644 --- a/wcfsetup/install/files/style/badge.less +++ b/wcfsetup/install/files/style/badge.less @@ -15,7 +15,7 @@ border-radius: 13px; color: @wcfPageLinkHoverColor; display: inline-block; - font-size: 11px; + font-size: 70%; padding: 2px 8px; position: relative; text-shadow: none; diff --git a/wcfsetup/install/files/style/button.less b/wcfsetup/install/files/style/button.less index 43e7a64086..93cd461003 100644 --- a/wcfsetup/install/files/style/button.less +++ b/wcfsetup/install/files/style/button.less @@ -11,7 +11,7 @@ input[type='button'], display: inline-block; font-size: 100%; font-weight: bold; - margin: 3px 2px; + margin: 0 2px; padding: 5px 13px; } diff --git a/wcfsetup/install/files/style/content.less b/wcfsetup/install/files/style/content.less index d3a2348e33..114a119ffb 100644 --- a/wcfsetup/install/files/style/content.less +++ b/wcfsetup/install/files/style/content.less @@ -15,7 +15,7 @@ &.sidebarOrientationLeft { .content { border-left: 1px solid darken(@wcfHighlightBackgroundColor, 8%); - margin-left: 249px; + margin-left: 299px; } .sidebar { @@ -26,7 +26,7 @@ &.sidebarOrientationRight { .content { border-right: 1px solid darken(@wcfHighlightBackgroundColor, 8%); - margin-right: 249px; + margin-right: 299px; } .sidebar { @@ -36,7 +36,7 @@ } .sidebar { - width: 250px; + width: 300px; z-index: 120; } diff --git a/wcfsetup/install/files/style/footer.less b/wcfsetup/install/files/style/footer.less index 4bd6655ed7..ae4c96ed40 100644 --- a/wcfsetup/install/files/style/footer.less +++ b/wcfsetup/install/files/style/footer.less @@ -1,5 +1,5 @@ .footer { - padding-bottom: @wcfGapSmall; + padding-bottom: @wcfGapMedium; z-index: 100; .footerContent { diff --git a/wcfsetup/install/files/style/forms.less b/wcfsetup/install/files/style/forms.less index 104e023343..150fc5fcf6 100644 --- a/wcfsetup/install/files/style/forms.less +++ b/wcfsetup/install/files/style/forms.less @@ -151,7 +151,7 @@ dl > dd > fieldset > dl > dd > label { } .sidebar dl > dd * { - display: block; + display: inline-block; } /* Globals */ diff --git a/wcfsetup/install/files/style/message.less b/wcfsetup/install/files/style/message.less index 4527e68766..5cbf65d13c 100644 --- a/wcfsetup/install/files/style/message.less +++ b/wcfsetup/install/files/style/message.less @@ -122,8 +122,7 @@ .message .messageBody { color: @wcfColor; display: block; - font-size: 90%; - line-height: 1.75; + line-height: 1.5; padding: 10px 20px 1px; position: relative; diff --git a/wcfsetup/install/files/style/navigation.less b/wcfsetup/install/files/style/navigation.less index e5378a0397..4a8595dc07 100644 --- a/wcfsetup/install/files/style/navigation.less +++ b/wcfsetup/install/files/style/navigation.less @@ -181,9 +181,7 @@ display: table; width: 100%; - > :first-child:before { - content: ""; - display: block; + > * { margin-top: @wcfGapMedium; } diff --git a/wcfsetup/install/files/style/pagination.less b/wcfsetup/install/files/style/pagination.less index 2c8b9bcc45..7cd589bc8d 100644 --- a/wcfsetup/install/files/style/pagination.less +++ b/wcfsetup/install/files/style/pagination.less @@ -8,13 +8,13 @@ /* Globals */ -:not(.statusDisplay) > .pageNavigation { +.contentNavigation .pageNavigation { float: left; - margin: 5px 0 3px; -} + margin: @wcfGapMedium + 5 0 3px; -.contentNavigation .pageNavigation ul li { - margin: 2px; + ul li { + margin: 0 2px; + } } /* -- -- -- Buttons (Level 1 & 2) -- -- -- */ @@ -25,7 +25,7 @@ border-radius: 3px; float: left; font-weight: bold; - margin: 1px; + margin: 0 1px; min-width: 19px; padding: 0; text-align: center; @@ -83,6 +83,9 @@ .statusDisplay .pageNavigation { font-size: 80%; + float: left; + margin-right: 7px; + margin-top: 2px; ul { li { diff --git a/wcfsetup/install/files/style/sidebar.less b/wcfsetup/install/files/style/sidebar.less index 3a994ef4e6..431c4c4ccc 100644 --- a/wcfsetup/install/files/style/sidebar.less +++ b/wcfsetup/install/files/style/sidebar.less @@ -45,7 +45,6 @@ .sidebarBoxHeadline { > h1 { - font-weight: bold; margin-bottom: 1px; overflow: hidden; text-overflow: ellipsis; @@ -81,6 +80,7 @@ legend { padding: 0; + margin: auto; text-transform: uppercase; .textShadow(@wcfHighlightBackgroundColor); diff --git a/wcfsetup/install/files/style/tabular.less b/wcfsetup/install/files/style/tabular.less index e34f6a3bbe..8d8d2c5864 100644 --- a/wcfsetup/install/files/style/tabular.less +++ b/wcfsetup/install/files/style/tabular.less @@ -190,8 +190,12 @@ padding: 1px 0; float: right; - .statusIcons li { - display: inline-block; + .statusIcons { + float: right; + + li { + display: inline-block; + } } img { diff --git a/wcfsetup/install/files/style/wbb.less b/wcfsetup/install/files/style/wbb.less index d683d69cb8..68134426f7 100644 --- a/wcfsetup/install/files/style/wbb.less +++ b/wcfsetup/install/files/style/wbb.less @@ -8,9 +8,23 @@ .borderRadius(0, @wcfContainerBorderRadius); } + > li > ul > .wbbCategory > hgroup { + padding-left: 43px; + } + + > li > ul > li > ul > .wbbCategory > hgroup { + padding-left: 79px; + } + + .tabularBox:not(.wbbBoardNodeTop) { + border-radius: 0; + border-width: 1px 0 0; + } + .wbbStats { + font-size: 85%; left: 50%; - margin-top: 2px; + margin-top: @wcfGapSmall; position: absolute; top: @wcfGapSmall; width: 15%; @@ -46,10 +60,12 @@ > div { background-color: @wcfContentBackgroundColor; - padding: 7px; + padding: @wcfGapSmall; border: 1px solid @wcfContainerBorderColor; border-radius: @wcfContainerBorderRadius; - margin-right: 7px; + margin-right: @wcfGapSmall; + + .boxShadowInset(0, 1px, rgba(0, 0, 0, .1), 3px); } hgroup { @@ -94,7 +110,7 @@ } .wbbBoard { - min-height: 42px; + min-height: 44px; padding: @wcfGapSmall; padding-right: 51%; @@ -132,6 +148,11 @@ .wbbBoard > div > hgroup > h1 { font-size: 120%; } + + .wbbCollapsibleCategory .collapsibleButton { + display: inline-block; + margin-right: 7px; + } } /* ignored boards */ @@ -165,6 +186,10 @@ margin-top: 2px; } + .columnLastPost { + white-space: nowrap; + } + .columnAvatar { div { position: relative; @@ -172,7 +197,7 @@ height: 38px; > p > img { - opacity: .5; + opacity: .6; .transition(opacity, .2s); } -- 2.20.1