From 8ce85e3a051abdbcc9d7099aeb7d7e1328c118c2 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Wed, 12 Jun 2013 21:35:01 +0200 Subject: [PATCH] CSS clean up --- .../acp/style/blueTemptation/individual.less | 54 ++++++++----------- .../acp/style/blueTemptation/override.less | 11 +--- wcfsetup/install/files/style/alert.less | 4 -- wcfsetup/install/files/style/attachment.less | 1 - wcfsetup/install/files/style/bbcode.less | 3 +- .../install/files/style/bootstrap/mixin.less | 12 ----- wcfsetup/install/files/style/button.less | 17 +++--- wcfsetup/install/files/style/dialog.less | 24 ++++----- wcfsetup/install/files/style/dropdown.less | 12 ++--- wcfsetup/install/files/style/form.less | 10 +++- wcfsetup/install/files/style/global.less | 14 ++--- wcfsetup/install/files/style/imageViewer.less | 6 +-- wcfsetup/install/files/style/layout.less | 11 ++-- wcfsetup/install/files/style/like.less | 11 ---- wcfsetup/install/files/style/message.less | 31 ++++++++--- wcfsetup/install/files/style/poll.less | 6 +-- wcfsetup/install/files/style/recaptcha.less | 5 -- wcfsetup/install/files/style/search.less | 5 -- wcfsetup/install/files/style/tagging.less | 5 +- wcfsetup/setup/db/install.sql | 3 ++ 20 files changed, 100 insertions(+), 145 deletions(-) delete mode 100644 wcfsetup/install/files/style/like.less delete mode 100644 wcfsetup/install/files/style/recaptcha.less delete mode 100644 wcfsetup/install/files/style/search.less diff --git a/wcfsetup/install/files/acp/style/blueTemptation/individual.less b/wcfsetup/install/files/acp/style/blueTemptation/individual.less index 848e174bba..e5838f983a 100644 --- a/wcfsetup/install/files/acp/style/blueTemptation/individual.less +++ b/wcfsetup/install/files/acp/style/blueTemptation/individual.less @@ -249,7 +249,7 @@ button.active:hover { .breadcrumbs { background-color: @wcfContentBackgroundColor; border: 1px solid @wcfContainerBorderColor; - .borderRadius(); + border-radius: 6px; > ul { > li { @@ -307,9 +307,8 @@ button.active:hover { } &:first-child > a { + border-radius: @wcfContainerBorderRadius - 2 0 0 @wcfContainerBorderRadius - 2; padding-left: 9px; - - .borderRadius(@wcfContainerBorderRadius - 2, 0, 0, @wcfContainerBorderRadius - 2); } } } @@ -352,8 +351,9 @@ button.active:hover { .dropdownMenu, .attachmentThumbnail, .attachmentThumbnail > img, - .attachmentThumbnail > a > img { - .borderRadius(); + .attachmentThumbnail > a > img, + .box48 .attachmentTinyThumbnail { + border-radius: @wcfContainerBorderRadius; } .containerList { @@ -371,15 +371,15 @@ button.active:hover { } .message.messageSidebarOrientationLeft .messageContent { - .borderRadius(0, @wcfContainerBorderRadius - 1, @wcfContainerBorderRadius - 1, 0); + border-radius: 0 @wcfContainerBorderRadius - 1 @wcfContainerBorderRadius - 1 0; } .message.messageSidebarOrientationRight .messageContent { - .borderRadius(@wcfContainerBorderRadius - 1, 0, 0, @wcfContainerBorderRadius - 1); + border-radius: @wcfContainerBorderRadius - 1 0 0 @wcfContainerBorderRadius - 1; } .message.messageReduced .messageContent { - .borderRadius(@wcfContainerBorderRadius - 1); + border-radius: @wcfContainerBorderRadius - 1; } .messageOptions { @@ -406,7 +406,7 @@ button.active:hover { } .tabularBox { - .borderRadius(); + border-radius: @wcfContainerBorderRadius; } .tabularBox:not(.tabularBoxTitle) .table { @@ -458,16 +458,16 @@ button.active:hover { } .attachmentThumbnail > div { - .borderRadius(0, 0, @wcfContainerBorderRadius - 2, @wcfContainerBorderRadius - 2); + border-radius: 0 0 @wcfContainerBorderRadius - 2 @wcfContainerBorderRadius - 2; } .wbbBoardList:not(.wbbBoardListReduced) { > li.wbbBoardNodeTop:not(.wbbBoardNodeTopEmpty) > div { - .borderRadius(@wcfContainerBorderRadius - 2, 0); + border-radius: @wcfContainerBorderRadius - 2 @wcfContainerBorderRadius - 2 0 0; } > li > ul > li:last-child div.wbbBoard:last-child, > li > ul > li.tabularBox:last-child { - .borderRadius(0, @wcfContainerBorderRadius - 2); + border-radius: 0 0 @wcfContainerBorderRadius - 2 @wcfContainerBorderRadius - 2; } .tabularBox:not(.wbbBoardNodeTop) { @@ -475,26 +475,26 @@ button.active:hover { } .wbbBoardNodeTopEmpty div.wbbBoard { - .borderRadius(@wcfContainerBorderRadius - 2); + border-radius: @wcfContainerBorderRadius - 2; } } .wbbBoardListReduced .tabularBox { - .borderRadius(0); + border-radius: 0; } .tabMenuContainer > .menu { - .borderRadius(@wcfContainerBorderRadius - 1, @wcfContainerBorderRadius - 1, 0, 0); + border-radius: @wcfContainerBorderRadius - 1 @wcfContainerBorderRadius - 1 0 0; } .pollContainer { > .formSubmit { - .borderRadius(0, 0, 5px, 5px); + border-radius: 0 0 5px 5px; } } .codeBox > div { - .borderRadius(@wcfContainerBorderRadius, 0, 0, @wcfContainerBorderRadius); + border-radius: @wcfContainerBorderRadius 0 0 @wcfContainerBorderRadius; } } @@ -592,22 +592,11 @@ input[type='password'], textarea, select[multiple] { border-color: darken(@wcfInputBorderColor, 20%) @wcfInputBorderColor lighten(@wcfInputBorderColor, 10%); - border-radius: 3px; .boxShadowInset(0, 1px, rgba(0, 0, 0, .1)); .transition(~"background-color, border, box-shadow", .2s); } -.preInput { - > input[type='text'] { - border-radius: 0 3px 3px 0; - } - - > textarea { - border-radius: 0 3px 3px; - } -} - /* active / focus */ input[type='text']:active, input[type='search']:active, @@ -675,7 +664,9 @@ select[multiple]:focus { .error, .success, .warning { + border-radius: 7px; border-width: 0; + font-weight: bold; .boxShadowNative(~"0 1px 2px rgba(0, 0, 0, .5), inset 0 0 1px rgba(0, 0, 0, .2)"); @@ -698,6 +689,7 @@ select[multiple]:focus { } .innerError { + border-radius: 7px; border-width: 0; .boxShadowNative(~"0 1px 2px rgba(0, 0, 0, .5), inset 0 0 1px rgba(0, 0, 0, .2)"); @@ -736,10 +728,10 @@ select[multiple]:focus { > div { background-color: @wcfContentBackgroundColor; + border-radius: @wcfContainerBorderRadius; padding: @wcfGapSmall; margin-right: @wcfGapSmall; - .borderRadius(); .boxShadowNative(~"inset 0 1px 1px rgba(0, 0, 0, .1)"); } } @@ -751,6 +743,7 @@ select[multiple]:focus { .messageList { .messageGroupStarter { > .message.messageSidebarOrientationLeft:before { + border-top-left-radius: @wcfContainerBorderRadius; content: ""; display: block; height: 128px; @@ -759,11 +752,11 @@ select[multiple]:focus { top: 0; width: 128px; - .borderRadius(@wcfContainerBorderRadius, 0, 0, 0); .linearGradientNative(~"left top, rgba(255, 255, 255, .85) 0%, rgba(255, 255, 255, 0) 40%"); } > .message.messageSidebarOrientationRight:before { + border-top-right-radius: @wcfContainerBorderRadius; content: ""; display: block; height: 128px; @@ -772,7 +765,6 @@ select[multiple]:focus { top: 0; width: 128px; - .borderRadius(0, @wcfContainerBorderRadius, 0, 0); .linearGradientNative(~"right top, rgba(255, 255, 255, .85) 0%, rgba(255, 255, 255, 0) 40%"); } } diff --git a/wcfsetup/install/files/acp/style/blueTemptation/override.less b/wcfsetup/install/files/acp/style/blueTemptation/override.less index 46c72b250c..bed9e6bafd 100644 --- a/wcfsetup/install/files/acp/style/blueTemptation/override.less +++ b/wcfsetup/install/files/acp/style/blueTemptation/override.less @@ -1,11 +1,3 @@ -/** - * Blue Temptation - * Style for WoltLab Community Framework 2 - * - * @copyright 2001-2013 WoltLab GmbH - * @license WoltLab Burning Board License - */ - @wcfSidebarBackgroundColor: @wcfContainerHoverBackgroundColor; @wcfDropdownHoverBackgroundColor: @wcfSidebarBackgroundColor; @wcfNavigationHeaderBackgroundColor: lighten(@wcfSidebarBackgroundColor, 3%); @@ -23,4 +15,5 @@ @wcfInfoBorderColor: rgba(48, 77, 119, 1); @wcfWarningColor: rgba(0, 0, 0, 1); @wcfWarningBackgroundColor: rgba(239, 203, 80, 1); -@wcfWarningBorderColor: rgba(233, 191, 43, 1); \ No newline at end of file +@wcfWarningBorderColor: rgba(233, 191, 43, 1); +@wcfInputBorderRadius: 3px; \ No newline at end of file diff --git a/wcfsetup/install/files/style/alert.less b/wcfsetup/install/files/style/alert.less index b12b141008..3dcde42a2a 100644 --- a/wcfsetup/install/files/style/alert.less +++ b/wcfsetup/install/files/style/alert.less @@ -11,8 +11,6 @@ padding: @wcfGapSmall+@wcfGapTiny @wcfGapMedium @wcfGapSmall+@wcfGapTiny 48px; position: relative; - .borderRadius(7px); - &:after { font-family: FontAwesome; font-size: 28px; @@ -125,8 +123,6 @@ padding: 2px 10px; position: relative; /* Firefox support (from version 10 on) is buggy */ - .borderRadius(7px); - /* pointer */ &:after { border: 7px solid transparent; diff --git a/wcfsetup/install/files/style/attachment.less b/wcfsetup/install/files/style/attachment.less index 6e2a13ac19..c58c047cb0 100644 --- a/wcfsetup/install/files/style/attachment.less +++ b/wcfsetup/install/files/style/attachment.less @@ -101,7 +101,6 @@ } .box48 .attachmentTinyThumbnail { - border-radius: 6px; max-height: 48px; max-width: 48px; } diff --git a/wcfsetup/install/files/style/bbcode.less b/wcfsetup/install/files/style/bbcode.less index 34dc947928..c58d16fe15 100644 --- a/wcfsetup/install/files/style/bbcode.less +++ b/wcfsetup/install/files/style/bbcode.less @@ -262,12 +262,11 @@ .inlineCode { background-color: @wcfContentBackgroundColor; border: 1px solid @wcfContainerBorderColor; + border-radius: 3px; display: inline-block; font-family: Consolas, 'Courier New', monospace; margin: 0 2px; padding: 0 5px; - - .borderRadius(3px); } /* smiley list */ diff --git a/wcfsetup/install/files/style/bootstrap/mixin.less b/wcfsetup/install/files/style/bootstrap/mixin.less index 5b6cf628b2..638b29781e 100644 --- a/wcfsetup/install/files/style/bootstrap/mixin.less +++ b/wcfsetup/install/files/style/bootstrap/mixin.less @@ -72,15 +72,3 @@ .boxShadowNative(@parameters) { box-shadow: @parameters; } - -.borderRadius(@borderRadius: @wcfContainerBorderRadius) { - .borderRadius(@borderRadius, @borderRadius, @borderRadius, @borderRadius); -} - -.borderRadius(@borderTopRadius, @borderBottomRadius) { - .borderRadius(@borderTopRadius, @borderTopRadius, @borderBottomRadius, @borderBottomRadius); -} - -.borderRadius(@borderTopLeftRadius, @borderTopRightRadius, @borderBottomRightRadius, @borderBottomLeftRadius) { - border-radius: @arguments; -} \ No newline at end of file diff --git a/wcfsetup/install/files/style/button.less b/wcfsetup/install/files/style/button.less index 807dd97bc2..fdeb1a32a8 100644 --- a/wcfsetup/install/files/style/button.less +++ b/wcfsetup/install/files/style/button.less @@ -4,6 +4,7 @@ input[type='reset'], input[type='submit'], input[type='button'], .button { + border-radius: @wcfButtonBorderRadius; border-style: solid; border-width: 1px; cursor: pointer; @@ -11,8 +12,6 @@ input[type='button'], margin: 0 2px; padding: 5px 13px; position: relative; - - .borderRadius(15px); } /* normal state */ @@ -133,22 +132,21 @@ button.active:hover { display: inline-block; > .button { + border-radius: 0; margin: 0 0 0 -1px; - - .borderRadius(0); } &:first-child { > .button { - border-top-left-radius: 15px; - border-bottom-left-radius: 15px; + border-top-left-radius: @wcfButtonBorderRadius; + border-bottom-left-radius: @wcfButtonBorderRadius; } } &:last-child { > .button { - border-top-right-radius: 15px; - border-bottom-right-radius: 15px; + border-top-right-radius: @wcfButtonBorderRadius; + border-bottom-right-radius: @wcfButtonBorderRadius; } } } @@ -235,11 +233,10 @@ button.active:hover { /* small buttons */ button.small, .button.small { + border-radius: @wcfSmallButtonBorderRadius; font-size: @wcfSmallFontSize; min-height: 13px; padding: 5px 11px; - - .borderRadius(3px); } /* button icons */ diff --git a/wcfsetup/install/files/style/dialog.less b/wcfsetup/install/files/style/dialog.less index f83e35842a..4246176eba 100644 --- a/wcfsetup/install/files/style/dialog.less +++ b/wcfsetup/install/files/style/dialog.less @@ -1,40 +1,39 @@ .dialogContainer { background: rgba(0, 0, 0, .4); border: 14px solid transparent; + border-radius: 15px; margin-left: auto; margin-right: auto; max-width: 90%; min-width: 500px; position: fixed; - .borderRadius(15px); .boxShadow(0, 1px, rgba(0, 0, 0, .3), 23px); } @media only screen and (max-width: 800px) { .dialogContainer { border: 0; + border-radius: 0; left: 0 !important; max-width: none; min-width: 0; position: absolute; top: 0 !important; width: 100%; - - .borderRadius(0); } } .dialogTitlebar { background-color: @wcfTabularBoxBackgroundColor; border-bottom: 1px solid rgba(0, 0, 0, .1); + border-top-left-radius: 7px; + border-top-right-radius: 7px; display: block; padding: 10px 20px; min-height: 27px; position: relative; - .borderRadius(7px, 0); - .dialogTitle { color: @wcfTabularBoxColor; display: block; @@ -72,7 +71,7 @@ @media only screen and (max-width: 800px) { .dialogTitlebar { - .borderRadius(0); + border-radius: 0; } } @@ -82,7 +81,8 @@ padding: 10px 20px 20px; &:not(.dialogForm) { - .borderRadius(0, 7px); + border-bottom-left-radius: 7px; + border-bottom-right-radius: 7px; } > .icon-spinner { @@ -105,14 +105,14 @@ .formSubmit { background-color: @wcfContainerAccentBackgroundColor; + border-bottom-left-radius: 7px; + border-bottom-right-radius: 7px; border-top: 1px solid @wcfContainerBorderColor; bottom: 0; left: 0; padding: 10px 0; position: absolute; width: 100%; - - .borderRadius(0, 0, 7px, 7px); } } @@ -122,11 +122,11 @@ max-width: none !important; &:not(.dialogForm) { - .borderRadius(0); + border-radius: 0; } .formSubmit { - .borderRadius(0); + border-radius: 0; } } } @@ -147,6 +147,7 @@ .spinner { border: 1px solid rgba(0, 0, 0, .3); + border-radius: 6px; color: #fff; left: 46%; padding: 7px 0; @@ -157,7 +158,6 @@ width: 70px; z-index: 401; - .borderRadius(6px); .boxShadow(0, 1px, rgba(0, 0, 0, .5), 7px); .linearGradient(rgba(0, 0, 0, .5), rgba(0, 0, 0, 0), rgba(0, 0, 0, .7)); diff --git a/wcfsetup/install/files/style/dropdown.less b/wcfsetup/install/files/style/dropdown.less index f919fb4c9a..f8a9cff4f1 100644 --- a/wcfsetup/install/files/style/dropdown.less +++ b/wcfsetup/install/files/style/dropdown.less @@ -8,18 +8,15 @@ display: table; width: 100%; - /*input, - textarea { - min-width: 300px; - }*/ - input { + border-radius: 0 @wcfInputBorderRadius @wcfInputBorderRadius 0; display: table-cell; margin: 0; width: 99%; } textarea { + border-radius: 0 @wcfInputBorderRadius @wcfInputBorderRadius; display: block; margin-top: 0; } @@ -34,8 +31,7 @@ &.button { border-right-width: 0; - - .borderRadius(3px, 0, 0, 3px); + border-radius: @wcfInputBorderRadius 0 0 @wcfInputBorderRadius; } span { @@ -59,7 +55,7 @@ padding-right: @wcfGapSmall; &.button { - .borderRadius(3px, 0); + border-radius: @wcfInputBorderRadius @wcfInputBorderRadius 0 0; } &~ .dropdownMenu { diff --git a/wcfsetup/install/files/style/form.less b/wcfsetup/install/files/style/form.less index ad5fa2d8d4..d0e900983e 100644 --- a/wcfsetup/install/files/style/form.less +++ b/wcfsetup/install/files/style/form.less @@ -204,6 +204,7 @@ select[multiple] { box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; + border-radius: @wcfInputBorderRadius; font-family: @wcfBaseFontFamily; padding: 4px 3px; margin: 0; @@ -459,4 +460,11 @@ textarea { /* Fixes weird firefox bug */ select > option { display: block !important; -} \ No newline at end of file +} + +/* reCaptcha */ +.reCaptcha { + input.marginTop { + margin-top: 14px; + } +} diff --git a/wcfsetup/install/files/style/global.less b/wcfsetup/install/files/style/global.less index d75dacfc69..cf34976991 100644 --- a/wcfsetup/install/files/style/global.less +++ b/wcfsetup/install/files/style/global.less @@ -156,6 +156,7 @@ body > iframe[src="about:blank"] { /* balloon tooltips */ .balloonTooltip { background-color: @wcfTooltipBackgroundColor; + border-radius: 6px; color: @wcfTooltipColor; font-size: .85em; max-width: 300px; @@ -163,8 +164,6 @@ body > iframe[src="about:blank"] { position: absolute; z-index: 800; - .borderRadius(6px); - .pointer { border-color: @wcfTooltipBackgroundColor transparent; border-style: solid; @@ -186,13 +185,13 @@ body > iframe[src="about:blank"] { /* popover */ .popover { background-color: rgba(0, 0, 0, .4); + border-radius: 6px; padding: @wcfGapSmall; position: absolute; vertical-align: middle; width: 400px !important; z-index: 500; - .borderRadius(6px); .boxShadow(0, 1px, rgba(0, 0, 0, .3), 7px); > .icon-spinner { @@ -208,14 +207,13 @@ body > iframe[src="about:blank"] { > .popoverContent { background-color: @wcfContainerBackgroundColor; + border-radius: 6px; color: @wcfColor; max-height: 300px; min-height: 32px; opacity: 0; overflow: hidden; padding: @wcfGapSmall @wcfGapMedium; - - .borderRadius(6px); } &:after { @@ -252,6 +250,7 @@ body > iframe[src="about:blank"] { /* default values */ .badge { background-color: @wcfColor; + border-radius: 9px; color: @wcfContentBackgroundColor; display: inline-block; font-size: 11px; @@ -262,12 +261,9 @@ body > iframe[src="about:blank"] { vertical-align: middle; white-space: nowrap; - .borderRadius(9px); - &.label { + border-radius: 4px; font-weight: normal; - - .borderRadius(4px); } /* colors */ diff --git a/wcfsetup/install/files/style/imageViewer.less b/wcfsetup/install/files/style/imageViewer.less index 3ff3837ff9..b8b62c4c87 100644 --- a/wcfsetup/install/files/style/imageViewer.less +++ b/wcfsetup/install/files/style/imageViewer.less @@ -34,10 +34,9 @@ left: 0; > span { + border-radius: 0 30px 30px 0; left: 0; padding-right: @wcfGapMedium; - - .borderRadius(0, 30px, 30px, 0); } } @@ -45,10 +44,9 @@ right: 0; > span { + border-radius: 30px 0 0 30px; padding-left: @wcfGapMedium; right: 0; - - .borderRadius(30px, 0, 0, 30px); } } diff --git a/wcfsetup/install/files/style/layout.less b/wcfsetup/install/files/style/layout.less index 7bd6cc76bf..4c37f2e3aa 100644 --- a/wcfsetup/install/files/style/layout.less +++ b/wcfsetup/install/files/style/layout.less @@ -278,9 +278,9 @@ } > a { + border-radius: 6px; display: block; - .borderRadius(6px); .transition(background-color, .1s); &:hover { @@ -1213,13 +1213,12 @@ .content > .breadcrumbs { background-color: @wcfContentBackgroundColor; border: 1px solid @wcfContainerBorderColor; + border-radius: 6px; display: inline-block; margin-left: @wcfGapSmall; margin-right: @wcfGapSmall; max-width: 90%; - .borderRadius(6px); - > ul { > li { float: none; @@ -1375,6 +1374,7 @@ a { background-color: @wcfContainerBackgroundColor; border: 1px solid @wcfContainerBorderColor; + border-radius: @wcfButtonBorderRadius; color: @wcfButtonColor; display: block; font-size: @wcfSmallFontSize; @@ -1382,8 +1382,6 @@ outline: 0; padding: @wcfGapTiny @wcfGapSmall; - .borderRadius(15px); - &:hover { background-color: @wcfButtonHoverBackgroundColor; border-color: @wcfButtonHoverBorderColor; @@ -1814,6 +1812,7 @@ ul.inlineDataList { .pageNavigation { ul { li { + border-radius: @wcfSmallButtonBorderRadius; float: left; font-weight: bold; margin: 0 1px; @@ -1821,8 +1820,6 @@ ul.inlineDataList { padding: 0; text-align: center; - .borderRadius(3px); - &:not(.active):not(.disabled) { cursor: pointer; } diff --git a/wcfsetup/install/files/style/like.less b/wcfsetup/install/files/style/like.less deleted file mode 100644 index bfda15d993..0000000000 --- a/wcfsetup/install/files/style/like.less +++ /dev/null @@ -1,11 +0,0 @@ -.likeButton.active { - .icon { - color: rgba(0, 153, 0, 1); - } -} - -.dislikeButton.active { - .icon { - color: rgba(204, 0, 0, 1); - } -} \ No newline at end of file diff --git a/wcfsetup/install/files/style/message.less b/wcfsetup/install/files/style/message.less index ec26f59d11..d1040713e2 100644 --- a/wcfsetup/install/files/style/message.less +++ b/wcfsetup/install/files/style/message.less @@ -227,7 +227,7 @@ ul.smallButtons { > li { a.button { - .borderRadius(0); + border-radius: 0; } } } @@ -399,10 +399,9 @@ } .message.messageSidebarOrientationLeft .newMessageBadge { + border-radius: 0 5px 5px 0; left: -219px; - .borderRadius(0, 5px, 5px, 0); - &:before { border-left: 6px solid transparent; left: 0; @@ -421,7 +420,7 @@ .message.messageSidebarOrientationRight, .message.messageReduced { .newMessageBadge { - .borderRadius(5px, 0, 0, 5px); + border-radius: 5px 0 0 5px; &:before { border-right: 6px solid transparent; @@ -573,13 +572,13 @@ text-align: left; > .badgeOnline { + border-radius: 0 5px 5px 0; color: rgba(238, 255, 238, 1); bottom: 7px; left: -5px; position: absolute; text-transform: uppercase; - .borderRadius(0, 5px, 5px, 0); .boxShadow(1px, 1px, rgba(0, 0, 0, .2), 3px); .linearGradient(darken(rgba(0, 153, 0, 1), 10%), rgba(0, 153, 0, 1), darken(rgba(0, 153, 0, 1), 10%)); .textShadow(darken(rgba(0, 153, 0, 1), 10%)); @@ -779,14 +778,13 @@ li:nth-child(2n+1) .message { > .badge { background-color: @wcfContainerBackgroundColor; border: 1px solid @wcfContainerBorderColor; + border-radius: 3px; color: @wcfColor; line-height: 23px; padding: 0 7px; position: relative; vertical-align: 1px; - .borderRadius(3px); - &:before { border: 6px solid @wcfContainerBorderColor; border-color: transparent @wcfContainerBorderColor transparent transparent; @@ -848,6 +846,24 @@ li:nth-child(2n+1) .message { margin-top: 0; } +.messageSearchResultList { + > li > .box48 > div > .containerHeadline > h3 { + padding-right: 100px; + } +} + +.likeButton.active { + .icon { + color: rgba(0, 153, 0, 1); + } +} + +.dislikeButton.active { + .icon { + color: rgba(204, 0, 0, 1); + } +} + /* ckeditor fixes */ .cke_editor_text { border-style: solid !important; @@ -974,3 +990,4 @@ li:nth-child(2n+1) .message { right: @wcfGapMedium; } } + diff --git a/wcfsetup/install/files/style/poll.less b/wcfsetup/install/files/style/poll.less index 3d9be7d9d3..6069035c14 100644 --- a/wcfsetup/install/files/style/poll.less +++ b/wcfsetup/install/files/style/poll.less @@ -40,19 +40,17 @@ &:hover { background-color: @wcfContainerAccentBackgroundColor; - - .borderRadius(0, 5px, 5px, 0); + border-radius: 0 5px 5px 0; } .pollMeter { background-color: @wcfContainerHoverBackgroundColor; + border-radius: 0 5px 5px 0; height: 100%; left: 0; position: absolute; top: 0; z-index: -1; - - .borderRadius(0, 5px, 5px, 0); } .caption { diff --git a/wcfsetup/install/files/style/recaptcha.less b/wcfsetup/install/files/style/recaptcha.less deleted file mode 100644 index 4a3ec50716..0000000000 --- a/wcfsetup/install/files/style/recaptcha.less +++ /dev/null @@ -1,5 +0,0 @@ -.reCaptcha { - input.marginTop { - margin-top: 14px; - } -} \ No newline at end of file diff --git a/wcfsetup/install/files/style/search.less b/wcfsetup/install/files/style/search.less deleted file mode 100644 index 36c849b00c..0000000000 --- a/wcfsetup/install/files/style/search.less +++ /dev/null @@ -1,5 +0,0 @@ -.messageSearchResultList { - > li > .box48 > div > .containerHeadline > h3 { - padding-right: 100px; - } -} \ No newline at end of file diff --git a/wcfsetup/install/files/style/tagging.less b/wcfsetup/install/files/style/tagging.less index b6c86653d3..1fc1c7bfcf 100644 --- a/wcfsetup/install/files/style/tagging.less +++ b/wcfsetup/install/files/style/tagging.less @@ -5,13 +5,12 @@ } .tag { + border-radius: 0 4px 4px 0; font-weight: normal; height: 13px; margin-left: 6px; padding-bottom: 2px; padding-left: 10px; - - .borderRadius(0, 4px, 4px, 0); &:before{ border-color: transparent @wcfColor transparent transparent; @@ -28,6 +27,7 @@ &:after{ background: @wcfContentBackgroundColor; + border-radius: 2px; content: ""; height: 4px; left: -2px; @@ -35,7 +35,6 @@ top: 6px; width: 4px; - .borderRadius(2px); .boxShadow(0, -1px, rgba(0, 0, 0, .2), 2px); } diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql index d09f984ba3..cca388c08f 100644 --- a/wcfsetup/setup/db/install.sql +++ b/wcfsetup/setup/db/install.sql @@ -1579,6 +1579,8 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfUserPan INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfUserPanelHoverColor', 'rgba(255, 255, 255, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBackgroundColor', 'rgba(249, 249, 249, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBorderColor', 'rgba(221, 221, 221, 1)'); +INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBorderRadius', '15px'); +INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfSmallButtonBorderRadius', '3px'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonColor', 'rgba(102, 102, 102, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryBackgroundColor', 'rgba(211, 232, 254, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryBorderColor', 'rgba(136, 194, 255, 1)'); @@ -1594,6 +1596,7 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputCo INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputBorderColor', 'rgba(204, 204, 204, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputHoverBackgroundColor', 'rgba(239, 247, 255, 1)'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputHoverBorderColor', 'rgba(198, 222, 248, 1)'); +INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputBorderRadius', '0'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfBaseFontSize', '13px'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfBaseFontFamily', '"Trebuchet MS", Arial, sans-serif'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfLayoutFluidGap', '30px'); -- 2.20.1