From 23145a714cd8d51e1d4ef0cc0c84c5488da6ffe3 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Mon, 1 Oct 2012 19:53:22 +0200 Subject: [PATCH] Small basic style improvements --- wcfsetup/install/files/style/dropdown.less | 1 + wcfsetup/install/files/style/global.less | 6 ------ wcfsetup/install/files/style/layout.less | 18 +++++++----------- wcfsetup/setup/db/install.sql | 6 +++++- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/wcfsetup/install/files/style/dropdown.less b/wcfsetup/install/files/style/dropdown.less index 7301f9df1f..84f3b15f0a 100644 --- a/wcfsetup/install/files/style/dropdown.less +++ b/wcfsetup/install/files/style/dropdown.less @@ -84,6 +84,7 @@ min-width: 160px; padding: 4px 0; position: absolute; + text-align: left; z-index: 350; .boxShadow(2px, 2px, rgba(0, 0, 0, .2), 10px); diff --git a/wcfsetup/install/files/style/global.less b/wcfsetup/install/files/style/global.less index 73660bfdba..a282125140 100644 --- a/wcfsetup/install/files/style/global.less +++ b/wcfsetup/install/files/style/global.less @@ -227,9 +227,3 @@ fieldset > legend > .badge { font-size: 50%; top: -3px; } - - -/* todo */ -.dropdownMenu { -display: none; -} \ No newline at end of file diff --git a/wcfsetup/install/files/style/layout.less b/wcfsetup/install/files/style/layout.less index 159bddc69d..f71a3563e8 100644 --- a/wcfsetup/install/files/style/layout.less +++ b/wcfsetup/install/files/style/layout.less @@ -23,7 +23,6 @@ /* user panel */ .userPanel { background-color: @wcfUserPanelBackgroundColor; - border-bottom: 1px solid rgba(0, 0, 0, .1); /* todo */ height: 40px; left: 0; position: fixed; @@ -58,8 +57,7 @@ } > .badge.badgeInverse { - /* todo */ - background-color: rgb(204, 0, 0); + background-color: rgb(204, 0, 0); /* todo */ color: white; padding: 0 6px 1px; position: absolute; @@ -79,7 +77,7 @@ > .searchBar { float: right; - padding: 7px 0; + padding: 6px 0 7px; background-color: @wcfUserPanelHoverBackgroundColor; > form input[type="search"] { @@ -125,7 +123,6 @@ } /* main menu */ -/* todo */ .mainMenu { > ul { border-bottom: 1px solid @wcfContainerBorderColor; @@ -140,27 +137,26 @@ background-color: @wcfMainMenuBackgroundColor; float: left; font-size: @wcfSubHeadlineFontSize; - margin-bottom: -1px; > a { - color: @wcfPageColor; + color: @wcfMainMenuColor; display: inline-block; padding: 11px 35px; font-weight: bold; &:hover { border-bottom: 1px solid @wcfContainerBorderColor; - background-color: #f4f4f4; + background-color: @wcfMainMenuHoverBackgroundColor; text-decoration: none; } } &.active { > a { - border-bottom: 1px solid #fff; - background-color: #fff; - color: #000; + border-bottom: 1px solid @wcfNavigationHeaderBackgroundColor; + background-color: @wcfNavigationHeaderBackgroundColor; + color: @wcfMainMenuActiveColor; } } diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql index 9084ff845c..f3ed4617ee 100644 --- a/wcfsetup/setup/db/install.sql +++ b/wcfsetup/setup/db/install.sql @@ -1009,4 +1009,8 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfGapLarg INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfNavigationHeaderBackgroundColor', '@wcfContainerBackgroundColor'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfNavigationFooterBackgroundColor', '@wcfSidebarBackgroundColor'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfMainMenuBackgroundColor', '@wcfSidebarBackgroundColor'); -INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfUserPanelHoverBackgroundColor', '#3c3c3c'); \ No newline at end of file +INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfUserPanelHoverBackgroundColor', '#3c3c3c'); +INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfMainMenuHoverBackgroundColor', '@wcfContainerHoverBackgroundColor'); +INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfMainMenuColor', '@wcfColor'); +INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfMainMenuActiveColor', '#000'); +INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfMarkedBackgroundColor', '#ffffc8'); -- 2.20.1