From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 16 Apr 2016 13:26:37 +0000 (+0200)
Subject: Updated button styles
X-Git-Tag: 3.0.0_Beta_1~1879
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=95cc4d01d27942865c674e2d8614372969d64b9b;p=GitHub%2FWoltLab%2FWCF.git

Updated button styles
---

diff --git a/wcfsetup/install/files/style/ui/button.scss b/wcfsetup/install/files/style/ui/button.scss
index 099a314ea3..9915698be5 100644
--- a/wcfsetup/install/files/style/ui/button.scss
+++ b/wcfsetup/install/files/style/ui/button.scss
@@ -5,12 +5,12 @@ input[type="submit"],
 .button,
 a.button { // a.button is required to override link formatting, such as drop-down buttons
 	background-color: $wcfButtonBackground;
-	border: 1px solid $wcfButtonBorder;
+	border-width: 0;
 	color: $wcfButtonText;
 	cursor: pointer;
 	display: inline-block;
 	outline: none;
-	padding: 4px 12px;
+	padding: 6px 12px;
 	
 	// input elements do not inherit font family, size and line-height from body
 	font-family: $wcfFontFamily;
@@ -24,7 +24,6 @@ a.button { // a.button is required to override link formatting, such as drop-dow
 	&.active,
 	&:hover {
 		background-color: $wcfButtonBackgroundActive;
-		border-color: $wcfButtonBorderActive;
 		color: $wcfButtonTextActive;
 	}
 	
@@ -39,15 +38,13 @@ button.buttonPrimary,
 input[type="button"].buttonPrimary,
 input[type="submit"],
 .button.buttonPrimary,
-a.button.buttonPrimary { // a.button is required to override link formatting, such as drop-down buttons
+a.button.buttonPrimary { // a.button is required to override link formatting, such as dropdown buttons
 	background-color: $wcfButtonPrimaryBackground;
-	border-color: $wcfButtonPrimaryBorder;
 	color: $wcfButtonPrimaryText;
 	
 	&.active,
 	&:hover {
 		background-color: $wcfButtonPrimaryBackgroundActive;
-		border-color: $wcfButtonPrimaryBorderActive;
 		color: $wcfButtonPrimaryTextActive;
 	}
 }
@@ -62,7 +59,6 @@ a.button {
 	&:disabled,
 	&.disabled {
 		background-color: $wcfButtonDisabledBackground !important;
-		border-color: $wcfButtonDisabledBorder !important;
 		color: $wcfButtonDisabledText !important;
 		cursor: not-allowed !important;
 	}
@@ -77,7 +73,6 @@ a.button {
 	> .button,
 	> a.button {
 		background-color: $wcfButtonBackgroundActive;
-		border-color: $wcfButtonBorderActive;
 		color: $wcfButtonTextActive;
 	}
 	
@@ -87,7 +82,6 @@ a.button {
 	> .button.buttonPrimary,
 	> a.button.buttonPrimary {
 		background-color: $wcfButtonPrimaryBackgroundActive;
-		border-color: $wcfButtonPrimaryBorderActive;
 		color: $wcfButtonPrimaryTextActive;
 	}
 }
@@ -96,7 +90,7 @@ a.button {
 	@include inlineList;
 	
 	&.smallButtons .button {
-		padding: 4px 7px;
+		padding: 5px 7px;
 		
 		@include wcfFontSmall;
 	}
diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index bbf82f9bfe..4af20dcc65 100644
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -1944,21 +1944,21 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('overrideSc
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('pageLogo', '');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('useFluidLayout', '1');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('useGoogleFont', '1');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBackground', 'rgba(255, 255, 255, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBackgroundActive', 'rgba(52, 73, 94, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBorder', 'rgba(127, 140, 141, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBorderActive', 'rgba(52, 73, 94, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonDisabledBackground', 'rgba(255, 255, 255, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBackground', 'rgba(224, 224, 224, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBackgroundActive', 'rgba(213, 213, 213, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBorder', 'rgba(127, 140, 141, 1)'); -- no longer in use (ACP style editor needs to be updated first)
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBorderActive', 'rgba(52, 73, 94, 1)'); -- no longer in use (ACP style editor needs to be updated first)
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonDisabledBackground', 'rgba(223, 223, 223, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonDisabledBorder', 'rgba(173, 176, 179, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonDisabledText', 'rgba(173, 176, 179, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryBackground', 'rgba(255, 255, 255, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryBackgroundActive', 'rgba(79, 129, 189, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryBorder', 'rgba(79, 129, 189, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryBorderActive', 'rgba(79, 129, 189, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryText', 'rgba(79, 129, 189, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonDisabledText', 'rgba(165, 165, 165, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryBackground', 'rgba(33, 150, 243, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryBackgroundActive', 'rgba(26, 119, 201, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryBorder', 'rgba(79, 129, 189, 1)'); -- no longer in use (ACP style editor needs to be updated first)
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryBorderActive', 'rgba(79, 129, 189, 1)'); -- no longer in use (ACP style editor needs to be updated first)
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryText', 'rgba(255, 255, 255, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonPrimaryTextActive', 'rgba(255, 255, 255, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonText', 'rgba(127, 140, 141, 1)');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonTextActive', 'rgba(255, 255, 255, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonText', 'rgba(33, 33, 33, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonTextActive', 'rgba(33, 33, 33, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContentBackground', 'rgba(255, 255, 255, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContentBorder', 'rgba(79, 129, 189, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContentBorderInner', 'rgba(238, 238, 238, 1)');