From 66dba3c52b9919e23d84cfffeb3035c51072edf0 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Tue, 8 Mar 2016 18:58:06 +0100 Subject: [PATCH] Some minor style tweaks --- .../install/files/style/layout/global.scss | 11 +++++---- .../install/files/style/layout/layout.scss | 1 + .../install/files/style/layout/sidebar.scss | 24 ++++++++++++------- wcfsetup/install/files/style/ui/badge.scss | 1 - wcfsetup/install/files/style/ui/button.scss | 6 +++-- 5 files changed, 27 insertions(+), 16 deletions(-) diff --git a/wcfsetup/install/files/style/layout/global.scss b/wcfsetup/install/files/style/layout/global.scss index bcb876c03a..d8a3a878a8 100644 --- a/wcfsetup/install/files/style/layout/global.scss +++ b/wcfsetup/install/files/style/layout/global.scss @@ -38,17 +38,18 @@ > :last-child { flex: 1; + overflow: hidden; } } .box16 { @include box(16px, 5px); } -.box24 { @include box(24px, 5px); } -.box32 { @include box(32px, 8px); } -.box48 { @include box(48px, 10px); } -.box64 { @include box(64px, 10px); } +.box24 { @include box(24px, 8px); } +.box32 { @include box(32px, 10px); } +.box48 { @include box(48px, 12px); } +.box64 { @include box(64px, 15px); } .box96 { @include box(96px, 15px); } .box128 { @include box(128px, 20px); } -.box256 { @include box(256px, 20px); } +.box256 { @include box(256px, 30px); } .wcfFontDefault { font-size: $wcfFontSizeDefault; diff --git a/wcfsetup/install/files/style/layout/layout.scss b/wcfsetup/install/files/style/layout/layout.scss index 01e9536ed5..ba82c673d8 100644 --- a/wcfsetup/install/files/style/layout/layout.scss +++ b/wcfsetup/install/files/style/layout/layout.scss @@ -74,6 +74,7 @@ a { .sidebar { flex: 0 0 310px; + overflow: hidden; &:first-child { margin-right: 30px; diff --git a/wcfsetup/install/files/style/layout/sidebar.scss b/wcfsetup/install/files/style/layout/sidebar.scss index c4ba60c305..7637b19f47 100644 --- a/wcfsetup/install/files/style/layout/sidebar.scss +++ b/wcfsetup/install/files/style/layout/sidebar.scss @@ -60,8 +60,6 @@ > div, > fieldset, > section { - overflow: hidden; - .button.more { float: right; margin-top: 15px; @@ -75,6 +73,21 @@ top: 2px; } } + + .sidebarBoxList { + + > li { + &:not(:last-child) { + margin-bottom: 10px; + } + } + + /*.sidebarBoxHeadline > h3 { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + }*/ + } } /*.sidebar {// @todo @@ -117,9 +130,4 @@ padding: 5px 0; } } - -.sidebarBoxHeadline > h3 { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -}*/ +*/ diff --git a/wcfsetup/install/files/style/ui/badge.scss b/wcfsetup/install/files/style/ui/badge.scss index 01ec525113..ab2fd89072 100644 --- a/wcfsetup/install/files/style/ui/badge.scss +++ b/wcfsetup/install/files/style/ui/badge.scss @@ -72,7 +72,6 @@ a.badge { } } -.badge:hover, a.badge:hover { color: $wcfContentBackground; text-decoration: none; diff --git a/wcfsetup/install/files/style/ui/button.scss b/wcfsetup/install/files/style/ui/button.scss index 8dc0eb90fb..1efda01a04 100644 --- a/wcfsetup/install/files/style/ui/button.scss +++ b/wcfsetup/install/files/style/ui/button.scss @@ -135,11 +135,13 @@ a.button.buttonPrimary { // a.button is required to override link formatting, su } &:first-child .button { - border-radius: 3px 0 0 3px; + border-top-left-radius: 3px; + border-bottom-left-radius: 3px; } &:last-child .button { - border-radius: 0 3px 3px 0; + border-top-right-radius: 3px; + border-bottom-right-radius: 3px; } .button { -- 2.20.1