Chromium Code Reviews| Index: ui/keyboard/resources/main.css |
| diff --git a/ui/keyboard/resources/main.css b/ui/keyboard/resources/main.css |
| index 0e96e41dd0c92e14a2205e892306b937622b7ff3..54d88d08262613ee4cf43fd422d7d0f0d913fd15 100644 |
| --- a/ui/keyboard/resources/main.css |
| +++ b/ui/keyboard/resources/main.css |
| @@ -14,111 +14,35 @@ body { |
| padding: 0; |
| } |
| -div.main { |
| +kb-keyboard { |
| -webkit-box-orient: vertical; |
| display: -webkit-box; |
| max-width: 1280px; |
| + width: 1280px; |
| } |
| -div.keyboard { |
| - -webkit-box-flex: 1; |
| - display: -webkit-box; |
| - margin: 0 auto; |
| - text-align: center; |
| -} |
| - |
| -div.rows { |
| - -webkit-box-flex: 1; |
| - -webkit-box-orient: vertical; |
| - display: -webkit-box; |
| - margin-bottom: 5px; |
| - text-align: center; |
| -} |
| - |
| -div.row { |
| - -webkit-box-flex: 1; |
| - display: -webkit-box; |
| - margin-right: 5px; |
| - margin-top: 5px; |
| -} |
| - |
| -div.row > div { |
| - -webkit-box-flex: 1; |
| - display: -webkit-box; |
| -} |
| - |
| -.panel { |
| - border: 0; |
| - clear: both; |
| - margin-left: 5px; |
| - text-align: left; |
| -} |
| - |
| -.backspace > div { |
| - background-image: url('images/del.svg'); |
| -} |
| - |
| -.tab > div { |
| - background-image: url('images/tab.svg'); |
| -} |
| - |
| -.return > div { |
| - background-image: url('images/ret.svg'); |
| -} |
| - |
| -.mic > div { |
| - background-image: url('images/mic.svg'); |
| -} |
| - |
| -.mic.start > div { |
| - background-image: url('images/mic-green.svg'); |
| -} |
| - |
| -.button { |
| - background: -webkit-linear-gradient(rgb(90, 97, 111), rgb(80, 86, 98)); |
| -} |
| -.button:active { |
| - background: -webkit-linear-gradient(rgb(80, 86, 98), rgb(90, 97, 111)); |
| -} |
| - |
| -.auxiliary:active { |
| - background: -webkit-linear-gradient(rgb(90, 97, 111), rgb(80, 86, 98)); |
| -} |
| - |
| -.key { |
| - -webkit-box-flex: 1; |
| +kb-key { |
| background-color: #444444; |
| border-top: 1px solid #666666; |
| border-radius: 3px; |
| - /* Reserving equivalent space to .key:active so |
| - keys don't shift when selected. */ |
| - /* Do not use box shadow until performance improves |
| - * http://code.google.com/p/chromium/issues/detail?id=99045 |
| - box-shadow: 0px 1px 1px #000; |
| - */ |
| color: #ffffff; |
| - display: -webkit-box; |
| font-family: sans-serif; |
| font-weight: 100; |
| margin-left: 5px; |
| - position: relative; |
| } |
| -.key.dark { |
| +kb-key.dark { |
| background-color: #333333; |
| } |
| -.key > div { |
| - bottom: 0; |
| - left: 0; |
| - margin: auto; |
| - position: absolute; |
| - right: 0; |
| - top: 0; |
| -} |
| - |
| -.key:active { |
| - background-color: #acacac; |
| +#upper .left-shift, |
| +#upper .right-shift, |
| +#symbol .symbol, |
| +#more .symbol, |
| +#more .left-more, |
| +#more .right-more, |
| +.active { |
| + background-color: #acacac !important; |
| border-top: 1px solid rgba(125,125,125,0.5); |
| /* Do not use box shadow until performance improves |
| * http://code.google.com/p/chromium/issues/detail?id=99045 |
| @@ -126,71 +50,72 @@ div.row > div { |
| */ |
| } |
| -div.moddown.dark { |
| - background-color: #acacac; |
| - border-color: rgb(48, 74, 155); |
| +.at, |
| +.com, |
| +.comma, |
| +.hide, |
| +.mic, |
| +.period, |
| +.tab { |
| + -webkit-box-flex: 1.3 !important; |
| } |
| -.image-key { |
| - background-position: center center; |
| - background-repeat: no-repeat; |
| - background-size: contain; |
| - height: 100%; |
| - width: 100%; |
| +.symbol, |
| +.return { |
| + -webkit-box-flex: 1.5 !important; |
| } |
| -.text-key { |
| - height: 1.2em; |
| +.backspace { |
| + -webkit-box-flex: 1.7 !important; |
| } |
| +.left-shift, |
| +.left-more { |
| + -webkit-box-flex: 1.4 !important; |
| +} |
| -.shift > div.image-key { |
| - background-image: url('images/shift.svg'); |
| +.right-shift, |
| +.right-more { |
| + -webkit-box-flex: 1.6 !important; |
| } |
| -.moddown.shift > div.image-key { |
| - background-image: url('images/shift-down.svg'); |
| +.space { |
| + -webkit-box-flex: 4.8 !important; |
| } |
| -.hide > div { |
| - background-image: url('images/keyboard.svg'); |
| +.bar { |
| + -webkit-box-flex: 0.6 !important; |
| +} |
| + |
| +.backspace { |
| + background-image: url('images/del.svg'); |
|
bryeung
2013/05/23 21:39:28
if the SVGs aren't working, let's just remove them
bshe
2013/05/24 14:43:50
Done.
|
| } |
| -.at, |
| -.com, |
| -.comma, |
| -.hide, |
| -.mic, |
| -.period, |
| .tab { |
| - -webkit-box-flex: 1.3; |
| + background-image: url('images/tab.svg'); |
| } |
| -.symbol, |
| .return { |
| - -webkit-box-flex: 1.5; |
| + background-image: url('images/ret.svg'); |
| } |
| -.backspace { |
| - -webkit-box-flex: 1.7; |
| +.mic { |
| + background-image: url('images/mic.svg'); |
| } |
| -.left-shift { |
| - -webkit-box-flex: 1.4; |
| +.audio .mic { |
| + background-image: url('images/mic-green.svg'); |
| } |
| +.left-shift, |
| .right-shift { |
| - -webkit-box-flex: 1.6; |
| -} |
| - |
| -.space { |
| - -webkit-box-flex: 4.8; |
| + background-image: url('images/shift.svg'); |
| } |
| -.bar { |
| - -webkit-box-flex: 0.6; |
| +.moddown.shift { |
| + background-image: url('images/shift-down.svg'); |
| } |
| -.nodisplay { |
| - display: none; |
| +.hide { |
| + background-image: url('images/keyboard.svg'); |
| } |