basic style update

diff --git a/wcfsetup/install/files/style/alert.less b/wcfsetup/install/files/style/alert.less
index 1e774610acc0d35ae49c15b194c7e10d2f0e1bfe..e2f04593138eae718151c330d3576ad7d5ac56ee 100644 (file)
--- a/wcfsetup/install/files/style/alert.less
+++ b/wcfsetup/install/files/style/alert.less
@@ -66,7 +66,7 @@
        color: @wcfWarningColor;
        
        .linearGradient(@wcfWarningBackgroundColor2, @wcfWarningBackgroundColor, @wcfWarningBackgroundColor2);
-       .textShadow(@wcfWarningBackgroundColor2);
+       .textShadow(@wcfWarningBackgroundColor);
        
        &:after {
                background-image: url('../icon/warningInverse.svg');

diff --git a/wcfsetup/install/files/style/button.less b/wcfsetup/install/files/style/button.less
index cf8df24006333e80e1c3bdcd049c84934ca27189..a7617664a97b1ab045c334eac8a8ffbbcbd59266 100644 (file)
--- a/wcfsetup/install/files/style/button.less
+++ b/wcfsetup/install/files/style/button.less
@@ -11,7 +11,7 @@ input[type='button'],
        margin: 0 2px;
        padding: 5px 13px;
        
-       .borderRadius(30px);
+       .borderRadius(15px);
 }
 
 /* normal state */
@@ -37,6 +37,7 @@ button:not([disabled]).buttonPrimary {
        background-color: @wcfButtonPrimaryBackgroundColor;
        border-color: @wcfButtonPrimaryBorderColor;
        color: @wcfButtonPrimaryColor;
+       font-weight: bold;
        
        .textShadow(@wcfButtonPrimaryBackgroundColor);
 }
@@ -55,6 +56,18 @@ button:not([disabled]):hover {
        .textShadow(@wcfButtonHoverBackgroundColor);
 }
 
+/* primary hover */
+.button.buttonPrimary:hover,
+input[type='submit']:not([disabled]):hover,
+input[type='button']:not([disabled]).buttonPrimary:hover,
+button:not([disabled]).buttonPrimary:hover {
+       background-color: @wcfButtonPrimaryHoverBackgroundColor;
+       border-color: @wcfButtonPrimaryHoverBorderColor;
+       color: @wcfButtonPrimaryHoverColor;
+       
+       .textShadow(@wcfButtonPrimaryHoverBackgroundColor);
+}
+
 /* active (pressed) */
 /* todo */
 .button:active,
@@ -66,7 +79,7 @@ button:not([disabled]):active,
        border-color: darken(@wcfButtonHoverBorderColor, 7%) @wcfButtonHoverBorderColor lighten(@wcfButtonHoverBorderColor, 7%);
        color: @wcfButtonHoverColor;
                
-       .boxShadowNative(~"inset 0 1px 3px rgba(0, 0, 0, .1), 0 0 10px" @wcfButtonHoverBorderColor);
+       .boxShadowNative(~"0 1px 3px rgba(0, 0, 0, .3), inset 0 0 10px rgba(239, 239, 239, 1)");
        .linearGradient(lighten(@wcfButtonHoverBackgroundColor, 5%), lighten(@wcfButtonHoverBackgroundColor, 10%), lighten(@wcfButtonHoverBackgroundColor, 5%) 2px, @wcfButtonHoverBackgroundColor, bottom);
        .textShadow(@wcfButtonHoverBackgroundColor);
 }

diff --git a/wcfsetup/install/files/style/form.less b/wcfsetup/install/files/style/form.less
index 3c82db3e458fb3fccdb1b366dc99aaa3f31272e7..2e123e6efe0136d6ca72bc6b0f1cafad5a9b255c 100644 (file)
--- a/wcfsetup/install/files/style/form.less
+++ b/wcfsetup/install/files/style/form.less
@@ -302,6 +302,7 @@ textarea[pattern],
 input[type='url'],
 input[type='email'] {
        &:valid {
+               background-color: rgba(232, 248, 218, 1);
                border-color: @wcfSuccessBackgroundColor;
        }
 }
@@ -334,6 +335,7 @@ textarea[pattern],
 input[type='url'],
 input[type='email'] {
        &:invalid {
+               background-color: rgba(247, 217, 214, 1);
                border-color: @wcfErrorBackgroundColor;
        }
 }

diff --git a/wcfsetup/install/files/style/global.less b/wcfsetup/install/files/style/global.less
index a897a5c8dd268a87878c1d7908fad5bf291fb8ee..809ff4f10e5be7675d493d1c09338daa7765d86b 100644 (file)
--- a/wcfsetup/install/files/style/global.less
+++ b/wcfsetup/install/files/style/global.less
@@ -146,18 +146,18 @@ a {
 
 /* ### badges ### */
 // sets default badge shadows depending on background color
-.badgeShadow(@backgroundColor) when (lightness(@backgroundColor) >= 50%) {
-       box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, .8);
+.badgeShadow(@backgroundColor) when (lightness(@backgroundColor) <= 50%) {
+       box-shadow: 0px 0px 1px 0px rgba(255, 255, 255, .8);
 }
-.badgeShadow(@backgroundColor) when (lightness(@backgroundColor) < 50%) {
-       box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, .8);
+.badgeShadow(@backgroundColor) when (lightness(@backgroundColor) > 50%) {
+       box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, .8);
 }
 
 /* default values */
 .badge {
-       background-color: @wcfColor;
+       background-color: @wcfContentBackgroundColor;
        border-radius: 13px;
-       color: @wcfContentBackgroundColor;
+       color: @wcfColor;
        display: inline-block;
        font-size: @wcfSmallFontSize;
        font-weight: normal !important;

diff --git a/wcfsetup/install/files/style/layout.less b/wcfsetup/install/files/style/layout.less
index 2fd8ad27353d751735f96ef930f714898e31bb7c..a6086e549586ff78a9974fdbc36ae5d5c0413d73 100644 (file)
--- a/wcfsetup/install/files/style/layout.less
+++ b/wcfsetup/install/files/style/layout.less
@@ -57,7 +57,7 @@
                                        }
                                        
                                        > .badge.badgeInverse {
-                                               background-color: rgb(204, 0, 0); /* todo */ 
+                                               background-color: rgb(63, 127, 191); /* todo */ /* same color as tabularBox */
                                                color: white;
                                                padding: 0 6px 1px;
                                                position: absolute;
@@ -136,18 +136,24 @@
                > li {
                        background-color: @wcfMainMenuBackgroundColor;
                        float: left;
-                       font-size: @wcfSubHeadlineFontSize;
+                       font-size: @wcfTitleFontSize;
                        margin-bottom: -1px;
+                       margin-top: 7px;
+                       
+                       &.active {
+                       font-size: @wcfSubHeadlineFontSize;
+                       margin-top: 0;
+                       }
                        
                        > a {
                                border-bottom: 1px solid @wcfContainerBorderColor;
                                color: @wcfMainMenuColor;
                                display: inline-block;
-                               padding: 11px 35px;
-                               font-weight: bold;
+                               padding: 9px 35px;
                                
                                &:hover {
                                        background-color: @wcfMainMenuHoverBackgroundColor;
+                                       color: @wcfMainMenuActiveColor;
                                        text-decoration: none;
                                }
                                
@@ -162,6 +168,8 @@
                                        border-bottom: 1px solid @wcfNavigationHeaderBackgroundColor;
                                        background-color: @wcfNavigationHeaderBackgroundColor;
                                        color: @wcfMainMenuActiveColor;
+                                       font-weight: bold;
+                                       padding: 14px 35px 8px;
                                }
                        }
                        

diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 5ea754b7f27d49c0b8f52317ede83169e20adcf1..d025164785d1997b2d870fa82caebfb92a1ccd9d 100644 (file)
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -956,17 +956,20 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfUserPan
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBackgroundColor', 'rgba(249, 249, 249, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBorderColor', 'rgba(221, 221, 221, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonColor', 'rgba(102, 102, 102, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryBackgroundColor', 'rgba(216, 231, 245, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryBorderColor', 'rgba(102, 153, 204, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryBackgroundColor', 'rgba(244, 244, 244, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryBorderColor', 'rgba(221, 221, 221, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryColor', 'rgba(102, 153, 204, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryHoverBackgroundColor', 'rgba(211, 232, 254, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryHoverBorderColor', 'rgba(136, 194, 255, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryHoverColor', 'rgba(102, 153, 204, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonHoverBackgroundColor', 'rgba(244, 244, 244, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonHoverBorderColor', 'rgba(221, 221, 221, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonHoverColor', 'rgba(63, 127, 191, 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)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputHoverBackgroundColor', 'rgba(255, 249, 244, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputHoverBorderColor', 'rgba(255, 170, 34, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputHoverBackgroundColor', 'rgba(239, 247, 255, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputHoverBorderColor', 'rgba(198, 222, 248, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfBaseFontSize', '13px');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfBaseFontFamily', '"Trebuchet MS", Arial, sans-serif');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfLayoutFluidGap', '30px');
@@ -975,7 +978,7 @@ 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(249, 249, 249, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfSidebarBackgroundColor', 'rgba(244, 244, 244, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfDimmedColor', 'rgba(102, 102, 102, 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)');
@@ -989,18 +992,18 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeadlin
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfSubHeadlineFontSize', '140%');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfTitleFontSize', '120%');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfSmallFontSize', '85%');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfWarningColor', 'rgba(255, 255, 255, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfWarningBackgroundColor', 'rgba(255, 184, 0, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfWarningBackgroundColor2', 'rgba(166, 120, 0, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfWarningColor', 'rgba(166, 120, 0, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfWarningBackgroundColor', 'rgba(255, 235, 183, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfWarningBackgroundColor2', 'rgba(225, 177, 46, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfErrorColor', 'rgba(255, 255, 255, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfErrorBackgroundColor', 'rgba(201, 81, 69, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfErrorBackgroundColor2', 'rgba(145, 61, 55, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfErrorBackgroundColor', 'rgba(252, 131, 118, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfErrorBackgroundColor2', 'rgba(201, 76, 67, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfSuccessColor', 'rgba(255, 255, 255, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfSuccessBackgroundColor', 'rgba(116, 164, 70, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfSuccessBackgroundColor2', 'rgba(77, 119, 48, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfSuccessBackgroundColor', 'rgba(155, 221, 95, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfSuccessBackgroundColor2', 'rgba(61, 149, 0, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInfoColor', 'rgba(255, 255, 255, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInfoBackgroundColor', 'rgba(70, 116, 164, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInfoBackgroundColor2', 'rgba(48, 77, 119, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInfoBackgroundColor', 'rgba(76, 161, 252, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInfoBackgroundColor2', 'rgba(14, 80, 170, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfTooltipBackgroundColor', 'rgba(0, 0, 0, .8)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfTooltipColor', 'rgba(255, 255, 255, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfGapTiny', '4px');
@@ -1011,8 +1014,8 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfNavigat
 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 ('wcfUserPanelHoverBackgroundColor', 'rgba(60, 60, 60, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfMainMenuHoverBackgroundColor', 'rgba(244, 244, 244, 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(0, 0, 0, 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');