From 10441899448329d36e5b54946ace53c0a28a6825 Mon Sep 17 00:00:00 2001 From: "rods%netscape.com" Date: Wed, 3 May 2000 13:32:15 +0000 Subject: [PATCH] cleaned up a lot of rules for buttons (html, submit, reset, input) also changed rule so "active" style only shows when "hover" --- layout/html/document/src/html.css | 128 ++++++------------------------ layout/style/html.css | 128 ++++++------------------------ 2 files changed, 50 insertions(+), 206 deletions(-) diff --git a/layout/html/document/src/html.css b/layout/html/document/src/html.css index 84367dbace3..050245a43be 100644 --- a/layout/html/document/src/html.css +++ b/layout/html/document/src/html.css @@ -451,7 +451,7 @@ iframe { } form { display: block; - margin: 0 0 1em 0; + margin: 0px 0px 1em 0px; } @@ -625,7 +625,7 @@ input[type="submit"]:hover { border : 2px solid black; } -input[type="submit"]:active { +input[type="submit"]:active:hover { border-style: inset; padding-left: 2px; @@ -634,26 +634,6 @@ input[type="submit"]:active { padding-bottom: 0px; } -input[type="submit"]:hover:-moz-outline { - border : 1px solid black; -} - -input[type="submit"]:active:-moz-outline { - border : 1px solid black; -} - -input[type="submit"][disabled] { - border: 1px solid; -} - -input[type="submit"][disabled]:hover { - border: 1px solid rgb(156, 154, 156); -} - -input[type="submit"][disabled]:active { - padding: 1px; -} - input[type="submit"]:-moz-focus-inner { padding-left : 2px; padding-right : 2px; @@ -672,16 +652,12 @@ input[type="submit"]:focus:-moz-focus-inner { border : 1px dotted black; } -input[type=submit] { - font-family: sans-serif; - font-size: small; -} - -input[type="submit"][disabled] { +input[type="submit"][disabled], input[type="submit"][disabled]:active { + border: 1px solid rgb(156, 154, 156); + padding: 1px; color: gray; } - /* reset */ input[type="reset"] { box-sizing: border-box; @@ -699,7 +675,7 @@ input[type="reset"]:hover { border : 2px solid black; } -input[type="reset"]:active { +input[type="reset"]:active:hover { border-style: inset; padding-left: 2px; @@ -708,26 +684,6 @@ input[type="reset"]:active { padding-bottom: 0px; } -input[type="reset"]:hover:-moz-outline { - border : 1px solid black; -} - -input[type="reset"]:active:-moz-outline { - border : 1px solid black; -} - -input[type="reset"][disabled] { - border: 1px solid; -} - -input[type="reset"][disabled]:hover { - border: 1px solid rgb(156, 154, 156); -} - -input[type="reset"][disabled]:active { - padding: 1px; -} - input[type="reset"]:-moz-focus-inner { padding-left : 2px; padding-right : 2px; @@ -745,12 +701,10 @@ input[type="reset"]:focus:-moz-focus-inner { margin: 0px; border : 1px dotted black; } -input[type=reset] { - font-family: sans-serif; - font-size: small; -} -input[type="reset"][disabled] { +input[type="reset"][disabled],input[type="reset"][disabled]:active { + border: 1px solid rgb(156, 154, 156); + padding: 1px; color: gray; } @@ -771,7 +725,7 @@ input[type="button"]:hover { border : 2px solid black; } -input[type="button"]:active { +input[type="button"]:active:hover { border-style: inset; padding-left: 2px; padding-right: 0px; @@ -779,31 +733,6 @@ input[type="button"]:active { padding-bottom: 0px; } -input[type="button"]:hover:-moz-outline { - border : 1px solid black; -} - -input[type="button"]:active:-moz-outline { - border : 1px solid black; -} - -input[type="button"][disabled] { - border: 1px solid; -} - -input[type="button"][disabled]:hover { - border: 1px solid rgb(156, 154, 156); -} - -input[type="button"][disabled]:active { - padding: 1px; -} - -input[type="button"][disabled] { - color: gray; -} - - input[type="button"]:-moz-focus-inner { /*XXX[PERF] Set the padding to match between focus changes to prevent reflow */ @@ -827,8 +756,15 @@ input[type="button"]:focus:-moz-focus-inner { border : 1px dotted black; } +input[type="button"][disabled], input[type="button"][disabled]:active { + border: 1px solid rgb(156, 154, 156); + padding: 1px; + color: gray; +} +/* HTML 4 Button */ button { + user-select: none !important; display: inline; vertical-align: bottom; cursor: default; @@ -845,7 +781,7 @@ button:hover { border : 2px solid black; } -button:active { +button:active:hover { border-style: inset; padding-left: 2px; @@ -854,27 +790,6 @@ button:active { padding-bottom: 0px; } -button:hover:-moz-outline { - border : 1px solid black; -} - -button:active:-moz-outline { - border : 1px solid black; -} - -button[disabled] { - border: 1px solid; - color: gray; -} - -button[disabled]:hover { - border: 1px solid rgb(156, 154, 156); -} - -button[disabled]:active { - padding: 1px; -} - button:-moz-focus-inner { padding-left : 2px; padding-right : 2px; @@ -893,6 +808,13 @@ button:focus:-moz-focus-inner { border : 1px dotted black; } +button[disabled], button[disabled]:active { + border: 1px solid rgb(156, 154, 156); + padding: 1px; + color: gray; +} + +/* text input */ input[type="text"] { box-sizing: border-box; font-family:-moz-fixed; diff --git a/layout/style/html.css b/layout/style/html.css index 84367dbace3..050245a43be 100644 --- a/layout/style/html.css +++ b/layout/style/html.css @@ -451,7 +451,7 @@ iframe { } form { display: block; - margin: 0 0 1em 0; + margin: 0px 0px 1em 0px; } @@ -625,7 +625,7 @@ input[type="submit"]:hover { border : 2px solid black; } -input[type="submit"]:active { +input[type="submit"]:active:hover { border-style: inset; padding-left: 2px; @@ -634,26 +634,6 @@ input[type="submit"]:active { padding-bottom: 0px; } -input[type="submit"]:hover:-moz-outline { - border : 1px solid black; -} - -input[type="submit"]:active:-moz-outline { - border : 1px solid black; -} - -input[type="submit"][disabled] { - border: 1px solid; -} - -input[type="submit"][disabled]:hover { - border: 1px solid rgb(156, 154, 156); -} - -input[type="submit"][disabled]:active { - padding: 1px; -} - input[type="submit"]:-moz-focus-inner { padding-left : 2px; padding-right : 2px; @@ -672,16 +652,12 @@ input[type="submit"]:focus:-moz-focus-inner { border : 1px dotted black; } -input[type=submit] { - font-family: sans-serif; - font-size: small; -} - -input[type="submit"][disabled] { +input[type="submit"][disabled], input[type="submit"][disabled]:active { + border: 1px solid rgb(156, 154, 156); + padding: 1px; color: gray; } - /* reset */ input[type="reset"] { box-sizing: border-box; @@ -699,7 +675,7 @@ input[type="reset"]:hover { border : 2px solid black; } -input[type="reset"]:active { +input[type="reset"]:active:hover { border-style: inset; padding-left: 2px; @@ -708,26 +684,6 @@ input[type="reset"]:active { padding-bottom: 0px; } -input[type="reset"]:hover:-moz-outline { - border : 1px solid black; -} - -input[type="reset"]:active:-moz-outline { - border : 1px solid black; -} - -input[type="reset"][disabled] { - border: 1px solid; -} - -input[type="reset"][disabled]:hover { - border: 1px solid rgb(156, 154, 156); -} - -input[type="reset"][disabled]:active { - padding: 1px; -} - input[type="reset"]:-moz-focus-inner { padding-left : 2px; padding-right : 2px; @@ -745,12 +701,10 @@ input[type="reset"]:focus:-moz-focus-inner { margin: 0px; border : 1px dotted black; } -input[type=reset] { - font-family: sans-serif; - font-size: small; -} -input[type="reset"][disabled] { +input[type="reset"][disabled],input[type="reset"][disabled]:active { + border: 1px solid rgb(156, 154, 156); + padding: 1px; color: gray; } @@ -771,7 +725,7 @@ input[type="button"]:hover { border : 2px solid black; } -input[type="button"]:active { +input[type="button"]:active:hover { border-style: inset; padding-left: 2px; padding-right: 0px; @@ -779,31 +733,6 @@ input[type="button"]:active { padding-bottom: 0px; } -input[type="button"]:hover:-moz-outline { - border : 1px solid black; -} - -input[type="button"]:active:-moz-outline { - border : 1px solid black; -} - -input[type="button"][disabled] { - border: 1px solid; -} - -input[type="button"][disabled]:hover { - border: 1px solid rgb(156, 154, 156); -} - -input[type="button"][disabled]:active { - padding: 1px; -} - -input[type="button"][disabled] { - color: gray; -} - - input[type="button"]:-moz-focus-inner { /*XXX[PERF] Set the padding to match between focus changes to prevent reflow */ @@ -827,8 +756,15 @@ input[type="button"]:focus:-moz-focus-inner { border : 1px dotted black; } +input[type="button"][disabled], input[type="button"][disabled]:active { + border: 1px solid rgb(156, 154, 156); + padding: 1px; + color: gray; +} +/* HTML 4 Button */ button { + user-select: none !important; display: inline; vertical-align: bottom; cursor: default; @@ -845,7 +781,7 @@ button:hover { border : 2px solid black; } -button:active { +button:active:hover { border-style: inset; padding-left: 2px; @@ -854,27 +790,6 @@ button:active { padding-bottom: 0px; } -button:hover:-moz-outline { - border : 1px solid black; -} - -button:active:-moz-outline { - border : 1px solid black; -} - -button[disabled] { - border: 1px solid; - color: gray; -} - -button[disabled]:hover { - border: 1px solid rgb(156, 154, 156); -} - -button[disabled]:active { - padding: 1px; -} - button:-moz-focus-inner { padding-left : 2px; padding-right : 2px; @@ -893,6 +808,13 @@ button:focus:-moz-focus-inner { border : 1px dotted black; } +button[disabled], button[disabled]:active { + border: 1px solid rgb(156, 154, 156); + padding: 1px; + color: gray; +} + +/* text input */ input[type="text"] { box-sizing: border-box; font-family:-moz-fixed;