Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (196712 => 196713)
--- trunk/Source/WebInspectorUI/ChangeLog 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-02-17 20:29:50 UTC (rev 196713)
@@ -1,5 +1,106 @@
2016-02-17 Matt Baker <[email protected]>
+ Web Inspector: add CSS variables for common border/background colors
+ https://bugs.webkit.org/show_bug.cgi?id=154302
+ <rdar://problem/24680944>
+
+ Reviewed by Timothy Hatcher.
+
+ Added CSS variables for commonly used border and background colors, and removed
+ duplicate CSS variables with less generic names. Inactive border colors declared in
+ rules with a body.window-inactive selector have been removed. A new rule using this
+ selector in Variables.css sets "--border-color" to the inactive color.
+
+ * UserInterface/Views/CSSStyleDetailsSidebarPanel.css:
+ (.sidebar > .panel.details.css-style > .content > .pseudo-classes):
+ (.sidebar > .panel.details.css-style > .content ~ :matches(.options-container, .class-list-container)):
+ (.sidebar > .panel.details.css-style > .content.filter-in-progress .style-declaration-section:not(.filter-section-has-label)):
+ * UserInterface/Views/DataGrid.css:
+ (.data-grid.inline):
+ (.data-grid th):
+ (.data-grid :matches(th, td):not(:last-child)):
+ (body.window-inactive .data-grid th): Deleted.
+ (body.window-inactive .data-grid :matches(th, td):not(:last-child)): Deleted.
+ * UserInterface/Views/DebuggerSidebarPanel.css:
+ (.sidebar > .panel.navigation.debugger.paused .details-section.scripts):
+ * UserInterface/Views/DetailsSection.css:
+ (.details-section):
+ (.details-section .details-section:first-child):
+ (.details-section > .header):
+ (.details-section > .content > .group):
+ (.details-section > .content > .group:nth-child(even) > .row:matches(.simple:first-child > *, :not(.simple):first-child)):
+ * UserInterface/Views/FilterBar.css:
+ (.filter-bar):
+ * UserInterface/Views/FindBanner.css:
+ (.find-banner):
+ (body.window-inactive .find-banner): Deleted.
+ * UserInterface/Views/LayerTreeDetailsSidebarPanel.css:
+ (.panel.details.layer-tree .bottom-bar):
+ * UserInterface/Views/Main.css:
+ (body.docked.bottom):
+ (body.docked.right):
+ (#split-content-browser):
+ (#split-content-browser > .navigation-bar):
+ (body.window-inactive.docked.bottom): Deleted.
+ (body.window-inactive.docked.right): Deleted.
+ (body.window-inactive #split-content-browser): Deleted.
+ * UserInterface/Views/MemoryCategoryView.css:
+ (.memory-category-view):
+ (.memory-category-view > .details):
+ (body.window-inactive .memory-category-view): Deleted.
+ (body.window-inactive .memory-category-view > .details): Deleted.
+ * UserInterface/Views/MemoryTimelineView.css:
+ (.timeline-view.memory):
+ (.timeline-view.memory > .content > .overview):
+ (.timeline-view.memory > .content > .details > .subtitle):
+ (.timeline-view.memory > .content > .overview > .divider):
+ (body.window-inactive .timeline-view.memory): Deleted.
+ (body.window-inactive .timeline-view.memory > .content > .overview): Deleted.
+ (body.window-inactive .timeline-view.memory > .content > .details > .subtitle): Deleted.
+ (body.window-inactive .timeline-view.memory > .content > .overview > .divider): Deleted.
+ * UserInterface/Views/NavigationBar.css:
+ (.navigation-bar):
+ (body.window-inactive .navigation-bar): Deleted.
+ * UserInterface/Views/NavigationSidebarPanel.css:
+ (.sidebar > .panel.navigation > .overflow-shadow):
+ (body.window-inactive .sidebar > .panel.navigation > .overflow-shadow): Deleted.
+ * UserInterface/Views/NetworkSidebarPanel.css:
+ (.sidebar > .panel.navigation.network > .title-bar):
+ (body.window-inactive .sidebar > .panel.navigation.network > .title-bar): Deleted.
+ * UserInterface/Views/OverviewTimelineView.css:
+ (.timeline-view.overview > .timeline-ruler > .header):
+ (body.window-inactive .timeline-view.overview > .timeline-ruler > .header): Deleted.
+ * UserInterface/Views/QuickConsole.css:
+ (.quick-console):
+ (body.window-inactive .quick-console): Deleted.
+ * UserInterface/Views/Sidebar.css:
+ (.sidebar):
+ (.sidebar.left):
+ (.sidebar.right):
+ (body.window-inactive .sidebar.left): Deleted.
+ (body.window-inactive .sidebar.right): Deleted.
+ * UserInterface/Views/TimelineDataGrid.css:
+ (.data-grid.timeline th):
+ (body.window-inactive .data-grid.timeline th): Deleted.
+ * UserInterface/Views/TimelineRuler.css:
+ (.timeline-ruler > .header):
+ (body.window-inactive .timeline-ruler > .header): Deleted.
+ * UserInterface/Views/TimelineSidebarPanel.css:
+ (.sidebar > .panel.navigation.timeline > .title-bar):
+ (.sidebar > .panel.navigation.timeline > .title-bar.timeline-events):
+ (body.window-inactive .sidebar > .panel.navigation.timeline > .title-bar): Deleted.
+ (body.window-inactive .sidebar > .panel.navigation.timeline > .title-bar.timeline-events): Deleted.
+ * UserInterface/Views/Toolbar.css:
+ (body.latest-mac .toolbar .dashboard-container):
+ * UserInterface/Views/Variables.css:
+ (:root):
+ (body.window-inactive *):
+ * UserInterface/Views/VisualStyleSelectorSection.css:
+ (.details-section.visual-style-selector-section:not(.collapsed) > .header):
+ (.details-section.visual-style-selector-section > .content > .selectors > .selector-list > .section-divider):
+
+2016-02-17 Matt Baker <[email protected]>
+
Web Inspector: Add singular and plural cases for "Ignore n times before stopping" label in breakpoint editor
https://bugs.webkit.org/show_bug.cgi?id=154335
<rdar://problem/24655491>
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDetailsSidebarPanel.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDetailsSidebarPanel.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDetailsSidebarPanel.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -40,7 +40,7 @@
.sidebar > .panel.details.css-style > .content > .pseudo-classes {
padding: 6px 10px;
- border-bottom: 1px solid hsl(0, 0%, 70%);
+ border-bottom: 1px solid var(--border-color);
display: flex;
flex-flow: row wrap;
@@ -71,7 +71,7 @@
position: absolute;
width: 100%;
background-color: white;
- border-top: 1px solid hsl(0, 0%, 70%);
+ border-top: 1px solid var(--border-color);
}
.sidebar > .panel.details.css-style > .content ~ .options-container {
@@ -182,7 +182,7 @@
.sidebar > .panel.details.css-style > .content.filter-in-progress .style-declaration-section:not(.filter-section-has-label) {
margin-top: 0;
border-top: none;
- border-bottom: 1px solid hsl(0, 0%, 70%);
+ border-bottom: 1px solid var(--border-color);
}
.sidebar > .panel.details.css-style > .content.filter-in-progress .style-declaration-section > .header > .selector > .filter-matching {
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -58,7 +58,7 @@
}
.data-grid.inline {
- border: 1px solid hsl(0, 0%, 70%);
+ border: 1px solid var(--border-color);
}
.data-grid.no-header > table.header {
@@ -75,7 +75,7 @@
background-color: white;
- border-bottom: 1px solid hsl(0, 0%, 70%);
+ border-bottom: 1px solid var(--border-color);
font-weight: normal;
@@ -86,18 +86,10 @@
overflow: hidden;
}
-body.window-inactive .data-grid th {
- border-bottom-color: hsl(0, 0%, 85%);
-}
-
.data-grid :matches(th, td):not(:last-child) {
- border-right: 1px solid hsl(0, 0%, 70%);
+ border-right: 1px solid var(--border-color);
}
-body.window-inactive .data-grid :matches(th, td):not(:last-child) {
- border-right-color: hsl(0, 0%, 85%);
-}
-
.data-grid th.sortable:active {
background-color: hsl(0, 0%, 70%);
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -57,7 +57,7 @@
}
.sidebar > .panel.navigation.debugger.paused .details-section.scripts {
- border-bottom: 1px solid hsl(0, 0%, 70%);
+ border-bottom: 1px solid var(--border-color);
}
.sidebar > .panel.navigation.debugger .details-section.scripts .header {
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSection.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSection.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSection.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -25,8 +25,8 @@
.details-section {
font-size: 10px;
- background-color: hsl(0, 0%, 94%);
- border-bottom: 1px solid hsl(0, 0%, 70%);
+ background-color: var(--panel-background-color);
+ border-bottom: 1px solid var(--border-color);
}
.details-section .details-section {
@@ -39,7 +39,7 @@
}
.details-section .details-section:first-child {
- border-top: 1px solid hsl(0, 0%, 70%);
+ border-top: 1px solid var(--border-color);
}
.details-section > .header {
@@ -47,7 +47,7 @@
top: -1px;
height: 23px;
- background-color: hsl(0, 0%, 94%);
+ background-color: var(--panel-background-color);
color: hsl(0, 0%, 22%);
white-space: nowrap;
@@ -159,7 +159,7 @@
.details-section > .content > .group {
display: table-row-group;
- border-bottom: 1px solid hsl(0, 0%, 70%);
+ border-bottom: 1px solid var(--border-color);
}
.details-section > .content > .group:last-child {
@@ -171,7 +171,7 @@
}
.details-section > .content > .group:nth-child(even) > .row:matches(.simple:first-child > *, :not(.simple):first-child) {
- border-top: 1px solid hsl(0, 0%, 70%);
+ border-top: 1px solid var(--border-color);
}
.details-section > .content > .group > .row.simple {
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FilterBar.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/FilterBar.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FilterBar.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -31,7 +31,7 @@
white-space: nowrap;
overflow: hidden;
- background-color: hsl(0, 0%, 94%);
+ background-color: var(--panel-background-color);
}
.filter-bar > .navigation-bar {
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -24,7 +24,7 @@
*/
.find-banner {
- border-bottom: 1px solid hsl(0, 0%, 70%);
+ border-bottom: 1px solid var(--border-color);
position: absolute;
top: -22px;
@@ -44,10 +44,6 @@
z-index: var(--z-index-header);
}
-body.window-inactive .find-banner {
- border-bottom-color: hsl(0, 0%, 85%);
-}
-
.find-banner.showing {
top: 0;
transition-timing-function: ease-out;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -58,7 +58,7 @@
display: flex;
bottom: 0;
width: 100%;
- border-top: 1px solid hsl(0, 0%, 70%);
+ border-top: 1px solid var(--border-color);
background-color: white;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Main.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/Main.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Main.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -60,21 +60,13 @@
}
body.docked.bottom {
- border-top: 1px solid hsl(0, 0%, 78%);
+ border-top: 1px solid var(--border-color);
}
body.docked.right {
- border-left: 1px solid hsl(0, 0%, 70%);
+ border-left: 1px solid var(--border-color);
}
-body.window-inactive.docked.bottom {
- border-top-color: hsl(0, 0%, 85%);
-}
-
-body.window-inactive.docked.right {
- border-left-color: hsl(0, 0%, 85%);
-}
-
#docked-resizer {
display: none;
@@ -156,17 +148,13 @@
}
#split-content-browser {
- border-top: 1px solid hsl(0, 0%, 70%);
+ border-top: 1px solid var(--border-color);
}
-body.window-inactive #split-content-browser {
- border-top-color: hsl(0, 0%, 85%);
-}
-
#split-content-browser > .navigation-bar {
cursor: row-resize;
- background-color: hsl(0, 0%, 94%);
+ background-color: var(--panel-background-color);
}
#split-content-browser > .navigation-bar .item:not(.flexible-space) {
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/MemoryCategoryView.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/MemoryCategoryView.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/MemoryCategoryView.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -25,27 +25,19 @@
.memory-category-view {
display: flex;
- border-bottom: 1px solid var(--memory-active-divider-color);
+ border-bottom: 1px solid var(--border-color);
}
.memory-category-view > .details {
width: 150px;
padding-left: 15px;
padding-top: 10px;
- border-right: 1px solid var(--memory-active-divider-color);
+ border-right: 1px solid var(--border-color);
font-family: '-webkit-system-font';
font-size: 12px;
color: hsl(0, 0%, 70%);
}
-body.window-inactive .memory-category-view {
- border-bottom-color: var(--memory-inactive-divider-color);
-}
-
-body.window-inactive .memory-category-view > .details {
- border-right-color: var(--memory-inactive-divider-color);
-}
-
.memory-category-view > .details > .name {
color: black;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/MemoryTimelineView.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/MemoryTimelineView.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/MemoryTimelineView.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -25,13 +25,9 @@
.timeline-view.memory {
overflow: scroll;
- border-top: 1px solid var(--memory-active-divider-color);
+ border-top: 1px solid var(--border-color);
}
-body.window-inactive .timeline-view.memory {
- border-top-color: var(--memory-inactive-divider-color);
-}
-
.timeline-view.memory > .content {
width: 970px;
margin: 10px auto;
@@ -40,7 +36,7 @@
.timeline-view.memory > .content > .overview {
padding: 10px;
margin-bottom: 10px;
- border-bottom: 1px solid var(--memory-active-divider-color);
+ border-bottom: 1px solid var(--border-color);
}
.timeline-view.memory > .content .subtitle {
@@ -56,7 +52,7 @@
.timeline-view.memory > .content > .details > .subtitle {
padding: 10px;
- border-bottom: 1px solid var(--memory-active-divider-color);
+ border-bottom: 1px solid var(--border-color);
}
.timeline-view.memory > .content > .overview {
@@ -79,23 +75,11 @@
}
.timeline-view.memory > .content > .overview > .divider {
- border-right: 1px solid var(--memory-active-divider-color);
+ border-right: 1px solid var(--border-color);
margin-left: 10px;
margin-right: 10px;
}
-body.window-inactive .timeline-view.memory > .content > .overview {
- border-bottom-color: var(--memory-inactive-divider-color);
-}
-
-body.window-inactive .timeline-view.memory > .content > .details > .subtitle {
- border-bottom-color: var(--memory-inactive-divider-color);
-}
-
-body.window-inactive .timeline-view.memory > .content > .overview > .divider {
- border-right-color: var(--memory-inactive-divider-color);
-}
-
.timeline-view.memory > .content > .overview .total-usage,
.timeline-view.memory > .content > .overview .max-percentage {
margin: auto;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NavigationBar.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NavigationBar.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NavigationBar.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -29,7 +29,7 @@
flex-wrap: wrap;
box-shadow: inset hsla(0, 0%, 100%, 0.2) 0 1px 0;
- border-bottom: 1px solid hsl(0, 0%, 70%);
+ border-bottom: 1px solid var(--border-color);
height: 29px;
@@ -39,10 +39,6 @@
outline: none;
}
-body.window-inactive .navigation-bar {
- border-bottom-color: hsl(0, 0%, 85%);
-}
-
.navigation-bar .item {
display: flex;
align-items: center;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -45,7 +45,7 @@
opacity: 0;
- border-bottom: 1px solid hsl(0, 0%, 70%);
+ border-bottom: 1px solid var(--border-color);
}
.sidebar > .panel.navigation > .overflow-shadow.top {
@@ -53,10 +53,6 @@
bottom: initial;
}
-body.window-inactive .sidebar > .panel.navigation > .overflow-shadow {
- border-bottom-color: hsl(0, 0%, 85%);
-}
-
.sidebar > .panel.navigation > .content .empty-content-placeholder {
left: 0;
right: 0;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -42,8 +42,8 @@
height: 23px;
- border-bottom: 1px solid hsl(0, 0%, 70%);
- background-color: hsl(0, 0%, 94%);
+ border-bottom: 1px solid var(--border-color);
+ background-color: var(--panel-background-color);
color: hsl(0, 0%, 22%);
white-space: nowrap;
@@ -58,10 +58,6 @@
overflow: hidden;
}
-body.window-inactive .sidebar > .panel.navigation.network > .title-bar {
- border-bottom-color: hsl(0, 0%, 85%);
-}
-
.sidebar > .panel.navigation.network.network-grid-content-view-showing > .content {
/* This hides the scrollbar. The view shows a scrollbar, we don't need two. */
padding-right: 16px;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -32,14 +32,10 @@
}
.timeline-view.overview > .timeline-ruler > .header {
- border-top: 1px solid hsl(0, 0%, 70%);
+ border-top: 1px solid var(--border-color);
height: 23px;
}
-body.window-inactive .timeline-view.overview > .timeline-ruler > .header {
- border-top-color: hsl(0, 0%, 85%);
-}
-
.timeline-view.overview > .timeline-ruler > .event-markers {
top: 23px;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/QuickConsole.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/QuickConsole.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/QuickConsole.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -30,7 +30,7 @@
align-items: flex-end;
background-color: white;
- border-top: 1px solid hsl(0, 0%, 74%);
+ border-top: 1px solid var(--border-color);
padding: 3px 0 4px;
outline: none;
@@ -39,10 +39,6 @@
font-family: Menlo, monospace;
}
-body.window-inactive .quick-console {
- border-top-color: hsl(0, 0%, 85%);
-}
-
.quick-console.showing-log {
border-top-color: hsl(0, 0%, 94%) !important;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -26,7 +26,7 @@
.sidebar {
position: relative;
- background-color: hsl(0, 0%, 94%);
+ background-color: var(--panel-background-color);
}
.sidebar.collapsed {
@@ -77,17 +77,9 @@
}
.sidebar.left {
- border-right: 1px solid hsl(0, 0%, 70%);
+ border-right: 1px solid var(--border-color);
}
.sidebar.right {
- border-left: 1px solid hsl(0, 0%, 70%);
+ border-left: 1px solid var(--border-color);
}
-
-body.window-inactive .sidebar.left {
- border-right-color: hsl(0, 0%, 85%);
-}
-
-body.window-inactive .sidebar.right {
- border-left-color: hsl(0, 0%, 85%);
-}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -24,13 +24,9 @@
*/
.data-grid.timeline th {
- border-top: 1px solid hsl(0, 0%, 70%);
+ border-top: 1px solid var(--border-color);
}
-body.window-inactive .data-grid.timeline th {
- border-top-color: hsl(0, 0%, 85%);
-}
-
.tree-outline.timeline-data-grid .item:hover {
color: white;
border-radius: 4px;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -43,7 +43,7 @@
}
.timeline-ruler > .header {
- border-bottom: 1px solid hsl(0, 0%, 70%);
+ border-bottom: 1px solid var(--border-color);
position: absolute;
top: 0;
@@ -52,10 +52,6 @@
height: 29px;
}
-body.window-inactive .timeline-ruler > .header {
- border-bottom-color: hsl(0, 0%, 85%);
-}
-
.timeline-ruler > .header > .divider {
position: absolute;
width: 1px;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -57,8 +57,8 @@
height: 29px;
- border-bottom: 1px solid hsl(0, 0%, 70%);
- background-color: hsl(0, 0%, 94%);
+ border-bottom: 1px solid var(--border-color);
+ background-color: var(--panel-background-color);
color: hsl(0, 0%, 22%);
white-space: nowrap;
@@ -73,10 +73,6 @@
overflow: hidden;
}
-body.window-inactive .sidebar > .panel.navigation.timeline > .title-bar {
- border-bottom-color: hsl(0, 0%, 85%);
-}
-
.sidebar > .panel.navigation.timeline > .title-bar.timelines {
top: 29px;
padding: 8px 9px;
@@ -100,7 +96,7 @@
.sidebar > .panel.navigation.timeline > .title-bar.timeline-events {
display: flex;
height: 23px;
- border-top: 1px solid hsl(0, 0%, 70%);
+ border-top: 1px solid var(--border-color);
}
.sidebar > .panel.navigation.timeline > .title-bar.timeline-events > .title-bar-scope-bar {
@@ -119,10 +115,6 @@
color: black;
}
-body.window-inactive .sidebar > .panel.navigation.timeline > .title-bar.timeline-events {
- border-top-color: hsl(0, 0%, 85%);
-}
-
.sidebar > .panel.navigation.timeline > .timelines-content {
position: absolute;
top: 58px;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -152,7 +152,7 @@
body.latest-mac .toolbar .item.button,
body.latest-mac .toolbar .search-bar > input[type="search"],
body.latest-mac .toolbar .dashboard-container {
- background-image: linear-gradient(hsl(0, 0%, 99%), hsl(0, 0%, 94%));
+ background-image: linear-gradient(hsl(0, 0%, 99%), var(--panel-background-color));
box-shadow: hsla(0, 0%, 0%, 0.3) 0 1px 1px -1px;
border-radius: 4px;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Variables.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/Variables.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Variables.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,6 +32,9 @@
--z-index-glass-pane-for-drag: 2048;
--z-index-uncaught-exception-sheet: 4096;
+ --border-color: hsl(0, 0%, 70%);
+ --panel-background-color: hsl(0, 0%, 94%);
+
--console-secondary-text-color: hsla(0, 0%, 0%, 0.33);
--syntax-highlight-number-color: hsl(248, 100%, 40%);
@@ -40,8 +43,6 @@
--syntax-highlight-regexp-color: hsl(20, 100%, 44%);
--syntax-highlight-symbol-color: hsl(172, 45%, 45%);
- --memory-active-divider-color: hsl(0, 0%, 70%);
- --memory-inactive-divider-color: hsl(0, 0%, 85%);
--memory-_javascript_-fill-color: hsl(269, 65%, 75%);
--memory-_javascript_-stroke-color: hsl(269, 33%, 50%);
--memory-images-fill-color: hsl(0, 65%, 75%);
@@ -53,3 +54,7 @@
--memory-max-comparison-fill-color: hsl(220, 10%, 75%);
--memory-max-comparison-stroke-color: hsl(220, 10%, 55%);
}
+
+body.window-inactive * {
+ --border-color: hsl(0, 0%, 85%);
+}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorSection.css (196712 => 196713)
--- trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorSection.css 2016-02-17 20:27:56 UTC (rev 196712)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorSection.css 2016-02-17 20:29:50 UTC (rev 196713)
@@ -29,7 +29,7 @@
}
.details-section.visual-style-selector-section:not(.collapsed) > .header {
- border-bottom: 1px solid hsl(0, 0%, 70%);
+ border-bottom: 1px solid var(--border-color);
}
@media (-webkit-min-device-pixel-ratio: 2) {
@@ -105,7 +105,7 @@
height: 17px;
padding: 2px;
background-color: hsl(0, 0%, 95%);
- border-color: hsl(0, 0%, 70%);
+ border-color: var(--border-color);
border-style: solid;
border-width: 1px 0;
z-index: var(--z-index-header);
