Minor style fixes

diff --git a/wcfsetup/install/files/style/form.less b/wcfsetup/install/files/style/form.less
index 8149bd8c9bf1f3ddcd25e9649e29f56cb33efc01..d006d3c3494908bfab8e0c4888e5d78f146a7759 100644 (file)
--- a/wcfsetup/install/files/style/form.less
+++ b/wcfsetup/install/files/style/form.less
@@ -242,7 +242,6 @@ select[multiple]:focus {
 }
 
 /* read only state */
-/* todo */
 input[type='text'][readonly],
 input[type='search'][readonly],
 input[type='email'][readonly],
@@ -258,7 +257,6 @@ select[multiple][readonly] {
 }
 
 /* disabled state */
-/* todo */
 input[type='text'][disabled],
 input[type='search'][disabled],
 input[type='date'][disabled],
@@ -303,13 +301,6 @@ select[multiple][disabled] {
        }
 }
 
-input, textarea {
-       &:invalid {
-               // firefox adds a box shadow by itself
-               box-shadow: none;
-       }
-}
-
 /* width */
 textarea {
        width: 99%;

diff --git a/wcfsetup/install/files/style/layout.less b/wcfsetup/install/files/style/layout.less
index 09717255015b084131ba0b925c0af77e8f61c87d..01a73963d7eb381e55c98d56aa5d31cd47413401 100644 (file)
--- a/wcfsetup/install/files/style/layout.less
+++ b/wcfsetup/install/files/style/layout.less
@@ -57,8 +57,8 @@
                                        }
                                        
                                        > .badge.badgeInverse {
-                                               background-color: rgb(63, 127, 191); /* todo */ /* same color as tabularBox */
-                                               color: white;
+                                               background-color: @wcfTabularBoxBackgroundColor;
+                                               color: @wcfTabularBoxColor;
                                                padding: 0 6px 1px;
                                                position: absolute;
                                                bottom: 4px;
@@ -125,34 +125,23 @@
 /* main menu */
 .mainMenu {
        > ul {
-               border-bottom: 1px solid @wcfContainerBorderColor;
-               
-               &:after {
-                       clear: both;
-                       content: '';
-                       display: block;
-               }
+               background-color: @wcfMainMenuBackgroundColor;
+               display: inline-block;
+               letter-spacing: -4px;
                
                > li {
-                       background-color: @wcfMainMenuBackgroundColor;
-                       float: left;
+                       display: inline-block;
                        font-size: @wcfTitleFontSize;
-                       margin-bottom: -1px;
-                       margin-top: 7px;
-                       
-                       &.active {
-                       font-size: @wcfSubHeadlineFontSize;
-                       margin-top: 0;
-                       }
+                       margin-top: -7px;
+                       letter-spacing: normal;
+                       vertical-align: bottom;
                        
                        > a {
-                               border-bottom: 1px solid @wcfContainerBorderColor;
                                color: @wcfMainMenuColor;
                                display: inline-block;
                                padding: 9px 35px;
-                               
+                                                               
                                &:hover {
-                                       background-color: @wcfMainMenuHoverBackgroundColor;
                                        color: @wcfMainMenuActiveColor;
                                        text-decoration: none;
                                }
@@ -164,8 +153,10 @@
                        }
                        
                        &.active {
+                               font-size: @wcfSubHeadlineFontSize;
+                               margin-top: -8px;
+                               
                                > a {
-                                       border-bottom: 1px solid @wcfNavigationHeaderBackgroundColor;
                                        background-color: @wcfNavigationHeaderBackgroundColor;
                                        color: @wcfMainMenuActiveColor;
                                        font-weight: bold;
@@ -225,6 +216,7 @@
 .navigationHeader {
        background-color: @wcfNavigationHeaderBackgroundColor;
        border-bottom: 1px solid @wcfContainerBorderColor;
+       border-top: 1px solid @wcfContainerBorderColor;
 }
        
 .navigationFooter {
@@ -265,7 +257,7 @@
                        position: relative;
                        width: 300px;
                        z-index: 120;
-
+                       
                        > .collapsibleButton {
                                background-color: @wcfSidebarBackgroundColor;
                                background-image: url('../icon/arrowRight.svg');
@@ -325,7 +317,7 @@
                                }
                        }
                }
-               
+
                .content {
                        margin-right: 300px;
                }
@@ -467,7 +459,6 @@
 /* bread crumbs */
 .breadcrumbs {
        box-sizing: border-box;
-       display: block;
        overflow: hidden;
        position: relative;
        text-align: left;

diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index df9eb58cb470257e52fef9a0e5dc3ca0049ee440..dd0defb9b175004aa261bc7be2565d95540aa0f7 100644 (file)
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -946,7 +946,7 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContain
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContainerAccentBackgroundColor', 'rgba(249, 249, 249, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContainerHoverBackgroundColor', 'rgba(244, 244, 244, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContainerBorderColor', 'rgba(221, 221, 221, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContainerBorderRadius', '6px');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContainerBorderRadius', '0');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfTabularBoxBackgroundColor', 'rgba(63, 127, 191, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfTabularBoxColor', 'rgba(255, 255, 255, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfTabularBoxHoverColor', 'rgba(255, 255, 255, 1)');
@@ -962,9 +962,12 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonP
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryHoverBackgroundColor', 'darken(@wcfButtonPrimaryBackgroundColor, 3%)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryHoverBorderColor', 'darken(@wcfButtonPrimaryBorderColor, 10%)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryHoverColor', '@wcfButtonPrimaryColor');
+
+-- todo:
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonHoverBackgroundColor', 'darken(@wcfButtonBackgroundColor, 3%)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonHoverBorderColor', 'darken(@wcfButtonBorderColor, 10%)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonHoverColor', '@wcfButtonColor');
+
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonHoverColor', 'rgba(102, 102, 102, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputBackgroundColor', 'rgba(255, 255, 255, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputColor', 'rgba(102, 102, 102, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputBorderColor', 'rgba(204, 204, 204, 1)');
@@ -978,15 +981,15 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfPageBac
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfPageColor', 'rgba(102, 102, 102, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfPageLinkColor', 'rgba(63, 127, 191, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfPageLinkHoverColor', 'rgba(15, 79, 143, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfSidebarBackgroundColor', 'rgba(244, 244, 244, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfSidebarBackgroundColor', '@wcfContainerHoverBackgroundColor');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfDimmedColor', 'rgba(136, 136, 136, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfLabelColor', 'rgba(102, 102, 102, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeadlineColor', 'rgba(102, 102, 102, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfLabelColor', '@wcfColor');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeadlineColor', '@wcfColor');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeadlineFontFamily', '"Trebuchet MS", Arial, sans-serif');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfDropdownBackgroundColor', 'rgba(255, 255, 255, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfDropdownColor', 'rgba(102, 102, 102, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfDropdownBorderColor', 'rgba(221, 221, 221, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfDropdownHoverBackgroundColor', 'rgba(244, 244, 244, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfDropdownBackgroundColor', '@wcfContentBackgroundColor');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfDropdownColor', '@wcfColor');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfDropdownBorderColor', '@wcfContainerBorderColor');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfDropdownHoverBackgroundColor', '@wcfContainerHoverBackgroundColor');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfBaseLineHeight', '1.27');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeadlineFontSize', '170%');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfSubHeadlineFontSize', '140%');
@@ -1010,12 +1013,12 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfGapTiny
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfGapSmall', '7px');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfGapMedium', '14px');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfGapLarge', '21px');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfNavigationHeaderBackgroundColor', 'rgba(255, 255, 255, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfNavigationFooterBackgroundColor', 'rgba(249, 249, 249, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfMainMenuBackgroundColor', 'rgba(249, 249, 249, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfNavigationHeaderBackgroundColor', '@wcfContentBackgroundColor');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfNavigationFooterBackgroundColor', '@wcfContainerAccentBackgroundColor');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfMainMenuBackgroundColor', '@wcfContainerAccentBackgroundColor');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfMainMenuHoverBackgroundColor', '@wcfContainerAccentBackgroundColor');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfMainMenuColor', '@wcfColor');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfMainMenuActiveColor', '@wcfLinkColor');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfUserPanelHoverBackgroundColor', 'rgba(60, 60, 60, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfMainMenuHoverBackgroundColor', 'rgba(249, 249, 249, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfMainMenuColor', 'rgba(102, 102, 102, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfMainMenuActiveColor', 'rgba(63, 127, 191, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfMarkedBackgroundColor', 'rgba(255, 255, 200, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('useFluidLayout', '1');