1 files changed, 21 insertions, 45 deletions
diff --git a/chromium/ui/keyboard/resources/main.css b/chromium/ui/keyboard/resources/main.css
index e2c672adc7e..dfea91ea6b4 100644
--- a/chromium/ui/keyboard/resources/main.css
+++ b/chromium/ui/keyboard/resources/main.css
@@ -4,64 +4,40 @@
  found in the LICENSE file.
 */
 
-body {
-  -webkit-box-pack: center;
-  -webkit-user-select: none;
-  background-color: #0b0b0b;
-  display: -webkit-box;
-  margin: 0;
-  overflow: hidden;
-  padding: 0;
-}
-
-kb-keyboard {
-  -webkit-box-orient: vertical;
-  display: -webkit-box;
-  max-width: 1280px;
-  width: 1280px;
+@font-face {
+  font-family: roboto-bold;
+  src: url(roboto_bold.ttf);
 }
 
+/**
+ * TODO(rsadam@): Remove all these rules once we switch to native
+ * shadow dom.
+ */
 kb-keyboard.ctrl-active kb-modifier-key[char=Ctrl],
-kb-keyboard.alt-active kb-modifier-key[char=Alt] {
-  color: lightblue;
+kb-keyboard.alt-active kb-modifier-key[char=Alt],
+kb-keyboard.caps-locked kb-shift-key.dark {
+  -webkit-box-shadow: inset 0 0 3px 2px #aaaaaa;
+  background-color: #cccccc;
 }
 
 /**
 * Controls whether the shift key should be highlighted or not.
-* Only highlights if we are in the upper keyset, but not capslocked.
 */
-kb-keyboard:not(.caps-locked)[keyset=upper] kb-shift-key {
-  color: lightblue;
+kb-keyboard[keyset="upper"] kb-shift-key.dark /deep/
+    .shift-light {
+    background-color: #4285f4;
 }
 
-*.dark {
-  background-color: #2a2a2c;
-  border-top: 2px solid #3a3a3c;
+.space,
+.dark {
   font-size: 70%;
-  margin-left: 0.35em;
 }
 
-
-.caps-locked kb-shift-key,
-.active {
-  background-color: #848490 !important;
-  border-top: 2px solid #A9A9AF !important;
-  /* Do not use box shadow until performance improves
-   * http://code.google.com/p/chromium/issues/detail?id=99045
-  box-shadow: 0px 0px 15px #fff;
-  */
+.dark:not(.active),
+:not(kb-altkey-set) > :not(.dark).active {
+  background-color: #dddddd;
 }
 
-/**
- * The microphone key is handled separately from other images since the image
- * displayed changes depending on whether it's pressed or not.
- */
-.microphone {
-  background-image: url('images/microphone.svg');
-  background-position: 4%;
-  background-size: 25% !important;
+.space {
+  color: #bbbbbb;
 }
-
-.audio .microphone {
-  background-image: url('images/microphone-green.svg');
-}
-\ No newline at end of file