Some minor style/visuals improvement

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index c59cc362855a59d22072bf374350ec797a8c02fe..3c41dab5b3a4d3c3e675639effea0f8f2d12bcb0 100644 (file)
--- a/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@ -665,18 +665,14 @@ WCF.ACP.Package.Installation = Class.extend({
         * @param       function        callback
         */
        _purgeTemplateContent: function(callback) {
-               if ($('#packageInstallationInnerContent').children().length > 1) {
-                       $('#packageInstallationInnerContentContainer').wcfBlindOut('vertical', $.proxy(function() {
-                               $('#packageInstallationInnerContent').empty();
-                               this._shouldRender = true;
-                               
-                               // execute callback
-                               callback();
-                       }, this));
-               }
-               else {
-                       callback();
+               if ($('#packageInstallationInnerContent').children().length) {
+                       $('#packageInstallationInnerContentContainer').hide();
+                       $('#packageInstallationInnerContent').empty();
+                       
+                       this._shouldRender = true;
                }
+               
+               callback();
        },
        
        /**

diff --git a/wcfsetup/install/files/style/layout/content.scss b/wcfsetup/install/files/style/layout/content.scss
index 5a92a2236f0ed3e2cdc35f456f1fb0c735c32282..41a2327b39cae9f94bbcf17a744292d1c099adec 100644 (file)
--- a/wcfsetup/install/files/style/layout/content.scss
+++ b/wcfsetup/install/files/style/layout/content.scss
@@ -12,8 +12,11 @@
        section > h1 {
                @extend .wcfFontHeadline;
                
+               border-left: 5px solid $wcfContentBorderInner;
                color: $wcfContentHeadlineText;
+               font-weight: 400;
                margin-bottom: 20px;
+               padding-left: 10px;
                
                a {
                        color: $wcfContentHeadlineLink;

diff --git a/wcfsetup/install/files/style/layout/form.scss b/wcfsetup/install/files/style/layout/form.scss
index 007d6f09449acb5f4a7327ab04bc4edb0720188a..01a6e21ed5c17f975dcccf8d555c2f41647cec83 100644 (file)
--- a/wcfsetup/install/files/style/layout/form.scss
+++ b/wcfsetup/install/files/style/layout/form.scss
@@ -66,29 +66,6 @@ textarea {
        }
 }
 
-input {
-       box-sizing: border-box;
-       
-       &.tiny {
-               width: 80px;
-       }
-       
-       &.short {
-               min-width: 80px;
-               width: 10%;
-       }
-       
-       &.medium {
-               min-width: 150px;
-               width: 30%;
-       }
-       
-       &.long {
-               min-width: 150px;
-               width: 100%;
-       }
-}
-
 dl {
        &:not(.plain) {
                display: block;
@@ -323,7 +300,7 @@ dl {
        }
 }
 
-.inputAddon:not(.inputAddonTextarea) {
+.inputAddon {
        display: flex;
        
        &:not(:last-child) {
@@ -346,15 +323,58 @@ dl {
                        border-radius: 0;
                        margin-left: 5px;
                }
+               
+               &:not(.button) {
+                       background-color: $wcfButtonBackground;
+                       border: 1px solid $wcfButtonBorder;
+                       color: $wcfButtonText;
+                       cursor: default;
+                       margin-left: 5px;
+                       padding: 3px 5px;
+               }
        }
        
-       > input,
-       > textarea {
+       input {
                flex: 1 auto;
        }
 }
 
-.inputAddonTextarea > .inputPrefix.button {
-       border-bottom-width: 0;
-       border-radius: 0;
+.inputAddonTextarea {
+       flex-wrap: wrap;
+       
+       > .inputPrefix.button {
+               border-bottom-width: 0;
+               border-radius: 0;
+       }
+       
+       > textarea {
+               flex: 0 0 100%;
+       }
+}
+
+.inputAddon input,
+input {
+       box-sizing: border-box;
+       
+       &.tiny {
+               flex-grow: 0;
+               width: 80px;
+       }
+       
+       &.short {
+               flex-grow: 0;
+               min-width: 80px;
+               width: 10%;
+       }
+       
+       &.medium {
+               flex-grow: 0;
+               min-width: 150px;
+               width: 30%;
+       }
+       
+       &.long {
+               min-width: 150px;
+               width: 100%;
+       }
 }

diff --git a/wcfsetup/install/files/style/ui/redactor.scss b/wcfsetup/install/files/style/ui/redactor.scss
index 9edcf1577498c2070d5ec78596826f1c8ebec8b2..c4bf917699171e7ad3bdad6f936e71b3c09278bc 100644 (file)
--- a/wcfsetup/install/files/style/ui/redactor.scss
+++ b/wcfsetup/install/files/style/ui/redactor.scss
@@ -47,8 +47,7 @@
 .re-gallery:before { content: "\e61f"; }
 
 .redactor-box {
-       // TODO: border: 1px solid $wcfContentBorder;
-       border-radius: 3px 3px 0 0;
+       border: 1px solid $wcfContentBorder;
        font-size: 0;
        line-height: $wcfBaseLineHeight;
        position: relative;
@@ -71,7 +70,7 @@
        
        > .redactorAutosaveNotice {
                background-color: $wcfContentBackground;
-               // TODO: border: 1px solid $wcfContentBorder;
+               border: 1px solid $wcfContentBorderInner;
                border-width: 1px 0 0 1px;
                bottom: 0;
                font-size: 1rem;
@@ -225,7 +224,7 @@
 }
 
 .redactor-toolbar {
-       // TODO: background: repeating-linear-gradient(0deg, $wcfContentBorder 0px, $wcfContentBorder 3%, $wcfContentBackground 3%, $wcfContentBackground 100%);
+       background: repeating-linear-gradient(0deg, $wcfContentBorderInner 0px, $wcfContentBorderInner 3%, $wcfContentBackground 3%, $wcfContentBackground 100%);
        background-size: 100% 31px;
        
        > li {
@@ -235,7 +234,7 @@
                
                &:last-of-type,
                &.separator {
-                       // TODO: border-right: 1px solid $wcfContentBorder;
+                       border-right: 1px solid $wcfContentBorderInner;
                }
                
                > a {

diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 487edf1556ea89a4344f781055d5b0e69ec1d746..63c666cae0789f265f346e8b786db7f316bac8fd 100644 (file)
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -1871,11 +1871,11 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderS
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderSearchBoxBackgroundActive', 'rgba(255, 255, 255, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderSearchBoxText', 'rgba(255, 255, 255, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfHeaderSearchBoxTextActive', 'rgba(52, 73, 94, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputBackground', 'rgba(240, 248, 255, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputBackground', 'rgba(245, 248, 255, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputBackgroundActive', 'rgba(240, 248, 255, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputBorder', 'rgba(52, 152, 219, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputBorderActive', 'rgba(41, 128, 185, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputDisabledBackground', 'rgba(245, 250, 250, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputDisabledBackground', 'rgba(248, 248, 248, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputDisabledBorder', 'rgba(204, 204, 204, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputDisabledText', 'rgba(153, 153, 153, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfInputText', 'rgba(54, 54, 54, 1)');