diff options
| author | Byron Jones <glob@mozilla.com> | 2015-03-26 03:24:30 +0100 |
|---|---|---|
| committer | Byron Jones <glob@mozilla.com> | 2015-03-26 03:24:30 +0100 |
| commit | 48c23b11f2fc9d7f9a0666e58e77b8a03eb94dbb (patch) | |
| tree | 2f459f30a1aa767713e14e5216d4c2d0bc04d705 /extensions/BugModal/web | |
| parent | 0f2b7793d5636996e7ec61206029a293eebbf73e (diff) | |
| download | bugzilla-48c23b11f2fc9d7f9a0666e58e77b8a03eb94dbb.tar.gz bugzilla-48c23b11f2fc9d7f9a0666e58e77b8a03eb94dbb.tar.xz | |
Bug 1146910: Button styles are inconsistent
Diffstat (limited to 'extensions/BugModal/web')
| -rw-r--r-- | extensions/BugModal/web/bug_modal.css | 44 | ||||
| -rw-r--r-- | extensions/BugModal/web/bug_modal.js | 4 |
2 files changed, 17 insertions, 31 deletions
diff --git a/extensions/BugModal/web/bug_modal.css b/extensions/BugModal/web/bug_modal.css index 27a9e3f73..5779ebd34 100644 --- a/extensions/BugModal/web/bug_modal.css +++ b/extensions/BugModal/web/bug_modal.css @@ -38,38 +38,28 @@ margin-right: 5px; } -button.minor { - background-color: #888; - background-image: linear-gradient(#aaa, #888); +button.major { font-size: 11px; - padding: 0.25em 0.5em; -} - -button.minor:hover { - -webkit-box-shadow: 0 1px 0 0 rgba(0,0,0,0.2), inset 0 -1px 0 0 rgba(0,0,0,0.3), inset 0 12px 24px 2px #bbb; - -moz-box-shadow: 0 1px 0 0 rgba(0,0,0,0.2), inset 0 -1px 0 0 rgba(0,0,0,0.3), inset 0 12px 24px 2px #bbb; - box-shadow: 0 1px 0 0 rgba(0,0,0,0.2), inset 0 -1px 0 0 rgba(0,0,0,0.3), inset 0 12px 24px 2px #bbb; + padding: 4px 8px; } -button.in-page { - background-color: #fff; - background-image: linear-gradient(#fff, #fff); +button.minor { + background-color: #eee; + background-image: linear-gradient(#fcfcfc, #eee); color: #000; - border: 1px solid #ccc; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; font-size: 11px; - padding: 0.25em 0.5em; + font-weight: 500; + padding: 4px 8px; + text-shadow: none; + -web-kit-box-shadow: 0 1px 0 0 rgba(0,0,0,0.1), inset 0 -1px 0 0 rgba(0,0,0,0.1); + -moz-box-shadow: 0 1px 0 0 rgba(0,0,0,0.1), inset 0 -1px 0 0 rgba(0,0,0,0.1); + box-shadow: 0 1px 0 0 rgba(0,0,0,0.1), inset 0 -1px 0 0 rgba(0,0,0,0.1); } -button.in-page:hover { - -webkit-box-shadow: inset 0 12px 24px 2px #eee; - -moz-box-shadow: inset 0 12px 24px 2px #eee; - box-shadow: inset 0 12px 24px 2px #eee; - -moz-transition: all linear 100ms; - -webkit-transition: all linear 100ms; - transition: all linear 100ms; +button.minor:hover { + -webkit-box-shadow: 0 1px 0 0 rgba(0,0,0,0.2), inset 0 -1px 0 0 rgba(0,0,0,0.3), inset 0 12px 24px 2px #ddd; + -moz-box-shadow: 0 1px 0 0 rgba(0,0,0,0.2), inset 0 -1px 0 0 rgba(0,0,0,0.3), inset 0 12px 24px 2px #ddd; + box-shadow: 0 1px 0 0 rgba(0,0,0,0.1), inset 0 -1px 0 0 rgba(0,0,0,0.1), inset 0 12px 24px 2px #ddd; } select[multiple], .text_input, .yui-ac-input, input { @@ -293,10 +283,6 @@ input[type="number"] { /* actions */ -#copy-summary { - margin-left: 20px; -} - #top-actions { margin-top: 5px; padding-bottom: 20px; diff --git a/extensions/BugModal/web/bug_modal.js b/extensions/BugModal/web/bug_modal.js index 67d576728..2411f4c15 100644 --- a/extensions/BugModal/web/bug_modal.js +++ b/extensions/BugModal/web/bug_modal.js @@ -330,7 +330,7 @@ $(function() { else { cc_change = { add: [ BUGZILLA.user.login ] }; $('#cc-btn') - .text('Stop following') + .text('Stop Following') .data('is-cced', '1') .prop('disabled', true); } @@ -347,7 +347,7 @@ $(function() { return; if (data.bugs[0].changes.cc.added == BUGZILLA.user.login) { $('#cc-btn') - .text('Stop following') + .text('Stop Following') .data('is-cced', '1'); } else if (data.bugs[0].changes.cc.removed == BUGZILLA.user.login) { |