diff options
10 files changed, 61 insertions, 78 deletions
diff --git a/chrome/browser/resources/bookmark_manager/css/bmm.css b/chrome/browser/resources/bookmark_manager/css/bmm.css index 890c3e13..e7f1050 100644 --- a/chrome/browser/resources/bookmark_manager/css/bmm.css +++ b/chrome/browser/resources/bookmark_manager/css/bmm.css @@ -132,20 +132,21 @@ list [editing] .url input { } .tree-item [editing] input { - margin: 0; - padding: 0; -webkit-margin-start: -3px; -webkit-padding-end: 7px; -} - -html[os=mac] .tree-label [editing] input { + margin: 0; + padding: 0; +<if expr="is_macosx"> padding-top: 1px; +</if> } -html:not([os=mac]) list .label input, -html:not([os=mac]) list .url input { +<if expr="is_macosx"> +list .label input, +list .url input { outline: none; } +</if> list > [editing] { overflow: visible; @@ -168,18 +169,14 @@ html[dir=rtl] list > .folder > .label { background-image: url("../../../../../ui/resources/folder_closed_rtl.png"); } -html[os=mac] list > .folder > .label { - background-image: url("../../../../app/theme/bookmark_bar_folder_mac.png"); -} - -html[os=mac] .tree-label, -html[os=mac] .tree-row[may-have-children] > .tree-label { - background-image: url("../../../../app/theme/bookmark_bar_folder_mac.png"); -} - -html[os=mac] .tree-item[expanded] > .tree-row > .tree-label { +<if expr="is_macosx"> +list > .folder > .label, +.tree-label, +.tree-row[may-have-children] > .tree-label, +.tree-item[expanded] > .tree-row > .tree-label { background-image: url("../../../../app/theme/bookmark_bar_folder_mac.png"); } +</if> .main { position: absolute; @@ -221,10 +218,9 @@ html[os=mac] .tree-item[expanded] > .tree-row > .tree-label { width: 5px; background-color: #ebeff9; cursor: e-resize; -} - -html[os=mac] .splitter { +<if expr="is_macosx"> cursor: col-resize; +</if> } .logo { diff --git a/chrome/browser/resources/cloud_print/cloud_print_setup_done.css b/chrome/browser/resources/cloud_print/cloud_print_setup_done.css index caf7c90..eb6d6ec 100644 --- a/chrome/browser/resources/cloud_print/cloud_print_setup_done.css +++ b/chrome/browser/resources/cloud_print/cloud_print_setup_done.css @@ -41,10 +41,9 @@ html[dir='rtl'] .cloudprint-success-footer { } .button { +<if expr="is_macosx"> + font-size: 12pt; +</if> min-width: 87px; min-height: 26px; } - -html[os='mac'].button { - font-size: 12pt; -} diff --git a/chrome/browser/resources/extensions/pack_extension_overlay.css b/chrome/browser/resources/extensions/pack_extension_overlay.css index 928b80b..684ae338 100644 --- a/chrome/browser/resources/extensions/pack_extension_overlay.css +++ b/chrome/browser/resources/extensions/pack_extension_overlay.css @@ -15,7 +15,9 @@ width: 260px; } +<if expr="pp_ifdef('toolkit_views')"> /* TODO(estade): apply this everywhere. */ -html:not([toolkit=views]) .button-strip { +.button-strip { -webkit-box-direction: reverse; } +</if> diff --git a/chrome/browser/resources/print_preview/print_preview.css b/chrome/browser/resources/print_preview/print_preview.css index 455579f..5902307 100644 --- a/chrome/browser/resources/print_preview/print_preview.css +++ b/chrome/browser/resources/print_preview/print_preview.css @@ -399,15 +399,14 @@ html[dir='rtl'] #decrement { /* TODO(estade): unfork this code. */ .button-strip { +<if expr="not pp_ifdef('toolkit_views')"> + -webkit-box-direction: reverse; +</if> -webkit-box-orient: horizontal; -webkit-box-pack: end; display: -webkit-box; } -html:not([toolkit=views]) .button-strip { - -webkit-box-direction: reverse; -} - #print-preview .button-strip button { -webkit-margin-start: 4px; display: block; diff --git a/chrome/browser/resources/shared/css/menu.css b/chrome/browser/resources/shared/css/menu.css index eea9160..ccdc28d 100644 --- a/chrome/browser/resources/shared/css/menu.css +++ b/chrome/browser/resources/shared/css/menu.css @@ -50,13 +50,6 @@ menu > [disabled] { color: rgba(0, 0, 0, .3); } -/* Text alpha doesn't work on Linux/GTK and ChromeOs/views. - * TODO(estade): http://crbug.com/88688. */ -html[toolkit=gtk] menu > [disabled], -html[os=chromeos] menu > [disabled] { - color: #969696; -} - menu > [hidden] { display: none; } diff --git a/chrome/browser/resources/shared/css/tree.css b/chrome/browser/resources/shared/css/tree.css index 4718091..9688ab6 100644 --- a/chrome/browser/resources/shared/css/tree.css +++ b/chrome/browser/resources/shared/css/tree.css @@ -1,3 +1,7 @@ +/* Copyright (c) 2012 The Chromium Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. */ + tree { outline: none; overflow: auto; @@ -157,11 +161,10 @@ tree[icon-visibility=parent] .tree-row[has-children=false] > .tree-label { font-size: inherit; font-weight: inherit; margin: -2px -8px -2px -3px; - padding: 1px 7px 1px 1px; -} - -html:not([os=mac]) .tree-item[editing] input { +<if expr="not is_macosx"> outline: none; +</if> + padding: 1px 7px 1px 1px; } html[dir=rtl] .tree-item[editing] input { diff --git a/chrome/browser/resources/shared_resources.grd b/chrome/browser/resources/shared_resources.grd index 0b96e10..fd77eff 100644 --- a/chrome/browser/resources/shared_resources.grd +++ b/chrome/browser/resources/shared_resources.grd @@ -21,7 +21,7 @@ without changes to the corresponding grd file. --> <include name="IDR_SHARED_CSS_LIST" file="shared/css/list.css" type="BINDATA" /> <include name="IDR_SHARED_CSS_MENU" - file="shared/css/menu.css" type="BINDATA" /> + file="shared/css/menu.css" type="BINDATA" flattenhtml="true" /> <include name="IDR_SHARED_CSS_CHROME" file="shared/css/chrome_shared.css" type="BINDATA" /> <include name="IDR_SHARED_CSS_CHROME2" diff --git a/chrome/browser/resources/sync_internals/sync_node_browser.css b/chrome/browser/resources/sync_internals/sync_node_browser.css index 035e0da..202c9ee 100644 --- a/chrome/browser/resources/sync_internals/sync_node_browser.css +++ b/chrome/browser/resources/sync_internals/sync_node_browser.css @@ -1,8 +1,6 @@ -/* -Copyright (c) 2011 The Chromium Authors. All rights reserved. -Use of this source code is governed by a BSD-style license that can be -found in the LICENSE file. -*/ +/* Copyright (c) 2012 The Chromium Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. */ #sync-node-main { display: -webkit-box; @@ -12,38 +10,42 @@ found in the LICENSE file. } #sync-node-tree-container { + -webkit-padding-start: 10px; + box-sizing: border-box; height: 100%; - width: 200px; /* min-width and max-width are used by the split pane. */ - min-width: 50px; max-width: 50%; + min-width: 50px; overflow: auto; - box-sizing: border-box; padding: 5px; - -webkit-padding-start: 10px; + width: 200px; } #sync-node-tree { + display: inline-block; min-width: 100%; overflow: visible; /* let the container do the scrolling */ - display: inline-block; } /* TODO(akalin): Find a better icon to use for leaf nodes. */ #sync-node-tree .leaf .tree-label { - background-image: url("../shared/images/star_small.png"); + background-image: url('../shared/images/star_small.png'); } #sync-node-splitter { - width: 5px; background-color: #ebeff9; cursor: col-resize; + width: 5px; +<if expr="is_win"> + /* TODO(akalin): Make the BMM also use this style. */ + cursor: e-resize; +</if> } #sync-node-browser-container { + -webkit-box-flex: 1; height: 100%; overflow: auto; - -webkit-box-flex: 1; } #node-browser { @@ -54,12 +56,6 @@ found in the LICENSE file. vertical-align: top; } -/* Platform annotations are set in sync_node_browser.js. */ -/* TODO(akalin): Make the BMM also use this style. */ -html[os=win] #sync-node-splitter { - cursor: e-resize; -} - #node-browser tr:nth-child(odd) { background: #eff3ff; } diff --git a/chrome/browser/resources/sync_internals/sync_search.css b/chrome/browser/resources/sync_internals/sync_search.css index 17b458e..4867fb5 100644 --- a/chrome/browser/resources/sync_internals/sync_search.css +++ b/chrome/browser/resources/sync_internals/sync_search.css @@ -1,8 +1,6 @@ -/* -Copyright (c) 2011 The Chromium Authors. All rights reserved. -Use of this source code is governed by a BSD-style license that can be -found in the LICENSE file. -*/ +/* Copyright (c) 2012 The Chromium Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. */ #sync-search-query { width: 20em; @@ -21,27 +19,25 @@ found in the LICENSE file. } #sync-results-list { + -webkit-padding-start: 10px; + box-sizing: border-box; height: 100%; - width: 275px; /* min-width and max-width are used by the split pane. */ - min-width: 50px; max-width: 50%; + min-width: 50px; overflow: auto; - box-sizing: border-box; padding: 5px; - -webkit-padding-start: 10px; + width: 275px; } #sync-results-splitter { - width: 5px; background-color: #ebeff9; cursor: col-resize; -} - -/* Platform annotations are set in sync_node_browser.js. */ -/* TODO(akalin): Make the BMM also use this style. */ -html[os=win] #sync-results-splitter { + width: 5px; +<if expr="is_win"> + /* TODO(akalin): Make the BMM also use this style. */ cursor: e-resize; +</if> } #sync-result-details-container { diff --git a/chrome/browser/resources/sync_setup_overlay.css b/chrome/browser/resources/sync_setup_overlay.css index f5e5865..6c80def 100644 --- a/chrome/browser/resources/sync_setup_overlay.css +++ b/chrome/browser/resources/sync_setup_overlay.css @@ -208,10 +208,9 @@ #sync-setup-configure { background: white; -} - -html[os='mac'] #sync-setup-configure { +<if expr="is_macosx"> line-height: 1.5em; +</if> } #choose-data-types-form { |