Some basic style fixes

diff --git a/wcfsetup/install/files/style/button.less b/wcfsetup/install/files/style/button.less
index 9f9360b8d07ba3bc11c140af93f4bf16f6a44c1a..cf8df24006333e80e1c3bdcd049c84934ca27189 100644 (file)
--- a/wcfsetup/install/files/style/button.less
+++ b/wcfsetup/install/files/style/button.less
@@ -10,6 +10,8 @@ input[type='button'],
        display: inline-block;
        margin: 0 2px;
        padding: 5px 13px;
+       
+       .borderRadius(30px);
 }
 
 /* normal state */
@@ -128,12 +130,9 @@ button.small,
 .button.small {
        font-size: @wcfSmallFontSize;
        padding: 5px 11px;
-       
-       .borderRadius(3px);
 }
 
 /* button icons */
 .button > img {
        margin: -5px 1px -5px -5px;
-       vertical-align: middle;
 }
\ No newline at end of file

diff --git a/wcfsetup/install/files/style/dialog.less b/wcfsetup/install/files/style/dialog.less
index 4a68a16765c485f073afca7890c8d926b2a4332f..81969c1420aab7f7846a245d27eb739f9121767a 100644 (file)
--- a/wcfsetup/install/files/style/dialog.less
+++ b/wcfsetup/install/files/style/dialog.less
@@ -90,7 +90,7 @@
        width: 70px;
        z-index: 401;
 
-       .borderRadius();
+       .borderRadius(6px);
        .boxShadow(0, 1px, rgba(0, 0, 0, .5), 7px);
        .linearGradient(rgba(0, 0, 0, .5), rgba(0, 0, 0, 0), rgba(0, 0, 0, .7));
 

diff --git a/wcfsetup/install/files/style/dropdown.less b/wcfsetup/install/files/style/dropdown.less
index d14a005737257590a1339ea1f50ceda403f859af..7301f9df1f63ae96e2f3a45219a7ad5ab31f6c9e 100644 (file)
--- a/wcfsetup/install/files/style/dropdown.less
+++ b/wcfsetup/install/files/style/dropdown.less
@@ -19,15 +19,11 @@
                        display: table-cell;
                        margin: 0;
                        width: 99%;
-                       
-                       .borderRadius(0, @wcfContainerBorderRadius, @wcfContainerBorderRadius, 0);
                }
                
                textarea {
                        display: block;
                        margin-top: 0;
-                       
-                       .borderRadius(0, @wcfContainerBorderRadius, @wcfContainerBorderRadius, @wcfContainerBorderRadius);
                }
                
                .dropdownCaption {
@@ -39,8 +35,6 @@
                        vertical-align: middle;
                        width: 1%;
                        
-                       .borderRadius(@wcfContainerBorderRadius, 0, 0, @wcfContainerBorderRadius);
-                       
                        span {
                                margin-right: -1px;
                                padding-left: @wcfGapTiny;
@@ -62,8 +56,6 @@
                        padding-left: @wcfGapSmall;
                        padding-right: @wcfGapSmall;
                        
-                       .borderRadius(@wcfContainerBorderRadius, 0);
-                       
                        &~ .dropdownMenu {
                                top: 10%;
                        }
@@ -94,7 +86,6 @@
                position: absolute;
                z-index: 350;
                
-               .borderRadius();
                .boxShadow(2px, 2px, rgba(0, 0, 0, .2), 10px);
                
                &:after {

diff --git a/wcfsetup/install/files/style/form.less b/wcfsetup/install/files/style/form.less
index 95f882ad058119a63d806fd456019e3efa170e83..799dd1997489e85ecb3ab5df19b12b630f75fa9c 100644 (file)
--- a/wcfsetup/install/files/style/form.less
+++ b/wcfsetup/install/files/style/form.less
@@ -237,7 +237,8 @@ select[multiple]:focus {
        border-color: @wcfInputHoverBorderColor;
        outline: 0;
        
-       .boxShadowNative(~"0 0 5px" fade(@wcfInputHoverBorderColor, 50%) ~", inset 0 1px 5px rgba(0, 0, 0, .1)");
+       /*todo*/
+       //.boxShadowNative(~"0 0 5px" fade(@wcfInputHoverBorderColor, 50%) ~", inset 0 1px 5px rgba(0, 0, 0, .1)");
 }
 
 /* read only state */

diff --git a/wcfsetup/install/files/style/layout.less b/wcfsetup/install/files/style/layout.less
index fd51997e710812fedec4e4818132909fe5a076a9..aaa4ef0294958f96c3b2307bf1eb0c06f1fdf78e 100644 (file)
--- a/wcfsetup/install/files/style/layout.less
+++ b/wcfsetup/install/files/style/layout.less
@@ -23,7 +23,7 @@
 /* user panel */
 .userPanel {
        background-color: @wcfUserPanelBackgroundColor;
-       border-bottom: 1px solid rgba(0, 0, 0, .1);
+       border-bottom: 1px solid rgba(0, 0, 0, .1); /* todo */
        height: 40px;
        left: 0;
        position: fixed;
@@ -32,7 +32,6 @@
        z-index: 200;
 
        > div {
-               /* todo */
                > ul.userPanelItems {
                        float: left;
                        
@@ -53,12 +52,13 @@
                                        .transition(background-color, .2s);
                                        
                                        &:hover {
-                                               background-color: rgba(0, 0, 0, .4);
+                                               background-color: @wcfUserPanelHoverBackgroundColor;
                                                color: @wcfUserPanelHoverColor;
                                                text-decoration: none;
                                        }
                                        
                                        > .badge.badgeInverse {
+                                               /* todo */ 
                                                background-color: rgb(204, 0, 0);
                                                color: white;
                                                padding: 0 6px 1px;
@@ -79,22 +79,25 @@
        
                > .searchBar {
                        float: right;
-                       padding: 6px 0;
+                       padding: 7px 0;
+                       background-color: @wcfUserPanelHoverBackgroundColor;
                        
                        > form input[type="search"] {
-                               background-color: rgba(0, 0, 0, .5);
+                               background-color: transparent;
                                background-image: url("../icon/searchInverse.svg");
                                background-repeat: no-repeat;
                                background-position: 7px 5px;
-                               border: 1px solid rgba(0, 0, 0, .9);
-                               border-radius: 30px;
+                               border-width: 0;
                                color: @wcfUserPanelColor;
                                padding: 6px 12px 5px 26px;
                                width: 180px;
                                -webkit-appearance: textfield;
                                
-                               .boxShadowNative(~"inset 0px 1px 3px rgba(0, 0, 0, .9), 0px 1px 0px rgba(255, 255, 255, .1)");
-                               .textShadow(@wcfUserPanelBackgroundColor);
+                               .textShadow(@wcfUserPanelHoverBackgroundColor);
+                               
+                               &:focus {
+                                       outline: 0;
+                               }
                        }
                }
        }
@@ -125,7 +128,6 @@
 /* todo */
 .mainMenu {
        > ul {
-               background-color: @wcfMainMenuBackgroundColor;
                border-bottom: 1px solid @wcfContainerBorderColor;
                
                &:after {
@@ -135,11 +137,11 @@
                }
                
                > li {
+                       background-color: @wcfMainMenuBackgroundColor;
                        float: left;
                        font-size: @wcfSubHeadlineFontSize;
                        
                        margin-bottom: -1px;
-                       border-right: 1px solid @wcfContainerBorderColor;
                        
                        > a {
                                color: @wcfPageColor;
@@ -161,6 +163,10 @@
                                        color: #000;
                                }
                        }
+                       
+                       &:not(:last-child) {
+                               border-right: 1px solid @wcfContainerBorderColor;
+                       }
                }
        }
 }
@@ -215,7 +221,6 @@
 .navigationFooter {
        background-color: @wcfNavigationFooterBackgroundColor;
        border-top: 1px solid @wcfContainerBorderColor;
-       border-radius: 0 0 @wcfContainerBorderRadius @wcfContainerBorderRadius; 
 }
 
 /* ### footer ### */
@@ -342,8 +347,6 @@
 .container {
        background-color: @wcfContainerBackgroundColor;
        border: 1px solid @wcfContainerBorderColor;
-       
-       .borderRadius();
 }
 
 .containerPadding {
@@ -380,16 +383,6 @@
                        background-color: @wcfContainerAccentBackgroundColor;
                }
                
-               &:first-child {
-                       border-top-left-radius: @wcfContainerBorderRadius - 1;
-                       border-top-right-radius: @wcfContainerBorderRadius - 1;
-               }
-               
-               &:last-child {
-                       border-bottom-left-radius: @wcfContainerBorderRadius - 1;
-                       border-bottom-right-radius: @wcfContainerBorderRadius - 1;
-               }
-               
                &:hover {
                        background-color: @wcfContainerHoverBackgroundColor;
                }
@@ -540,7 +533,6 @@
 }
 
 .tabMenuContent {
-       border-top-left-radius: 0;
        display: block;
        margin-top: -1px;
        min-height: @wcfGapLarge;
@@ -555,7 +547,6 @@
        padding: @wcfGapSmall 0;
        text-align: center;
        
-       .borderRadius(@wcfContainerBorderRadius, 0);
        .linearGradient(rgba(0, 0, 0, 0), @wcfContainerBackgroundColor, @wcfContainerAccentBackgroundColor);
        
        ul{
@@ -617,8 +608,6 @@
 .tabularBox {
        background-color: @wcfTabularBoxBackgroundColor;
        border: 1px solid @wcfContainerBorderColor;
-       
-       .borderRadius();
 }
 
 .tabularBoxTitle > hgroup {
@@ -642,18 +631,6 @@
        }
 }
 
-.tabularBox:not(.tabularBoxTitle) > .table {
-        > thead > tr:first-child > th {
-               &:first-child {
-                       .borderRadius(@wcfContainerBorderRadius - 2, 0, 0, 0);
-               }
-               
-               &:last-child {
-                       .borderRadius(0, @wcfContainerBorderRadius - 2, 0, 0);
-               }
-       }
-}
-
 .table {
        border-spacing: 0;
        width: 100%;
@@ -821,18 +798,6 @@
        }
 }
 
-.tabularBox .table {
-       tbody tr:last-child td {
-               &:first-child {
-                       .borderRadius(0, 0, 0, @wcfContainerBorderRadius - 2);
-               }
-               
-               &:last-child {
-                       .borderRadius(0, 0, @wcfContainerBorderRadius - 2, 0);
-               }
-       }
-}
-
 /* ### definition lists ### */
 dl.statsDataList {
        > dt {

diff --git a/wcfsetup/install/files/style/sortable.less b/wcfsetup/install/files/style/sortable.less
index 88ce9b75114435f1c10dcd6da79a982c18500886..e26a90e43f088ae3b27927b5688abcb3dd2da696 100644 (file)
--- a/wcfsetup/install/files/style/sortable.less
+++ b/wcfsetup/install/files/style/sortable.less
@@ -5,8 +5,6 @@
        color: @wcfWarningColor;
        margin: @wcfGapTiny 0;
        padding: @wcfGapTiny;
-       
-       .borderRadius();
 }
 
 .sortablePlaceholder.sortableInvalidTarget {

diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 1829a7710c46e1899c58cbe400637d0a9a8a8c8d..9084ff845ceb40df7c27a648ab6478212aee29a4 100644 (file)
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -944,7 +944,7 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfLinkHov
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContainerBackgroundColor', '#fff');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContainerAccentBackgroundColor', '#f9f9f9');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContainerHoverBackgroundColor', '#f4f4f4');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContainerBorderColor', '#eee');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContainerBorderColor', '#ddd');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContainerBorderRadius', '6px');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfTabularBoxBackgroundColor', '#3f7fbf');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfTabularBoxColor', '#fff');
@@ -1009,3 +1009,4 @@ 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