Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / resources / options / language_options.css

diff --git a/src/chrome/browser/resources/options/language_options.css b/src/chrome/browser/resources/options/language_options.css
index 7bb4e95..2a802a8 100644 (file)
--- a/src/chrome/browser/resources/options/language_options.css
+++ b/src/chrome/browser/resources/options/language_options.css
@@ -29,7 +29,8 @@
   padding: 0 12px 4px;
 }
 
-.language-options-contents > span:not(.input-method-label) {
+.language-options-contents >
+    span:not(.input-method-label):not(.controlled-setting-indicator) {
   display: inline-block;
   margin: 1px;
   padding: 0.42em 10px;
@@ -37,7 +38,6 @@
 
 .language-options-header,
 .language-options-footer {
-  line-height: 1.2em;
   margin: 10px 0;
 }
 
@@ -66,6 +66,7 @@
   -webkit-box-flex: 1;
   /* To share the center line with the left pane. */
   -webkit-margin-start: -1px;
+  overflow-y: auto;
 }
 
 #language-options-details h3:not(:first-of-type) {