diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-includes/css/buttons.css --- a/wp/wp-includes/css/buttons.css Tue Oct 22 16:11:46 2019 +0200 +++ b/wp/wp-includes/css/buttons.css Tue Dec 15 13:49:49 2020 +0100 @@ -46,10 +46,10 @@ display: inline-block; text-decoration: none; font-size: 13px; - line-height: 26px; - height: 28px; + line-height: 2.15384615; /* 28px */ + min-height: 30px; margin: 0; - padding: 0 10px 1px; + padding: 0 10px; cursor: pointer; border-width: 1px; border-style: solid; @@ -71,35 +71,27 @@ .wp-core-ui .button.button-large, .wp-core-ui .button-group.button-large .button { - height: 30px; - line-height: 28px; - padding: 0 12px 2px; + min-height: 32px; + line-height: 2.30769231; /* 30px */ + padding: 0 12px; } .wp-core-ui .button.button-small, .wp-core-ui .button-group.button-small .button { - height: 24px; - line-height: 22px; - padding: 0 8px 1px; + min-height: 26px; + line-height: 2.18181818; /* 24px */ + padding: 0 8px; font-size: 11px; } .wp-core-ui .button.button-hero, .wp-core-ui .button-group.button-hero .button { font-size: 14px; - height: 46px; - line-height: 44px; + min-height: 46px; + line-height: 3.14285714; padding: 0 36px; } -/* Only visible in Windows High Contrast mode */ -.wp-core-ui .button:active, -.wp-core-ui .button:focus { - outline: 2px solid transparent; - /* Reset inherited offset from Gutenberg */ - outline-offset: 0; -} - .wp-core-ui .button.hidden { display: none; } @@ -123,10 +115,9 @@ .wp-core-ui .button, .wp-core-ui .button-secondary { - color: #555; - border-color: #cccccc; - background: #f7f7f7; - box-shadow: 0 1px 0 #cccccc; + color: #0071a1; + border-color: #0071a1; + background: #f3f5f6; vertical-align: top; } @@ -136,37 +127,47 @@ .wp-core-ui .button.hover, .wp-core-ui .button:hover, -.wp-core-ui .button-secondary:hover, -.wp-core-ui .button.focus, -.wp-core-ui .button:focus, -.wp-core-ui .button-secondary:focus { - background: #fafafa; - border-color: #999; - color: #23282d; +.wp-core-ui .button-secondary:hover{ + background: #f1f1f1; + border-color: #016087; + color: #016087; } .wp-core-ui .button.focus, .wp-core-ui .button:focus, .wp-core-ui .button-secondary:focus { - border-color: #5b9dd9; - box-shadow: 0 0 3px rgba(0, 115, 170, 0.8); + background: #f3f5f6; + border-color: #007cba; + color: #016087; + box-shadow: 0 0 0 1px #007cba; + /* Only visible in Windows High Contrast mode */ + outline: 2px solid transparent; + /* Reset inherited offset from Gutenberg */ + outline-offset: 0; } -.wp-core-ui .button.active, -.wp-core-ui .button.active:hover, +/* :active state */ .wp-core-ui .button:active, .wp-core-ui .button-secondary:active { - background: #eee; - border-color: #999; - box-shadow: inset 0 2px 5px -3px rgba(0, 0, 0, 0.5); - transform: translateY(1px); + background: #f3f5f6; + border-color: #7e8993; + box-shadow: none; +} + +/* pressed state e.g. a selected setting */ +.wp-core-ui .button.active, +.wp-core-ui .button.active:hover { + background-color: #e2e4e7; + color: #00669b; + border-color: #016087; + box-shadow: inset 0 2px 5px -3px #016087; } .wp-core-ui .button.active:focus { - border-color: #5b9dd9; + border-color: #007cba; box-shadow: - inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), - 0 0 3px rgba(0, 115, 170, 0.8); + inset 0 2px 5px -3px #016087, + 0 0 0 1px #007cba; } .wp-core-ui .button[disabled], @@ -180,7 +181,6 @@ border-color: #ddd !important; background: #f7f7f7 !important; box-shadow: none !important; - text-shadow: 0 1px 0 #fff !important; cursor: default; transform: none !important; } @@ -205,7 +205,7 @@ .wp-core-ui .button-link:hover, .wp-core-ui .button-link:active { - color: #00a0d2; + color: #006799; } .wp-core-ui .button-link:focus { @@ -232,80 +232,57 @@ background: transparent !important; } -.ie8 .wp-core-ui .button-link:focus { - outline: #5b9dd9 solid 1px; -} /* ---------------------------------------------------------------------------- 3.0 - Primary Button Style ---------------------------------------------------------------------------- */ .wp-core-ui .button-primary { - background: #0085ba; - border-color: #0073aa #006799 #006799; - box-shadow: 0 1px 0 #006799; + background: #007cba; + border-color: #007cba; color: #fff; text-decoration: none; - text-shadow: 0 -1px 1px #006799, - 1px 0 1px #006799, - 0 1px 1px #006799, - -1px 0 1px #006799; + text-shadow: none; } .wp-core-ui .button-primary.hover, .wp-core-ui .button-primary:hover, .wp-core-ui .button-primary.focus, .wp-core-ui .button-primary:focus { - background: #008ec2; - border-color: #006799; + background: #0071a1; + border-color: #0071a1; color: #fff; } .wp-core-ui .button-primary.focus, .wp-core-ui .button-primary:focus { - box-shadow: 0 1px 0 #0073aa, - 0 0 2px 1px #33b3db; + box-shadow: + 0 0 0 1px #fff, + 0 0 0 3px #007cba; } .wp-core-ui .button-primary.active, .wp-core-ui .button-primary.active:hover, .wp-core-ui .button-primary.active:focus, .wp-core-ui .button-primary:active { - background: #0073aa; - border-color: #006799; - box-shadow: inset 0 2px 0 #006799; + background: #00669b; + border-color: #00669b; + box-shadow: none; + color: #fff; } .wp-core-ui .button-primary[disabled], .wp-core-ui .button-primary:disabled, .wp-core-ui .button-primary-disabled, .wp-core-ui .button-primary.disabled { - color: #66c6e4 !important; - background: #008ec2 !important; - border-color: #007cb2 !important; + color: #a0a5aa !important; + background: #f7f7f7 !important; + border-color: #ddd !important; box-shadow: none !important; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.1) !important; + text-shadow: none !important; cursor: default; } -.wp-core-ui .button.button-primary.button-hero { - box-shadow: 0 2px 0 #006799; -} - -.wp-core-ui .button.button-primary.button-hero:focus { - box-shadow: - 0 2px 0 #006799, - 0 1px 0 #0073aa, - 0 0 2px 1px #33b3db; -} - -.wp-core-ui .button.button-primary.button-hero.active, -.wp-core-ui .button.button-primary.button-hero.active:hover, -.wp-core-ui .button.button-primary.button-hero.active:focus, -.wp-core-ui .button.button-primary.button-hero:active { - box-shadow: inset 0 3px 0 #006799; -} - /* ---------------------------------------------------------------------------- 4.0 - Button Groups ---------------------------------------------------------------------------- */ @@ -322,15 +299,6 @@ display: inline-block; border-radius: 0; margin-right: -1px; - z-index: 10; -} - -.wp-core-ui .button-group > .button-primary { - z-index: 100; -} - -.wp-core-ui .button-group > .button:hover { - z-index: 20; } .wp-core-ui .button-group > .button:first-child { @@ -341,11 +309,30 @@ border-radius: 0 3px 3px 0; } +.wp-core-ui .button-group > .button-primary + .button { + border-left: 0; +} + .wp-core-ui .button-group > .button:focus { position: relative; z-index: 1; } +/* pressed state e.g. a selected setting */ +.wp-core-ui .button-group > .button.active { + background-color: #e2e4e7; + color: #00669b; + border-color: #016087; + box-shadow: inset 0 2px 5px -3px #016087; +} + +.wp-core-ui .button-group > .button.active:focus { + border-color: #007cba; + box-shadow: + inset 0 2px 5px -3px #016087, + 0 0 0 1px #007cba; +} + /* ---------------------------------------------------------------------------- 5.0 - Responsive Button Styles ---------------------------------------------------------------------------- */ @@ -358,17 +345,22 @@ input#publish, input#save-post, a.preview { - padding: 6px 14px; - line-height: normal; + padding: 0 14px; + line-height: 2.71428571; /* 38px */ font-size: 14px; vertical-align: middle; - height: auto; + min-height: 40px; margin-bottom: 4px; } + /* Copy attachment URL button in the legacy edit media page. */ + .wp-core-ui .copy-to-clipboard-container .copy-attachment-url { + margin-bottom: 0; + } + #media-upload.wp-core-ui .button { padding: 0 10px 1px; - height: 24px; + min-height: 24px; line-height: 22px; font-size: 13px; } @@ -386,10 +378,9 @@ /* Reset responsive styles in Press This, Customizer */ .wp-core-ui.wp-customizer .button { - padding: 0 10px 1px; font-size: 13px; - line-height: 26px; - height: 28px; + line-height: 2.15384615; /* 28px */ + min-height: 30px; margin: 0; vertical-align: inherit; } @@ -402,8 +393,8 @@ /* Reset responsive styles on Log in button on iframed login form */ .interim-login .button.button-large { - height: 30px; - line-height: 28px; + min-height: 30px; + line-height: 2; padding: 0 12px 2px; }