From: Marcel Werk Date: Wed, 25 Apr 2012 10:38:25 +0000 (+0200) Subject: Some minor design fixes X-Git-Tag: 2.0.0_Beta_1~1144 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=acb7f610d6b4985e0cd7c37297251d3ffadbf5d6;p=GitHub%2FWoltLab%2FWCF.git Some minor design fixes --- diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl index 7015f9cf6b..83082ecd24 100644 --- a/wcfsetup/install/files/acp/templates/cacheList.tpl +++ b/wcfsetup/install/files/acp/templates/cacheList.tpl @@ -64,7 +64,7 @@ {if $files|count}
-

{$cache} {#$files|count}

+

{$cache} {#$files|count}

diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl index 17a8a98862..db27007548 100644 --- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl +++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl @@ -3,7 +3,6 @@

{lang}wcf.acp.cronjob.{$action}{/lang}

-

{lang}wcf.acp.cronjob.subtitle{/lang}

diff --git a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl index aeb8583adb..50665d267a 100644 --- a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl +++ b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl @@ -3,7 +3,6 @@

{lang}wcf.acp.cronjob.log{/lang}

-

{lang}wcf.acp.cronjob.subtitle{/lang}

@@ -15,7 +14,7 @@
-

{lang}wcf.acp.cronjob.log{/lang} {#$items}

+

{lang}wcf.acp.cronjob.log{/lang} {#$items}

diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl index 2f155a96e0..349ac7cc54 100644 --- a/wcfsetup/install/files/acp/templates/userAdd.tpl +++ b/wcfsetup/install/files/acp/templates/userAdd.tpl @@ -39,40 +39,36 @@
- -
-
- - {if $errorType.username|isset} - - {if $errorType.username == 'empty'} - {lang}wcf.global.form.error.empty{/lang} - {else} - {lang}wcf.user.username.error.{@$errorType.username}{/lang} - {/if} - - {/if} -
- +
+ {lang}wcf.acp.user.general{/lang} - {if $availableGroups|count} -
-
- -
+ +
-
- {lang}wcf.acp.user.groups{/lang} - -
-
- {htmlCheckboxes options=$availableGroups name=groupIDs selected=$groupIDs} -
-
-
+ + {if $errorType.username|isset} + + {if $errorType.username == 'empty'} + {lang}wcf.global.form.error.empty{/lang} + {else} + {lang}wcf.user.username.error.{@$errorType.username}{/lang} + {/if} + + {/if}
- {/if} + + {if $availableGroups|count} +
+
+ +
+
+ {htmlCheckboxes options=$availableGroups name=groupIDs selected=$groupIDs} +
+
+ {/if} +
{if $action == 'add' || $__wcf->session->getPermission('admin.user.canEditMailAddress')}
diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl index bfc3899ee7..788b524db0 100644 --- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl +++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl @@ -89,7 +89,12 @@ {foreach from=$categoryLevel1[categories] item=categoryLevel2}
diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl index 6938a0efc8..66363dcdbe 100644 --- a/wcfsetup/install/files/acp/templates/userMail.tpl +++ b/wcfsetup/install/files/acp/templates/userMail.tpl @@ -91,7 +91,7 @@
- + {if $errorField == 'subject'} {if $errorType == 'empty'} @@ -107,7 +107,7 @@
- + {if $errorField == 'from'} {if $errorType == 'empty'} @@ -138,7 +138,6 @@
-
diff --git a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl index ae0a9916ad..337a2eb0d6 100644 --- a/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl +++ b/wcfsetup/install/files/acp/templates/usersMassProcessing.tpl @@ -148,9 +148,9 @@ {if $options|count} - + {/if} {event name='tabMenuContent'} @@ -159,37 +159,32 @@
- -
-
-
- {lang}wcf.acp.user.massProcessing.action{/lang} + + {lang}wcf.acp.user.massProcessing.action{/lang} + +
+
+ {if $__wcf->session->getPermission('admin.user.canMailUser')} + + + {/if} + {if $__wcf->session->getPermission('admin.user.canEditUser')} + + {/if} + {if $__wcf->session->getPermission('admin.user.canDeleteUser')} + + {/if} -
-
- {if $__wcf->session->getPermission('admin.user.canMailUser')} - - - {/if} - {if $__wcf->session->getPermission('admin.user.canEditUser')} - - {/if} - {if $__wcf->session->getPermission('admin.user.canDeleteUser')} - - {/if} - - {event name='additionalActions'} - - {if $errorField == 'action'} - - {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} - - {/if} -
-
-
-
-
+ {event name='additionalActions'} + + {if $errorField == 'action'} + + {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} + + {/if} +
+ +
diff --git a/wcfsetup/install/files/style/acl.less b/wcfsetup/install/files/style/acl.less index 4dc693a601..d9993cf2d2 100644 --- a/wcfsetup/install/files/style/acl.less +++ b/wcfsetup/install/files/style/acl.less @@ -1,4 +1,4 @@ -.aclContainer dd > span { +.aclContainer > dd > span { position: relative; } @@ -7,7 +7,7 @@ margin-top: 0; min-height: 100px; - li { + > li { display: block; padding: @wcfGapTiny; @@ -26,7 +26,7 @@ .aclList { margin-bottom: @wcfGapSmall; - li { + > li { cursor: pointer; &:hover, @@ -38,7 +38,7 @@ background-color: @wcfContainerAccentBackgroundColor; } - img:last-child { + > img:last-child { float: right; margin-right: @wcfGapSmall; } @@ -50,7 +50,7 @@ min-height: 200px; text-align: right; - li { + > li { &:hover { background-color: @wcfButtonHoverBackgroundColor; } @@ -61,12 +61,12 @@ text-align: left; } - span { + > span { float: left; padding-left: @wcfGapSmall; } - label { + > label { cursor: pointer; margin: 0 @wcfGapSmall; padding: 0 @wcfGapLarge; diff --git a/wcfsetup/install/files/style/alerts.less b/wcfsetup/install/files/style/alerts.less index 2da37f68c9..62ef0be088 100644 --- a/wcfsetup/install/files/style/alerts.less +++ b/wcfsetup/install/files/style/alerts.less @@ -26,7 +26,7 @@ width: 24px; } - a { + > a { text-decoration: underline; } } @@ -42,7 +42,7 @@ background-image: url('../icon/systemInfo.svg'); } - a { + > a { color: @wcfInfoColor; } } @@ -57,7 +57,7 @@ background-image: url('../icon/systemSuccess.svg'); } - a { + > a { color: @wcfInfoColor; } } @@ -72,7 +72,7 @@ background-image: url('../icon/systemWarning.svg'); } - a { + > a { color: @wcfInfoColor; } } @@ -87,7 +87,7 @@ background-image: url('../icon/systemError.svg'); } - a { + > a { color: @wcfInfoColor; } } diff --git a/wcfsetup/install/files/style/attachment.less b/wcfsetup/install/files/style/attachment.less index 895ee07897..0eabdcb632 100644 --- a/wcfsetup/install/files/style/attachment.less +++ b/wcfsetup/install/files/style/attachment.less @@ -10,23 +10,25 @@ border-top: 1px dotted @wcfContainerBorderColor; color: @wcfColor; font-size: @wcfTitleFontSize; - padding: 4px 0 0; + padding: @wcfGapTiny 0 0; } } .attachmentThumbnailList { > ul > li { - margin: 0 0 14px 7px; + margin: 0 0 @wcfGapMedium @wcfGapSmall; } } .attachmentFileList { - > ul > li:not(:first-child) { - margin-top: @wcfGapTiny; - } + > ul > li { + &:not(:first-child) { + margin-top: @wcfGapTiny; + } - hgroup h2 { - font-size: @wcfSmallFontSize; + > hgroup h2 { + font-size: @wcfSmallFontSize; + } } } @@ -38,7 +40,8 @@ .boxShadow(0, 1px, rgba(0, 0, 0, 0.2), 1px); .transition(box-shadow, .1s); - img { + > img, + > a > img { .borderRadius(); } @@ -48,12 +51,13 @@ color: #fff; position: absolute; width: 100%; - padding: 7px 0; + padding: @wcfGapSmall 0; - .borderRadius(0, 0, 5px, 5px); + .borderRadius(0, 0, @wcfContainerBorderRadius - 2, @wcfContainerBorderRadius - 2); - > h1, h2 { - margin: 0 7px; + > h1, + > h2 { + margin: 0 @wcfGapSmall; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -80,8 +84,9 @@ /* attachment form */ .formAttachmentList { border-bottom: 1px solid @wcfContainerBorderColor; + margin-bottom: @wcfGapSmall; padding-bottom: @wcfGapSmall; - + > li { width: 33%; float: left; @@ -93,23 +98,13 @@ .borderRadius(); } - hgroup { - float: left; - margin-right: @wcfGapSmall; - } - > div { padding-top: @wcfGapSmall; - } - - ul { + > hgroup { + float: left; + margin-right: @wcfGapSmall; + } } } } - -.formAttachmentContent { - dl { - margin-top: 0; - } -} \ No newline at end of file diff --git a/wcfsetup/install/files/style/badge.less b/wcfsetup/install/files/style/badge.less index 12aaa6d825..111f5a1574 100644 --- a/wcfsetup/install/files/style/badge.less +++ b/wcfsetup/install/files/style/badge.less @@ -47,27 +47,27 @@ } /* special */ -.containerHeadline h1 .badge { +.containerHeadline > h1 > .badge { font-size: 70%; top: -1px; } -.boxHeadline > hgroup h1 .badge { +.boxHeadline > hgroup > h1 > .badge { font-size: 50%; top: -3px; } -.mainMenu .badge { +.mainMenu > ul > li > .badge { font-size: 70%; top: -1px; } -.mainMenu .active .badge { +.mainMenu > ul > li.active > .badge { font-size: 65%; top: -2px; } -.tabularBoxTitle > hgroup > h1 .badge { +.tabularBoxTitle > hgroup > h1 > .badge { font-size: 70%; top: -1px; } \ No newline at end of file diff --git a/wcfsetup/install/files/style/breadcrumbs.less b/wcfsetup/install/files/style/breadcrumbs.less index 77f8442391..0d666d3f8e 100644 --- a/wcfsetup/install/files/style/breadcrumbs.less +++ b/wcfsetup/install/files/style/breadcrumbs.less @@ -28,7 +28,6 @@ a { background-color: @wcfContainerAccentBackgroundColor; - color: @wcfLinkHoverColor; position: relative; z-index: 10; } @@ -38,35 +37,35 @@ } } - > span { - border-width: 15px; - border-style: solid none solid solid; + > .pointer { border-color: transparent transparent transparent @wcfContainerBorderColor; + border-style: solid none solid solid; + border-width: 15px; display: block !important; - position: absolute; - width: 0; height: 0; - top: -4px; - right: -15px; - z-index: 20; - } - - > .pointer > span { - text-indent: -9000px; - border-width: 15px; - border-style: solid none solid solid; - border-color: transparent transparent transparent @wcfContentBackgroundColor; - display: block; position: absolute; + right: -15px; + top: -4px; width: 0; - height: 0; - top: -15px; - left: -16px; - overflow: hidden; + z-index: 20; + + > span { + border-color: transparent transparent transparent @wcfContentBackgroundColor; + border-style: solid none solid solid; + border-width: 15px; + display: block; + height: 0; + left: -16px; + overflow: hidden; + position: absolute; + text-indent: -9000px; + top: -15px; + width: 0; + } } - a { - color: @wcfLinkColor; + > a { + color: @wcfColor; display: block; margin: 0; overflow: hidden; @@ -77,13 +76,14 @@ .textShadow(@wcfContentBackgroundColor); } - &:first-child a { + &:first-child > a { background-image: url('../icon/home1.svg'); background-position: 7px center; background-repeat: no-repeat; background-size: 16px; - border-radius: 5px 0 0 5px; padding-left: 30px; + + .borderRadius(@wcfContainerBorderRadius - 2, 0, 0, @wcfContainerBorderRadius - 2); } } } diff --git a/wcfsetup/install/files/style/button.less b/wcfsetup/install/files/style/button.less index 39a872bbac..e38f2cb219 100644 --- a/wcfsetup/install/files/style/button.less +++ b/wcfsetup/install/files/style/button.less @@ -124,7 +124,7 @@ button.active:hover { } /* button icons */ -.button img { +.button > img { margin: -5px 1px -5px -5px; vertical-align: middle; } \ No newline at end of file diff --git a/wcfsetup/install/files/style/codebox.less b/wcfsetup/install/files/style/codebox.less index db2e9bc0ce..574745cf71 100644 --- a/wcfsetup/install/files/style/codebox.less +++ b/wcfsetup/install/files/style/codebox.less @@ -4,6 +4,43 @@ > div { overflow: hidden; + + > dl { + display: table; + margin-top: 7px; + width: 100%; + + > dt { + text-align: right; + display: table-cell; + width: 1%; + + > pre { + padding: 4px 7px; + + > a { + display: block; + margin: 0 -7px; + padding: 0 7px; + text-decoration: none; + + &:target { + color: #000; + background-color: #ff3; + } + } + } + } + + > dd { + display: table-cell; + width: 100%; + + > pre { + padding: 4px 7px; + } + } + } } &:hover { @@ -12,52 +49,14 @@ } } - hgroup { + > hgroup { border-bottom: 1px dotted @wcfContainerBorderColor; - h1 { + > h1 { padding-bottom: 4px; font-weight: bold; } } - - dl { - display: table; - margin-top: 7px; - width: 100%; - - dt { - text-align: right; - display: table-cell; - width: 1%; - - pre { - padding: 4px 7px; - - a { - display: block; - margin: 0 -7px; - padding: 0 7px; - text-decoration: none; - - &:target { - color: #000; - background-color: #ff3; - } - } - } - } - - dd { - display: table-cell; - width: 100%; - - pre { - padding: 4px 7px; - } - } - - } } /* ############## Code Styles ############## */ @@ -171,16 +170,17 @@ min-height: 28px; margin-bottom: @wcfGapTiny; - header { + > header { padding-bottom: @wcfGapTiny; border-bottom: 1px dotted @wcfContainerBorderColor; margin-bottom: @wcfGapSmall; - h1 { + > h1 { font-weight: bold; } } + /* nested quotes */ .quoteBox { background-image: none; padding-left: @wcfGapLarge; diff --git a/wcfsetup/install/files/style/comments.less b/wcfsetup/install/files/style/comments.less index ad527e349d..ac0463e2e8 100644 --- a/wcfsetup/install/files/style/comments.less +++ b/wcfsetup/install/files/style/comments.less @@ -1,58 +1,66 @@ /* ############## Profile Comments ############## */ +.comment, +.commentResponse { + position: relative; +} -.commentList { - .comment, .commentResponse { - position: relative; - } +.commentOptions { + display: block; + position: absolute; + top: @wcfGapMedium; + right: @wcfGapMedium; - .commentOptions { - display: block; - position: absolute; - top: @wcfGapMedium; - right: @wcfGapMedium; + > li { + float: left; + opacity: 0; - li { - float: left; - opacity: 0; - - .transition(opacity, .1s); - - a { - padding: 4px; - } + .transition(opacity, .1s); + + > a { + padding: @wcfGapTiny; } } - - .commentResponseList .commentOptions { - top: @wcfGapSmall; - right: @wcfGapSmall; - } - - .commentContent:hover .commentOptions li { - opacity: 1; - } +} - .commentAdd small, .commentResponseAdd small { - color: @wcfDimmedColor; - } - - .commentContent:not(.commentResponseContent) { - margin-bottom: @wcfGapMedium; - } - - .commentResponseList .commentResponse { - border-top: 1px solid @wcfContainerBorderColor; - padding: @wcfGapSmall; - } - - .commentResponseAdd { - border-top: 1px solid @wcfContainerBorderColor; - padding: 7px 7px 0; - } +.commentResponseList .commentOptions { + top: @wcfGapSmall; + right: @wcfGapSmall; +} + +.commentContent:hover > .commentOptions > li { + opacity: 1; +} + +.commentAdd > div > small, +.commentResponseAdd > div > small { + color: @wcfDimmedColor; + display: block; + opacity: 0; - .commentResponseAdd ~ .commentResponseList .commentResponse:first-child { - margin-top: 7px; - } + .transition(opacity, .1s); +} + +.commentAdd > div > input:focus + small, +.commentResponseAdd > div > input:focus + small { + opacity: 1; +} + +.commentContent:not(.commentResponseContent) { + margin-bottom: @wcfGapMedium; +} + +.commentResponse { + border-top: 1px solid @wcfContainerBorderColor; + padding: @wcfGapSmall; +} + +.commentResponseAdd { + border-top: 1px solid @wcfContainerBorderColor; + padding: 7px 7px 0; +} + +.commentResponseAdd + .commentResponseList > .commentResponse:first-child { + margin-top: 7px; } .commentList > li:nth-child(2n) .commentResponseList > li:nth-child(2n+1) { diff --git a/wcfsetup/install/files/style/forms.less b/wcfsetup/install/files/style/forms.less index 9fbcc2bf64..8b2fca29dc 100644 --- a/wcfsetup/install/files/style/forms.less +++ b/wcfsetup/install/files/style/forms.less @@ -85,16 +85,13 @@ fieldset { > dd { margin-left: 0; - - > label { - display: block; - } } } } > label { color: @wcfLabelColor; + display: block; > input[type='checkbox'], > input[type='radio'] { margin: 2px; @@ -104,6 +101,12 @@ fieldset { margin-left: 21px; } } + + > input[type='checkbox'], > input[type='radio'] { + ~ small { + margin-left: 21px; + } + } } /* wide */ diff --git a/wcfsetup/install/files/style/layout.less b/wcfsetup/install/files/style/layout.less index 42143d744e..9218c31a66 100644 --- a/wcfsetup/install/files/style/layout.less +++ b/wcfsetup/install/files/style/layout.less @@ -348,5 +348,6 @@ ul.dataList { /* Shadows for boxes - do not use on small boxes! */ .shadow { - .boxShadow(0, 10px, rgba(0, 0, 0, .1), 10px, -10px); + //.boxShadow(0, 10px, rgba(0, 0, 0, .1), 10px, -10px); + //.boxShadow(0, 1px, rgba(0, 0, 0, .5), 5px, 0); // } diff --git a/wcfsetup/install/files/style/mixins.less b/wcfsetup/install/files/style/mixins.less index 908328dc98..bd79c77dd4 100644 --- a/wcfsetup/install/files/style/mixins.less +++ b/wcfsetup/install/files/style/mixins.less @@ -68,24 +68,24 @@ -webkit-box-shadow: @topOffset @leftOffset @blurriness @shadowHeight @color; -moz-box-shadow: @topOffset @leftOffset @blurriness @shadowHeight @color; -ms-box-shadow: @topOffset @leftOffset @blurriness @shadowHeight @color; -// -o-box-shadow: @topOffset @leftOffset @blurriness @shadowHeight @color; -// box-shadow: @topOffset @leftOffset @blurriness @shadowHeight @color; + -o-box-shadow: @topOffset @leftOffset @blurriness @shadowHeight @color; + box-shadow: @topOffset @leftOffset @blurriness @shadowHeight @color; } .boxShadowInset(@topOffset, @leftOffset, @color, @blurriness: 5px, @shadowHeight: 0) { -webkit-box-shadow: inset @topOffset @leftOffset @blurriness @shadowHeight @color; -moz-box-shadow: inset @topOffset @leftOffset @blurriness @shadowHeight @color; -ms-box-shadow: inset @topOffset @leftOffset @blurriness @shadowHeight @color; -// -o-box-shadow: inset @topOffset @leftOffset @blurriness @shadowHeight @color; -// box-shadow: inset @topOffset @leftOffset @blurriness @shadowHeight @color; + -o-box-shadow: inset @topOffset @leftOffset @blurriness @shadowHeight @color; + box-shadow: inset @topOffset @leftOffset @blurriness @shadowHeight @color; } .boxShadowNative(@parameters) { -webkit-box-shadow: @parameters; -moz-box-shadow: @parameters; -ms-box-shadow: @parameters; -// -o-box-shadow: @parameters; -// box-shadow: @parameters; + -o-box-shadow: @parameters; + box-shadow: @parameters; } .borderRadius(@borderRadius: @wcfContainerBorderRadius) { diff --git a/wcfsetup/install/files/style/tabs.less b/wcfsetup/install/files/style/tabs.less index ef9e53afdb..3dd3cec758 100644 --- a/wcfsetup/install/files/style/tabs.less +++ b/wcfsetup/install/files/style/tabs.less @@ -4,7 +4,7 @@ .tabMenu { display: block; - margin-top: @wcfGapMedium; + margin-top: @wcfGapLarge; padding: 0 10px; position: relative; text-align: left; @@ -109,7 +109,7 @@ .tabMenuContainer > .menu { border-bottom: 1px solid @wcfContainerBorderColor; - margin: -@wcfGapMedium -@wcfGapLarge @wcfGapLarge -@wcfGapLarge; /* reverse paddings from .containerPadding */ + margin: -@wcfGapMedium -@wcfGapLarge @wcfGapSmall -@wcfGapLarge; /* reverse paddings from .containerPadding */ padding: @wcfGapSmall 0; text-align: center; diff --git a/wcfsetup/install/files/style/variables.less b/wcfsetup/install/files/style/variables.less index 4ed1ae15d2..daf068aef5 100644 --- a/wcfsetup/install/files/style/variables.less +++ b/wcfsetup/install/files/style/variables.less @@ -12,7 +12,7 @@ @wcfContainerBackgroundColor: rgba(252, 253, 254, 1); // bg color for containers @wcfContainerAccentBackgroundColor: rgba(241, 245, 250, 1); // light variantion of the container bg color @wcfContainerHoverBackgroundColor: rgba(216, 231, 245, 1); // bg color for hover effects -@wcfContainerBorderColor: #bcd; // border color for containers +@wcfContainerBorderColor: #ccc; //#bcd; // border color for containers @wcfContainerBorderRadius: 6px; // border radius /* ### box header (table header) ### */ diff --git a/wcfsetup/install/files/style/wbb.less b/wcfsetup/install/files/style/wbb.less index 045c3a4051..64784014cb 100644 --- a/wcfsetup/install/files/style/wbb.less +++ b/wcfsetup/install/files/style/wbb.less @@ -1,11 +1,11 @@ /* ############## Board List ############## */ .wbbBoardList { > li.wbbBoardNodeTop:not(.wbbBoardNodeTopEmpty) > div { - .borderRadius(@wcfContainerBorderRadius - 1, 0); + .borderRadius(@wcfContainerBorderRadius - 2, 0); } > li > ul > li:last-child div.wbbBoard:last-child { - .borderRadius(0, @wcfContainerBorderRadius - 1); + .borderRadius(0, @wcfContainerBorderRadius - 2); } > li > ul > .wbbCategory > hgroup { @@ -123,7 +123,7 @@ } .wbbBoardNodeTopEmpty div.wbbBoard { - .borderRadius(@wcfContainerBorderRadius - 1); + .borderRadius(@wcfContainerBorderRadius - 2); } .wbbBoard > div > hgroup > h1 { @@ -281,4 +281,4 @@ width: 0px; } } -} \ No newline at end of file +}