From d0f37ffb21c6173cc32ca1eee4823ba0096d010d Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Sat, 30 Jan 2016 22:38:31 +0100 Subject: [PATCH] Some more minor style tweaks --- .../templates/userProfileAbout.tpl | 42 +-- .../files/style/layout/containerList.scss | 4 - .../install/files/style/layout/content.scss | 240 +++++++++--------- .../install/files/style/layout/layout.scss | 13 - wcfsetup/install/files/style/ui/dialog.scss | 7 + wcfsetup/install/files/style/ui/popover.scss | 6 +- .../install/files/style/ui/userProfile.scss | 4 - 7 files changed, 158 insertions(+), 158 deletions(-) diff --git a/com.woltlab.wcf/templates/userProfileAbout.tpl b/com.woltlab.wcf/templates/userProfileAbout.tpl index bf74217605..b63e1ca9de 100644 --- a/com.woltlab.wcf/templates/userProfileAbout.tpl +++ b/com.woltlab.wcf/templates/userProfileAbout.tpl @@ -1,22 +1,22 @@ -
- {hascontent} - {content} - {foreach from=$options item=category} - {foreach from=$category[categories] item=optionCategory} -
- {lang}wcf.user.option.category.{@$optionCategory[object]->categoryName}{/lang} - - {foreach from=$optionCategory[options] item=userOption} -
-
{lang}wcf.user.option.{@$userOption[object]->optionName}{/lang}
-
{@$userOption[object]->optionValue}
-
- {/foreach} -
- {/foreach} +{hascontent} + {content} + {foreach from=$options item=category} + {foreach from=$category[categories] item=optionCategory} +
+

{lang}wcf.user.option.category.{@$optionCategory[object]->categoryName}{/lang}

+ + {foreach from=$optionCategory[options] item=userOption} +
+
{lang}wcf.user.option.{@$userOption[object]->optionName}{/lang}
+
{@$userOption[object]->optionValue}
+
+ {/foreach} +
{/foreach} - {/content} - {hascontentelse} - {lang}wcf.user.profile.content.about.noPublicData{/lang} - {/hascontent} -
\ No newline at end of file + {/foreach} + {/content} +{hascontentelse} +
+

{lang}wcf.user.profile.content.about.noPublicData{/lang}

+
+{/hascontent} diff --git a/wcfsetup/install/files/style/layout/containerList.scss b/wcfsetup/install/files/style/layout/containerList.scss index 2c2428a684..196545db6d 100644 --- a/wcfsetup/install/files/style/layout/containerList.scss +++ b/wcfsetup/install/files/style/layout/containerList.scss @@ -35,10 +35,6 @@ top: 5px; right: 0; } - - + * { - margin-top: 10px; - } } .buttonGroupNavigation { diff --git a/wcfsetup/install/files/style/layout/content.scss b/wcfsetup/install/files/style/layout/content.scss index 21ba466b1f..abaf4a80c3 100644 --- a/wcfsetup/install/files/style/layout/content.scss +++ b/wcfsetup/install/files/style/layout/content.scss @@ -1,19 +1,37 @@ /* style for content area */ -.content { - /* content header */ - .contentHeader, - .boxHeadline { // deprecated - color: $wcfContentHeadlineText; // todo: rename variable - margin-bottom: 30px; +/* content header */ +.contentHeader, +.boxHeadline { // deprecated + color: $wcfContentHeadlineText; // todo: rename variable + margin-bottom: 30px; + + .contentTitle, + > h1 { // deprecated + @extend .wcfFontTitle; - .contentTitle, - > h1 { // deprecated - @extend .wcfFontTitle; - - .badge { - top: -2px; - } + .badge { + top: -2px; } + } + + a { + color: $wcfContentHeadlineLink; // todo: rename variable + + &:hover { + color: $wcfContentHeadlineLinkActive; // todo: rename variable + } + } +} + +/* legacy styling for sub headlines (deprecated; use .section > .sectionTitle instead) */ +.boxHeadline.boxSubHeadline { + margin-top: 30px; + margin-bottom: 20px; + + > h2 { + color: $wcfContentHeadlineText; // todo: rename variable + + @extend .wcfFontHeadline; a { color: $wcfContentHeadlineLink; // todo: rename variable @@ -22,133 +40,129 @@ color: $wcfContentHeadlineLinkActive; // todo: rename variable } } + + .badge { + top: -2px; + } } - - /* legacy styling for sub headlines (deprecated; use .section > .sectionTitle instead) */ - .boxHeadline.boxSubHeadline { - margin-top: 30px; - margin-bottom: 20px; +} + +/* todo +.boxHeadline { + &.labeledHeadline { + font-size: 0; + > h1, > h2 { - color: $wcfContentHeadlineText; // todo: rename variable - - @extend .wcfFontHeadline; - - a { - color: $wcfContentHeadlineLink; // todo: rename variable - - &:hover { - color: $wcfContentHeadlineLinkActive; // todo: rename variable - } - } + display: inline-block; + margin-right: 10px; + } + + > ul { + display: inline-block; + font-size: 1rem; - .badge { - top: -2px; + &:not(:empty) { + margin-right: 10px; } } } +}*/ + +/* content sections */ +.section { + margin-top: 30px; - /* todo - .boxHeadline { - &.labeledHeadline { - font-size: 0; - - > h1, - > h2 { - display: inline-block; - margin-right: 10px; - } + .sectionTitle { + color: $wcfContentHeadlineText; // todo: rename variable + + @extend .wcfFontHeadline; + + a { + color: $wcfContentHeadlineLink; // todo: rename variable - > ul { - display: inline-block; - font-size: 1rem; - - &:not(:empty) { - margin-right: 10px; - } + &:hover { + color: $wcfContentHeadlineLinkActive; // todo: rename variable } } - }*/ + + .badge { + top: -2px; + } + } - /* content sections */ - .section { - margin-top: 30px; + .sectionDescription { + color: $wcfContentDimmedText; + } + + > .sectionHeader, + > .sectionTitle { + margin-bottom: 20px; + } + + &:not(.sectionContainerList) { + > .sectionHeader, + > .sectionTitle { + border-bottom: 1px solid $wcfContentBorderInner; + padding-bottom: 10px; + } + } +} + +/* fieldset styling (old sections / deprecated) */ +fieldset { + margin-top: 30px; + + > legend { + border-bottom: 1px solid $wcfContentBorderInner; + color: $wcfContentHeadlineText; // todo: rename variable + float: left; + margin-bottom: 20px; + padding-bottom: 10px; + width: 100%; - .sectionTitle { - color: $wcfContentHeadlineText; // todo: rename variable - - @extend .wcfFontHeadline; - - a { - color: $wcfContentHeadlineLink; // todo: rename variable - - &:hover { - color: $wcfContentHeadlineLinkActive; // todo: rename variable - } - } + @extend .wcfFontHeadline; + + a { + color: $wcfContentHeadlineLink; // todo: rename variable - .badge { - top: -2px; + &:hover { + color: $wcfContentHeadlineLinkActive; // todo: rename variable } } - .sectionDescription { - color: $wcfContentDimmedText; + .badge { + top: -2px; } - > .sectionHeader, - > .sectionTitle { - margin-bottom: 20px; + &+ * { + clear: left; } - &:not(.sectionContainerList) { - > .sectionHeader, - > .sectionTitle { - border-bottom: 1px solid $wcfContentBorderInner; - padding-bottom: 10px; - } + + small { + color: $wcfContentDimmedText; + position: relative; + top: -12px; } } - - /* fieldset styling (old sections / deprecated) */ - fieldset { - margin-top: 30px; +} + +/* styling for container headlines */ +.containerHeadline { + > h3 { + @extend .wcfFontHeadline; - > legend { - border-bottom: 1px solid $wcfContentBorderInner; - color: $wcfContentHeadlineText; // todo: rename variable - float: left; - margin-bottom: 20px; - padding-bottom: 10px; - width: 100%; - - @extend .wcfFontHeadline; - - a { - color: $wcfContentHeadlineLink; // todo: rename variable - - &:hover { - color: $wcfContentHeadlineLinkActive; // todo: rename variable - } - } - - .badge { - top: -2px; - } - - &+ * { - clear: left; - } - - + small { - color: $wcfContentDimmedText; - position: relative; - top: -12px; - } + > .badge { + top: -2px; } } + + ~ .containerContent { + margin-top: 10px; + } } +/* styling for content navigation area (containing pagination / page buttons) */ .contentNavigation { align-items: center; display: flex; @@ -201,4 +215,4 @@ } } } -} \ No newline at end of file +} diff --git a/wcfsetup/install/files/style/layout/layout.scss b/wcfsetup/install/files/style/layout/layout.scss index e01c99f6b7..dc13ba8e8b 100644 --- a/wcfsetup/install/files/style/layout/layout.scss +++ b/wcfsetup/install/files/style/layout/layout.scss @@ -88,16 +88,3 @@ a { .content + .sidebar { margin-left: 30px; } - -/* CONTENT AREA */ - - -.containerHeadline { - > h3 { - @extend .wcfFontHeadline; - - > .badge { - top: -2px; - } - } -} diff --git a/wcfsetup/install/files/style/ui/dialog.scss b/wcfsetup/install/files/style/ui/dialog.scss index 5a73ef1dc2..5468a00327 100644 --- a/wcfsetup/install/files/style/ui/dialog.scss +++ b/wcfsetup/install/files/style/ui/dialog.scss @@ -153,6 +153,13 @@ position: absolute; right: 0; } + + > div { + > .section:first-child, + > fieldset:first-child { + margin-top: 0; + } + } } } diff --git a/wcfsetup/install/files/style/ui/popover.scss b/wcfsetup/install/files/style/ui/popover.scss index 338a733340..2ec66fe9f8 100644 --- a/wcfsetup/install/files/style/ui/popover.scss +++ b/wcfsetup/install/files/style/ui/popover.scss @@ -8,7 +8,7 @@ 100% { visibility: hidden; transform: translateY(-20px); opacity: 0; } } -/* outer element containg both the pointer and content element */ +/* outer element containing both the pointer and content element */ .popover { animation: wcfPopoverOut .3s; animation-fill-mode: forwards; @@ -19,7 +19,7 @@ top: 0; vertical-align: middle; visibility: hidden; - width: 400px !important; + width: 500px !important; z-index: 500; &.active { @@ -69,7 +69,7 @@ max-height: 320px; min-height: 36px; overflow: hidden; - padding: 10px; + padding: 15px; a { color: $wcfContentLink; diff --git a/wcfsetup/install/files/style/ui/userProfile.scss b/wcfsetup/install/files/style/ui/userProfile.scss index 9377b4e820..7479d1d806 100644 --- a/wcfsetup/install/files/style/ui/userProfile.scss +++ b/wcfsetup/install/files/style/ui/userProfile.scss @@ -130,8 +130,4 @@ .box48 { align-items: center; } - - li .containerHeadline + *:not(.buttonGroupNavigation) { - margin-top: 0; - } } -- 2.20.1