From f91462ea90cdbd7de204703e815e017db90e33d3 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Tue, 8 Mar 2016 19:29:28 +0100 Subject: [PATCH] Minor design tweaks for dialogs --- .../install/files/js/WoltLab/WCF/Ui/Dialog.js | 2 +- .../install/files/style/layout/global.scss | 2 +- wcfsetup/install/files/style/ui/dialog.scss | 37 +++++++++++-------- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Dialog.js b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Dialog.js index f5a652cf19..d074b15d25 100644 --- a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Dialog.js +++ b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Dialog.js @@ -280,7 +280,7 @@ define( header.appendChild(closeButton); var span = elCreate('span'); - span.textContent = options.closeButtonLabel; + span.className = 'icon icon24 fa-times'; closeButton.appendChild(span); } diff --git a/wcfsetup/install/files/style/layout/global.scss b/wcfsetup/install/files/style/layout/global.scss index d8a3a878a8..ae9bb1aa55 100644 --- a/wcfsetup/install/files/style/layout/global.scss +++ b/wcfsetup/install/files/style/layout/global.scss @@ -67,7 +67,7 @@ .wcfFontHeadline { font-size: $wcfFontSizeHeadline; - font-weight: 300; + font-weight: 400; } .wcfFontSection { diff --git a/wcfsetup/install/files/style/ui/dialog.scss b/wcfsetup/install/files/style/ui/dialog.scss index 0a4516e997..a45170da7e 100644 --- a/wcfsetup/install/files/style/ui/dialog.scss +++ b/wcfsetup/install/files/style/ui/dialog.scss @@ -87,24 +87,16 @@ @extend .wcfFontHeadline; } - > a { - color: $wcfHeaderLink; - flex: 0 0 20px; - font-family: FontAwesome; - font-size: 18px; - text-align: right; - text-decoration: none; - - &::before { - content: $fa-var-times; - } - - &:hover { + > .dialogCloseButton { + align-self: center; + flex: 0 0 auto; + + &:hover > .icon { color: $wcfHeaderLinkActive; } - > span { - display: none; + > .icon { + color: $wcfHeaderLink; } } } @@ -173,11 +165,26 @@ right: 0; } + .section { + margin-top: 30px; + + .sectionTitle { + @extend .wcfFontHeadline; + } + } + > div { > .section:first-child, > fieldset:first-child { margin-top: 0; } + + > div { + > .section:first-child, + > fieldset:first-child { + margin-top: 0; + } + } } } } -- 2.20.1