No subject
Fri Mar 7 15:32:22 PST 2014
from the second rule, and simplified the first rule.
* UserInterface/Views/TimelineSidebarPanel.css:
(body.mac-platform.legacy .sidebar > .panel.navigation.timeline > :matches(.content, .empty-content-placeholder)):
(body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .empty-content-placeholder): Deleted.
* UserInterface/Views/Toolbar.css:
(body.mac-platform:not(.legacy, .docked) .toolbar):
(body.mac-platform:not(.legacy, .docked) .toolbar.icon-and-label-vertical):
(body.mac-platform:not(.legacy, .docked) .toolbar.icon-and-label-vertical.small-size):
(body.mac-platform:not(.legacy, .docked) .toolbar:matches(.icon-and-label-horizontal, .icon-only)):
(body.mac-platform:not(.legacy, .docked) .toolbar:matches(.icon-and-label-horizontal.small-size, .icon-only.small-size, .label-only)):
(.toolbar:matches(.icon-and-label-horizontal.small-size, .icon-only.small-size, .label-only) .control-section):
(body.mac-platform:not(.legacy):not(.docked) .toolbar): Deleted.
(body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-and-label-vertical): Deleted.
(body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-and-label-vertical.small-size): Deleted.
(body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-only): Deleted.
(body.mac-platform:not(.legacy):not(.docked) .toolbar.label-only): Deleted.
(.toolbar.label-only .control-section): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDatabaseContentViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseContentView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsGradientSlidercss">trunk/Source/WebInspectorUI/UserInterface/Views/GradientSlider.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsHoverMenucss">trunk/Source/WebInspectorUI/UserInterface/Views/HoverMenu.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLayerTreeDetailsSidebarPanelcss">trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsProbeDetailsSidebarPanelcss">trunk/Source/WebInspectorUI/UserInterface/Views/ProbeDetailsSidebarPanel.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceSidebarPanelcss">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsScopeBarcss">trunk/Source/WebInspectorUI/UserInterface/Views/ScopeBar.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSyntaxHighlightingDefaultThemecss">trunk/Source/WebInspectorUI/UserInterface/Views/SyntaxHighlightingDefaultTheme.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPanelcss">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsToolbarcss">trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (176609 => 176610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-12-02 00:09:56 UTC (rev 176609)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-12-02 00:10:03 UTC (rev 176610)
</span><span class="lines">@@ -1,3 +1,71 @@
</span><ins>+2014-12-01 Benjamin Poulain <benjamin at webkit.org>
+
+ Web Inspector: add more :not() and :matches() awesomeness
+ https://bugs.webkit.org/show_bug.cgi?id=138997
+
+ Reviewed by Joseph Pecoraro.
+
+ Simplify the Inspector's CSS when possible.
+
+ * UserInterface/Views/DatabaseContentView.css:
+ (:matches(.database-user-query, .database-query-prompt, .database-query-result)::before):
+ (.database-user-query::before, .database-query-prompt::before, .database-query-result::before): Deleted.
+ * UserInterface/Views/GradientSlider.css:
+ (.gradient-slider-knob > :matches(img, div)):
+ (.gradient-slider-knob > div): Deleted.
+ * UserInterface/Views/HoverMenu.css:
+ (.hover-menu > svg > :matches(path, rect)):
+ (.hover-menu > svg > rect): Deleted.
+ * UserInterface/Views/LayerTreeDetailsSidebarPanel.css:
+ (.panel.details.layer-tree .name-column :matches(.pseudo-element, .reflection)):
+ (.panel.details.layer-tree tr.selected .name-column :matches(.pseudo-element, .reflection)):
+ (.panel.details.layer-tree .name-column .reflection): Deleted.
+ (.panel.details.layer-tree tr.selected .name-column .reflection): Deleted.
+ * UserInterface/Views/ProbeDetailsSidebarPanel.css:
+ (.details-section.probe-set .options > :matches(.probe-remove, .probe-clear-samples, .probe-add)):
+ (.details-section.probe-set .options > .probe-add): Deleted.
+ * UserInterface/Views/ResourceSidebarPanel.css:
+ (.sidebar > .panel.navigation.resource > :matches(.content, .empty-content-placeholder)):
+ (body.mac-platform.legacy .sidebar > .panel.navigation.resource > :matches(.content, .empty-content-placeholder)):
+ (.sidebar > .panel.navigation.resource > .empty-content-placeholder): Deleted.
+ (body.mac-platform.legacy .sidebar > .panel.navigation.resource > .empty-content-placeholder): Deleted.
+ * UserInterface/Views/ScopeBar.css:
+ (.scope-bar > li:matches(.selected, :active)):
+ (.scope-bar > li:active): Deleted.
+ * UserInterface/Views/SyntaxHighlightingDefaultTheme.css:
+ (.syntax-highlighted :matches(.css-comment, .javascript-comment, .html-comment)):
+ (.syntax-highlighted :matches(.css-keyword, .css-tag, .css-at-rule, .css-important, .javascript-keyword, .html-tag)):
+ (.syntax-highlighted :matches(.css-number, .javascript-number)):
+ (.syntax-highlighted :matches(.css-property, .css-selector, .javascript-ident)):
+ (.syntax-highlighted :matches(.css-string, .javascript-string, .javascript-regexp, .html-attribute-value)):
+ (.syntax-highlighted :matches(.html-doctype, .html-processing-instruction)):
+ (.syntax-highlighted .html-comment): Deleted.
+ (.syntax-highlighted .html-tag): Deleted.
+ (.syntax-highlighted .javascript-number): Deleted.
+ (.syntax-highlighted .javascript-ident): Deleted.
+ (.syntax-highlighted .html-attribute-value): Deleted.
+ (.syntax-highlighted .html-processing-instruction): Deleted.
+ It looks like ".cm-tag.cm-bracket" was there only to override the rule below.
+ From basic testing, it looks like "cm-tag" and "cm-bracket" always appear together. I removed the "cm-bracket" rule
+ from the second rule, and simplified the first rule.
+
+ * UserInterface/Views/TimelineSidebarPanel.css:
+ (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > :matches(.content, .empty-content-placeholder)):
+ (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .empty-content-placeholder): Deleted.
+ * UserInterface/Views/Toolbar.css:
+ (body.mac-platform:not(.legacy, .docked) .toolbar):
+ (body.mac-platform:not(.legacy, .docked) .toolbar.icon-and-label-vertical):
+ (body.mac-platform:not(.legacy, .docked) .toolbar.icon-and-label-vertical.small-size):
+ (body.mac-platform:not(.legacy, .docked) .toolbar:matches(.icon-and-label-horizontal, .icon-only)):
+ (body.mac-platform:not(.legacy, .docked) .toolbar:matches(.icon-and-label-horizontal.small-size, .icon-only.small-size, .label-only)):
+ (.toolbar:matches(.icon-and-label-horizontal.small-size, .icon-only.small-size, .label-only) .control-section):
+ (body.mac-platform:not(.legacy):not(.docked) .toolbar): Deleted.
+ (body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-and-label-vertical): Deleted.
+ (body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-and-label-vertical.small-size): Deleted.
+ (body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-only): Deleted.
+ (body.mac-platform:not(.legacy):not(.docked) .toolbar.label-only): Deleted.
+ (.toolbar.label-only .control-section): Deleted.
+
</ins><span class="cx"> 2014-11-27 Andres Gomez <agomez at igalia.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Update NavigationItemProbes icon for the GTK+ port
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDatabaseContentViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseContentView.css (176609 => 176610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseContentView.css 2014-12-02 00:09:56 UTC (rev 176609)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseContentView.css 2014-12-02 00:10:03 UTC (rev 176610)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> outline: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.database-user-query::before, .database-query-prompt::before, .database-query-result::before {
</del><ins>+:matches(.database-user-query, .database-query-prompt, .database-query-result)::before {
</ins><span class="cx"> position: absolute;
</span><span class="cx"> display: block;
</span><span class="cx"> z-index: 1;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsGradientSlidercss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/GradientSlider.css (176609 => 176610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/GradientSlider.css 2014-12-02 00:09:56 UTC (rev 176609)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/GradientSlider.css 2014-12-02 00:10:03 UTC (rev 176610)
</span><span class="lines">@@ -85,8 +85,7 @@
</span><span class="cx"> opacity: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.gradient-slider-knob > img,
-.gradient-slider-knob > div {
</del><ins>+.gradient-slider-knob > :matches(img, div) {
</ins><span class="cx"> position: absolute;
</span><span class="cx">
</span><span class="cx"> left: 5px;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsHoverMenucss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/HoverMenu.css (176609 => 176610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/HoverMenu.css 2014-12-02 00:09:56 UTC (rev 176609)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/HoverMenu.css 2014-12-02 00:10:03 UTC (rev 176610)
</span><span class="lines">@@ -44,8 +44,7 @@
</span><span class="cx"> left: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.hover-menu > svg > path,
-.hover-menu > svg > rect {
</del><ins>+.hover-menu > svg > :matches(path, rect) {
</ins><span class="cx"> stroke: rgba(0, 0, 0, 0.22);
</span><span class="cx"> stroke-width: 2px;
</span><span class="cx"> fill: none;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLayerTreeDetailsSidebarPanelcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.css (176609 => 176610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.css 2014-12-02 00:09:56 UTC (rev 176609)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.css 2014-12-02 00:10:03 UTC (rev 176610)
</span><span class="lines">@@ -49,13 +49,11 @@
</span><span class="cx"> content: url(../Images/PseudoElement.svg);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.panel.details.layer-tree .name-column .pseudo-element,
-.panel.details.layer-tree .name-column .reflection {
</del><ins>+.panel.details.layer-tree .name-column :matches(.pseudo-element, .reflection) {
</ins><span class="cx"> color: rgb(128, 128, 128);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.panel.details.layer-tree tr.selected .name-column .pseudo-element,
-.panel.details.layer-tree tr.selected .name-column .reflection {
</del><ins>+.panel.details.layer-tree tr.selected .name-column :matches(.pseudo-element, .reflection) {
</ins><span class="cx"> color: rgba(255, 255, 255, 0.75);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsProbeDetailsSidebarPanelcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ProbeDetailsSidebarPanel.css (176609 => 176610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ProbeDetailsSidebarPanel.css 2014-12-02 00:09:56 UTC (rev 176609)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ProbeDetailsSidebarPanel.css 2014-12-02 00:10:03 UTC (rev 176610)
</span><span class="lines">@@ -37,9 +37,7 @@
</span><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.details-section.probe-set .options > .probe-remove,
-.details-section.probe-set .options > .probe-clear-samples,
-.details-section.probe-set .options > .probe-add {
</del><ins>+.details-section.probe-set .options > :matches(.probe-remove, .probe-clear-samples, .probe-add) {
</ins><span class="cx"> float: right;
</span><span class="cx"> height: 11px;
</span><span class="cx"> margin-top: 1px;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceSidebarPanelcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.css (176609 => 176610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.css 2014-12-02 00:09:56 UTC (rev 176609)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.css 2014-12-02 00:10:03 UTC (rev 176610)
</span><span class="lines">@@ -23,13 +23,11 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-.sidebar > .panel.navigation.resource > .content,
-.sidebar > .panel.navigation.resource > .empty-content-placeholder {
</del><ins>+.sidebar > .panel.navigation.resource > :matches(.content, .empty-content-placeholder) {
</ins><span class="cx"> top: 28px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.mac-platform.legacy .sidebar > .panel.navigation.resource > .content,
-body.mac-platform.legacy .sidebar > .panel.navigation.resource > .empty-content-placeholder {
</del><ins>+body.mac-platform.legacy .sidebar > .panel.navigation.resource > :matches(.content, .empty-content-placeholder) {
</ins><span class="cx"> top: 21px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScopeBarcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScopeBar.css (176609 => 176610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScopeBar.css 2014-12-02 00:09:56 UTC (rev 176609)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScopeBar.css 2014-12-02 00:10:03 UTC (rev 176610)
</span><span class="lines">@@ -50,8 +50,7 @@
</span><span class="cx"> transition-property: background-color, border-color;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.scope-bar > li.selected,
-.scope-bar > li:active {
</del><ins>+.scope-bar > li:matches(.selected, :active) {
</ins><span class="cx"> transition-duration: 75ms;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSyntaxHighlightingDefaultThemecss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SyntaxHighlightingDefaultTheme.css (176609 => 176610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SyntaxHighlightingDefaultTheme.css 2014-12-02 00:09:56 UTC (rev 176609)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SyntaxHighlightingDefaultTheme.css 2014-12-02 00:10:03 UTC (rev 176610)
</span><span class="lines">@@ -34,64 +34,34 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .cm-s-default .cm-comment,
</span><del>-.syntax-highlighted .css-comment,
-.syntax-highlighted .javascript-comment,
-.syntax-highlighted .html-comment {
</del><ins>+.syntax-highlighted :matches(.css-comment, .javascript-comment, .html-comment) {
</ins><span class="cx"> color: rgb(0, 116, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.cm-s-default .cm-tag,
-.cm-s-default .cm-bracket,
-.cm-s-default .cm-tag.cm-bracket,
-.cm-s-default .cm-atom,
-.cm-s-default .cm-keyword,
-.cm-s-default .cm-m-css.cm-atom,
-.cm-s-default .cm-m-css.cm-meta,
-.cm-s-default .cm-m-css.cm-variable-3,
-.cm-s-default .cm-m-css.cm-property,
-.cm-s-default .cm-m-javascript.cm-builtin,
-.syntax-highlighted .css-keyword,
-.syntax-highlighted .css-tag,
-.syntax-highlighted .css-at-rule,
-.syntax-highlighted .css-important,
-.syntax-highlighted .javascript-keyword,
-.syntax-highlighted .html-tag {
</del><ins>+.cm-s-default :matches(.cm-tag, .cm-bracket, .cm-atom, .cm-keyword, .cm-m-javascript.cm-builtin),
+.cm-s-default .cm-m-css:matches(.cm-atom, .cm-meta, .cm-variable-3, .cm-property),
+.syntax-highlighted :matches(.css-keyword, .css-tag, .css-at-rule, .css-important, .javascript-keyword, .html-tag) {
</ins><span class="cx"> color: rgb(170, 13, 145);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.cm-s-default .cm-number,
-.cm-s-default .cm-atom.cm-hex-color,
-.syntax-highlighted .css-number,
-.syntax-highlighted .javascript-number {
</del><ins>+.cm-s-default :matches(.cm-number, .cm-atom.cm-hex-color),
+.syntax-highlighted :matches(.css-number, .javascript-number) {
</ins><span class="cx"> color: rgb(28, 0, 207);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.cm-s-default .cm-def,
-.cm-s-default .cm-bracket,
-.cm-s-default .cm-operator,
-.cm-s-default .cm-variable,
-.cm-s-default .cm-variable-2,
-.cm-s-default .cm-m-css.cm-tag,
-.cm-s-default .cm-m-css.cm-string-2,
-.cm-s-default .cm-m-css.cm-builtin,
-.cm-s-default .cm-m-css.cm-qualifier,
-.syntax-highlighted .css-property,
-.syntax-highlighted .css-selector,
-.syntax-highlighted .javascript-ident {
</del><ins>+.cm-s-default :matches(.cm-def, .cm-operator, .cm-variable, .cm-variable-2),
+.cm-s-default .cm-m-css:matches(.cm-tag, .cm-string-2, .cm-builtin, .cm-qualifier),
+.syntax-highlighted :matches(.css-property, .css-selector, .javascript-ident) {
</ins><span class="cx"> color: inherit;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .cm-s-default .cm-string,
</span><del>-.syntax-highlighted .css-string,
-.syntax-highlighted .javascript-string,
-.syntax-highlighted .javascript-regexp,
-.syntax-highlighted .html-attribute-value {
</del><ins>+.syntax-highlighted :matches(.css-string, .javascript-string, .javascript-regexp, .html-attribute-value) {
</ins><span class="cx"> color: rgb(196, 26, 22);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .cm-s-default .cm-m-xml.cm-meta,
</span><del>-.syntax-highlighted .html-doctype,
-.syntax-highlighted .html-processing-instruction {
</del><ins>+.syntax-highlighted :matches(.html-doctype, .html-processing-instruction) {
</ins><span class="cx"> color: rgb(192, 192, 192);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineSidebarPanelcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css (176609 => 176610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css 2014-12-02 00:09:56 UTC (rev 176609)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css 2014-12-02 00:10:03 UTC (rev 176610)
</span><span class="lines">@@ -235,8 +235,7 @@
</span><span class="cx"> top: 182px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .content,
-body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .empty-content-placeholder {
</del><ins>+body.mac-platform.legacy .sidebar > .panel.navigation.timeline > :matches(.content, .empty-content-placeholder) {
</ins><span class="cx"> top: 175px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsToolbarcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.css (176609 => 176610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.css 2014-12-02 00:09:56 UTC (rev 176609)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.css 2014-12-02 00:10:03 UTC (rev 176610)
</span><span class="lines">@@ -60,26 +60,23 @@
</span><span class="cx"> height: 32px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.mac-platform:not(.legacy):not(.docked) .toolbar {
</del><ins>+body.mac-platform:not(.legacy, .docked) .toolbar {
</ins><span class="cx"> padding-top: 22px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-and-label-vertical {
</del><ins>+body.mac-platform:not(.legacy, .docked) .toolbar.icon-and-label-vertical {
</ins><span class="cx"> height: 78px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-and-label-vertical.small-size {
</del><ins>+body.mac-platform:not(.legacy, .docked) .toolbar.icon-and-label-vertical.small-size {
</ins><span class="cx"> height: 70px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-and-label-horizontal,
-body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-only {
</del><ins>+body.mac-platform:not(.legacy, .docked) .toolbar:matches(.icon-and-label-horizontal, .icon-only) {
</ins><span class="cx"> height: 62px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-and-label-horizontal.small-size,
-body.mac-platform:not(.legacy):not(.docked) .toolbar.icon-only.small-size,
-body.mac-platform:not(.legacy):not(.docked) .toolbar.label-only {
</del><ins>+body.mac-platform:not(.legacy, .docked) .toolbar:matches(.icon-and-label-horizontal.small-size, .icon-only.small-size, .label-only) {
</ins><span class="cx"> height: 54px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -121,9 +118,7 @@
</span><span class="cx"> min-width: -webkit-min-content;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.toolbar.icon-and-label-horizontal.small-size .control-section,
-.toolbar.icon-only.small-size .control-section,
-.toolbar.label-only .control-section {
</del><ins>+.toolbar:matches(.icon-and-label-horizontal.small-size, .icon-only.small-size, .label-only) .control-section {
</ins><span class="cx"> flex-direction: row;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>
More information about the webkit-changes
mailing list