Changeset 183579 in webkit
- Timestamp:
- Apr 29, 2015, 2:59:48 PM (10 years ago)
- Location:
- trunk/Source/WebInspectorUI
- Files:
-
- 50 deleted
- 60 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebInspectorUI/ChangeLog
r183577 r183579 1 2015-04-29 Timothy Hatcher <timothy@apple.com> 2 3 Web Inspector: Remove Legacy images and styles 4 https://bugs.webkit.org/show_bug.cgi?id=144390 5 6 Reviewed by Joseph Pecoraro. 7 8 * UserInterface/Base/ImageUtilities.js: 9 (.generateImage): 10 (.generateImage.generateLegacyImage): Deleted. 11 * UserInterface/Base/Main.js: 12 (WebInspector.contentLoaded): 13 (WebInspector._updateToolbarHeight): 14 * UserInterface/Base/Platform.js: 15 * UserInterface/Controllers/TimelineManager.js: 16 (WebInspector.TimelineManager.prototype._loadNewRecording): 17 * UserInterface/Images/Legacy/BackArrow.svg: Removed. 18 * UserInterface/Images/Legacy/Breakpoints.svg: Removed. 19 * UserInterface/Images/Legacy/Close.svg: Removed. 20 * UserInterface/Images/Legacy/CloseLarge.svg: Removed. 21 * UserInterface/Images/Legacy/Colors.png: Removed. 22 * UserInterface/Images/Legacy/Colors@2x.png: Removed. 23 * UserInterface/Images/Legacy/ColorsLarge.png: Removed. 24 * UserInterface/Images/Legacy/ColorsLarge@2x.png: Removed. 25 * UserInterface/Images/Legacy/DockBottom.svg: Removed. 26 * UserInterface/Images/Legacy/DockRight.svg: Removed. 27 * UserInterface/Images/Legacy/DownloadArrow.svg: Removed. 28 * UserInterface/Images/Legacy/Errors.svg: Removed. 29 * UserInterface/Images/Legacy/ErrorsEnabled.svg: Removed. 30 * UserInterface/Images/Legacy/FilterFieldGlyph.svg: Removed. 31 * UserInterface/Images/Legacy/FolderGeneric.png: Removed. 32 * UserInterface/Images/Legacy/FolderGeneric@2x.png: Removed. 33 * UserInterface/Images/Legacy/ForwardArrow.svg: Removed. 34 * UserInterface/Images/Legacy/Issues.svg: Removed. 35 * UserInterface/Images/Legacy/IssuesEnabled.svg: Removed. 36 * UserInterface/Images/Legacy/LayerBorders.svg: Removed. 37 * UserInterface/Images/Legacy/Logs.svg: Removed. 38 * UserInterface/Images/Legacy/NavigationItemCurleyBraces.svg: Removed. 39 * UserInterface/Images/Legacy/NavigationItemTrash.svg: Removed. 40 * UserInterface/Images/Legacy/Network.png: Removed. 41 * UserInterface/Images/Legacy/Network@2x.png: Removed. 42 * UserInterface/Images/Legacy/NetworkLarge.png: Removed. 43 * UserInterface/Images/Legacy/NetworkLarge@2x.png: Removed. 44 * UserInterface/Images/Legacy/Pause.svg: Removed. 45 * UserInterface/Images/Legacy/Plus.svg: Removed. 46 * UserInterface/Images/Legacy/Recording.png: Removed. 47 * UserInterface/Images/Legacy/Recording@2x.png: Removed. 48 * UserInterface/Images/Legacy/RecordingHovered.png: Removed. 49 * UserInterface/Images/Legacy/RecordingHovered@2x.png: Removed. 50 * UserInterface/Images/Legacy/RecordingStopped.png: Removed. 51 * UserInterface/Images/Legacy/RecordingStopped@2x.png: Removed. 52 * UserInterface/Images/Legacy/Reload.svg: Removed. 53 * UserInterface/Images/Legacy/Resources.svg: Removed. 54 * UserInterface/Images/Legacy/Resume.svg: Removed. 55 * UserInterface/Images/Legacy/ShadowDOM.svg: Removed. 56 * UserInterface/Images/Legacy/SortIndicatorDownArrow.svg: Removed. 57 * UserInterface/Images/Legacy/SortIndicatorUpArrow.svg: Removed. 58 * UserInterface/Images/Legacy/SplitToggleDown.svg: Removed. 59 * UserInterface/Images/Legacy/SplitToggleUp.svg: Removed. 60 * UserInterface/Images/Legacy/StepInto.svg: Removed. 61 * UserInterface/Images/Legacy/StepOut.svg: Removed. 62 * UserInterface/Images/Legacy/StepOver.svg: Removed. 63 * UserInterface/Images/Legacy/Time.svg: Removed. 64 * UserInterface/Images/Legacy/Undock.svg: Removed. 65 * UserInterface/Images/Legacy/UpDownArrows.svg: Removed. 66 * UserInterface/Images/Legacy/Weight.svg: Removed. 67 * UserInterface/Views/ButtonNavigationItem.css: 68 (body.mac-platform.legacy .navigation-bar .item.button.text-only): Deleted. 69 * UserInterface/Views/ButtonToolbarItem.css: 70 (body.mac-platform.legacy .toolbar .item.button > .label): Deleted. 71 * UserInterface/Views/CSSStyleDeclarationSection.css: 72 (body.mac-platform.legacy .style-declaration-section): Deleted. 73 (body.mac-platform.legacy .style-declaration-section + .style-declaration-section): Deleted. 74 (body.mac-platform.legacy .style-declaration-section.last-in-group): Deleted. 75 (body.mac-platform.legacy .style-declaration-section.last-in-group + .style-declaration-section): Deleted. 76 (body.mac-platform.legacy .style-declaration-section.last-in-group + .style-declaration-section:matches(.last-in-group, :last-child)): Deleted. 77 * UserInterface/Views/CSSStyleDetailsSidebarPanel.css: 78 (body.mac-platform.legacy .sidebar > .panel.details.css-style > .content): Deleted. 79 * UserInterface/Views/ContentBrowser.js: 80 (WebInspector.ContentBrowser): 81 * UserInterface/Views/ControlToolbarItem.css: 82 (body.mac-platform.legacy .toolbar .item.control): Deleted. 83 (body.mac-platform.legacy .toolbar .item.control:hover): Deleted. 84 * UserInterface/Views/DOMTreeContentView.js: 85 (WebInspector.DOMTreeContentView): 86 * UserInterface/Views/DOMTreeOutline.css: 87 (body.mac-platform.legacy .dom-tree-outline li.hovered:not(.selected) .selection): Deleted. 88 (body.mac-platform.legacy .dom-tree-outline li.elements-drag-over .selection): Deleted. 89 (body.mac-platform.legacy .dom-tree-outline:focus li.selected .selection): Deleted. 90 * UserInterface/Views/DashboardContainerView.css: 91 (body.mac-platform.legacy .toolbar .dashboard-container): Deleted. 92 (body.mac-platform.legacy.window-inactive .toolbar .dashboard-container): Deleted. 93 (body.mac-platform.legacy.window-inactive .toolbar .dashboard): Deleted. 94 (body.mac-platform.legacy .dashboard-container .advance-arrow): Deleted. 95 * UserInterface/Views/DataGrid.css: 96 (body.mac-platform.legacy .data-grid:focus tr.selected td:not(:last-child)): Deleted. 97 (body.mac-platform.legacy .data-grid:focus tr.selected): Deleted. 98 * UserInterface/Views/DataGrid.js: 99 (WebInspector.DataGrid.prototype.get _generateSortIndicatorImagesIfNeeded): 100 * UserInterface/Views/DatabaseTableContentView.js: 101 (WebInspector.DatabaseTableContentView): 102 * UserInterface/Views/DebuggerDashboardView.js: 103 (WebInspector.DebuggerDashboardView): 104 * UserInterface/Views/DebuggerSidebarPanel.css: 105 (body.mac-platform.legacy .sidebar > .panel.navigation.debugger > .content): Deleted. 106 * UserInterface/Views/DebuggerSidebarPanel.js: 107 * UserInterface/Views/DefaultDashboardView.css: 108 (body.mac-platform.legacy .toolbar .dashboard.default > .item): Deleted. 109 (body.mac-platform.legacy .toolbar .dashboard.default > .resourcesCount > img): Deleted. 110 (body.mac-platform.legacy .toolbar .dashboard.default > .logs > img): Deleted. 111 (body.mac-platform.legacy .toolbar .dashboard.default > .errors > img): Deleted. 112 (body.mac-platform.legacy .toolbar .dashboard.default > .errors.enabled > img): Deleted. 113 (body.mac-platform.legacy .toolbar .dashboard.default > .issues > img): Deleted. 114 (body.mac-platform.legacy .toolbar .dashboard.default > .issues.enabled > img): Deleted. 115 * UserInterface/Views/DetailsSection.css: 116 (body.mac-platform.legacy .details-section): Deleted. 117 (body.mac-platform.legacy .details-section .details-section): Deleted. 118 (body.mac-platform.legacy .details-section .details-section:first-child): Deleted. 119 (body.mac-platform.legacy .details-section > .header): Deleted. 120 (body.mac-platform.legacy .details-section .details-section > .header): Deleted. 121 (body.mac-platform.legacy .details-section .details-section.collapsed > .header): Deleted. 122 (body.mac-platform.legacy .details-section:not(.collapsed) .data-grid.inline): Deleted. 123 (body.mac-platform.legacy .details-section.computed-style-properties:not(.collapsed) > .header): Deleted. 124 (body.mac-platform.legacy .details-section > .content > .group): Deleted. 125 (body.mac-platform.legacy .details-section > .content > .group:nth-child(even)): Deleted. 126 (body.mac-platform.legacy .details-section > .content > .group:matches(:nth-child(even), :last-child) > .row.simple:last-child > *): Deleted. 127 (body.mac-platform.legacy .details-section > .content > .group > .row:matches(.empty, .text)): Deleted. 128 * UserInterface/Views/DividerNavigationItem.css: 129 (.navigation-bar .item.divider): 130 (body.mac-platform.legacy .navigation-bar .item.divider): Deleted. 131 * UserInterface/Views/FilterBar.css: 132 (.filter-bar > input[type="search"]::-webkit-search-decoration): 133 (body.mac-platform.legacy .filter-bar): Deleted. 134 (body.mac-platform.legacy .filter-bar > input[type="search"]): Deleted. 135 (body.mac-platform.legacy .filter-bar > input[type="search"]::-webkit-search-decoration): Deleted. 136 * UserInterface/Views/FindBanner.css: 137 (body.mac-platform.legacy .find-banner > input[type="search"]): Deleted. 138 (body.mac-platform.legacy .find-banner > button > .glyph): Deleted. 139 (body.mac-platform.legacy .find-banner > button.segmented.left > .glyph): Deleted. 140 (body.mac-platform.legacy .find-banner > button.segmented.right > .glyph): Deleted. 141 (body.mac-platform.legacy .find-banner > button.segmented): Deleted. 142 * UserInterface/Views/FindBanner.js: 143 (WebInspector.FindBanner.prototype._generateButtonsGlyphsIfNeeded): 144 (WebInspector.FindBanner): 145 * UserInterface/Views/FolderIcon.css: 146 (.folder-icon .icon): 147 (body.mac-platform.legacy .folder-icon .icon): Deleted. 148 * UserInterface/Views/HierarchicalPathComponent.css: 149 (body.mac-platform.legacy .hierarchical-path-component > .selector-arrows): Deleted. 150 * UserInterface/Views/IndexedDatabaseObjectStoreContentView.js: 151 (WebInspector.IndexedDatabaseObjectStoreContentView): 152 * UserInterface/Views/LayerTreeDetailsSidebarPanel.css: 153 (body.mac-platform.legacy .sidebar > .panel.details.layer-tree > .content): Deleted. 154 (body.mac-platform.legacy .panel.details.layer-tree .bottom-bar): Deleted. 155 (body.mac-platform.legacy .panel.details.layer-tree .bottom-bar > div): Deleted. 156 (body.mac-platform.legacy .layer-tree-popover): Deleted. 157 * UserInterface/Views/LogContentView.css: 158 (body.mac-platform.legacy .search-bar.log-search-bar > input[type="search"]): Deleted. 159 * UserInterface/Views/LogContentView.js: 160 (WebInspector.LogContentView): 161 * UserInterface/Views/Main.css: 162 (body.mac-platform.legacy:not(.docked)): Deleted. 163 (body.docked.bottom.mac-platform.legacy): Deleted. 164 (body.docked.right.mac-platform.legacy): Deleted. 165 (body.mac-platform.legacy #split-content-browser > .navigation-bar): Deleted. 166 * UserInterface/Views/NavigationBar.css: 167 (.navigation-bar .item): 168 (body.mac-platform.legacy .navigation-bar): Deleted. 169 (body.mac-platform.legacy .navigation-bar .item): Deleted. 170 * UserInterface/Views/NavigationSidebarPanel.css: 171 (body.mac-platform.legacy .sidebar > .panel.navigation > .content): Deleted. 172 (body.mac-platform.legacy .sidebar > .panel.navigation > .overflow-shadow): Deleted. 173 (body.mac-platform.legacy .sidebar > .panel.navigation > .overflow-shadow.top): Deleted. 174 (body.mac-platform.legacy .sidebar > .panel.navigation > .empty-content-placeholder): Deleted. 175 (body.mac-platform.legacy .navigation-sidebar-panel-content-tree-outline .item.selected): Deleted. 176 (body.mac-platform.legacy .navigation-sidebar-panel-content-tree-outline:focus .item.selected): Deleted. 177 (body.mac-platform.legacy.window-inactive .navigation-sidebar-panel-content-tree-outline .item.selected): Deleted. 178 * UserInterface/Views/NavigationSidebarPanel.js: 179 (WebInspector.NavigationSidebarPanel.prototype._updateContentOverflowShadowVisibility): 180 (WebInspector.NavigationSidebarPanel.prototype._generateDisclosureTrianglesIfNeeded): 181 * UserInterface/Views/Popover.js: 182 * UserInterface/Views/ProbeDetailsSidebarPanel.css: 183 (body.mac-platform.legacy .details-section.probe-set .options > .probe-clear-samples): Deleted. 184 (body.mac-platform.legacy .details-section.probe-set .options > .probe-remove): Deleted. 185 (body.mac-platform.legacy .details-section.probe-set .options > .probe-add): Deleted. 186 * UserInterface/Views/QuickConsole.css: 187 (body.mac-platform.legacy .quick-console): Deleted. 188 * UserInterface/Views/RadioButtonNavigationItem.css: 189 (.navigation-bar .item.radio.button.text-only.selected:active): 190 (body.mac-platform.legacy .navigation-bar .item.radio.button.text-only:hover): Deleted. 191 (body.mac-platform.legacy .navigation-bar .item.radio.button.text-only.selected): Deleted. 192 (body.mac-platform.legacy .navigation-bar .item.radio.button.text-only.selected:active): Deleted. 193 * UserInterface/Views/RulesStyleDetailsPanel.css: 194 (body.mac-platform.legacy .sidebar > .panel.details.css-style .rules .label + .style-declaration-section): Deleted. 195 (body.mac-platform.legacy .sidebar > .panel.details.css-style .rules .new-rule): Deleted. 196 (body.mac-platform.legacy .sidebar > .panel.details.css-style .rules .new-rule + .style-declaration-section): Deleted. 197 (body.mac-platform.legacy .sidebar > .panel.details.css-style .rules .new-rule img): Deleted. 198 * UserInterface/Views/ScopeBar.css: 199 (.scope-bar > li.selected:active): 200 (body.mac-platform.legacy .scope-bar > li): Deleted. 201 (body.mac-platform.legacy .scope-bar > li:hover): Deleted. 202 (body.mac-platform.legacy .scope-bar > li.selected): Deleted. 203 (body.mac-platform.legacy .scope-bar > li:active): Deleted. 204 (body.mac-platform.legacy .scope-bar > li.selected:active): Deleted. 205 * UserInterface/Views/ScriptContentView.js: 206 (WebInspector.ScriptContentView): 207 * UserInterface/Views/SearchBar.css: 208 (body.mac-platform.legacy .search-bar > input[type="search"]): Deleted. 209 * UserInterface/Views/SearchSidebarPanel.css: 210 (.sidebar > .panel.navigation.search > .search-bar > input[type="search"]): 211 (body.mac-platform.legacy .sidebar > .panel.navigation.search > :matches(.content, .empty-content-placeholder)): Deleted. 212 (body.mac-platform.legacy .sidebar > .panel.navigation.search > .search-bar): Deleted. 213 (body.mac-platform.legacy .sidebar > .panel.navigation.search > .search-bar > input[type="search"]): Deleted. 214 * UserInterface/Views/Sidebar.css: 215 (body.window-inactive .sidebar.right): 216 (body.mac-platform.legacy .sidebar): Deleted. 217 (body.mac-platform.legacy.window-inactive .sidebar): Deleted. 218 (body.mac-platform.legacy .sidebar.right): Deleted. 219 * UserInterface/Views/TextContentView.js: 220 (WebInspector.TextContentView): 221 * UserInterface/Views/TextResourceContentView.js: 222 (WebInspector.TextResourceContentView): 223 * UserInterface/Views/TimelineDataGrid.css: 224 (body.mac-platform.legacy .data-grid.timeline > .navigation-bar-container > .navigation-bar): Deleted. 225 * UserInterface/Views/TimelineIcons.css: 226 (body.mac-platform.legacy .network-icon .icon): Deleted. 227 (body.mac-platform.legacy .network-icon.large .icon): Deleted. 228 (body.mac-platform.legacy .colors-icon .icon): Deleted. 229 (body.mac-platform.legacy .colors-icon.large .icon): Deleted. 230 * UserInterface/Views/TimelineRecordingContentView.js: 231 (WebInspector.TimelineRecordingContentView): 232 * UserInterface/Views/TimelineRuler.css: 233 (body.mac-platform.legacy .timeline-ruler > .header): Deleted. 234 (body.mac-platform.legacy .timeline-ruler > .selection-drag): Deleted. 235 (body.mac-platform.legacy .timeline-ruler > .selection-handle): Deleted. 236 * UserInterface/Views/TimelineSidebarPanel.css: 237 (.sidebar > .panel.navigation.timeline.timeline-recording-content-view-showing > .content): 238 (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar): Deleted. 239 (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-glyph): Deleted. 240 (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-glyph.recording): Deleted. 241 (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-glyph:hover): Deleted. 242 (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-glyph.recording:hover): Deleted. 243 (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-glyph.forced): Deleted. 244 (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-glyph.recording.forced): Deleted. 245 (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-status): Deleted. 246 (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .title-bar): Deleted. 247 (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .title-bar.timelines): Deleted. 248 (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .title-bar.timeline-events): Deleted. 249 (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .timelines-content): Deleted. 250 (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .timelines-content .close-button): Deleted. 251 (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .timelines-content li.item.selected + li.item): Deleted. 252 (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .timelines-content :focus li.item.selected + li.item): Deleted. 253 (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > :matches(.content, .empty-content-placeholder)): Deleted. 254 (body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .content .item > .status > .status-button): Deleted. 255 * UserInterface/Views/TimelineSidebarPanel.js: 256 (WebInspector.TimelineSidebarPanel): 257 * UserInterface/Views/Toolbar.css: 258 (body.mac-platform:not(.docked) .toolbar): 259 (body.mac-platform:not(.legacy, .docked) .toolbar): Deleted. 260 (body.mac-platform.legacy .toolbar): Deleted. 261 (body.mac-platform.legacy.docked .toolbar): Deleted. 262 (body.mac-platform.legacy:not(.docked) .toolbar .item.button > .label): Deleted. 263 (body.mac-platform.legacy.window-inactive .toolbar): Deleted. 264 * UserInterface/Views/TreeElementStatusButton.css: 265 (body.mac-platform.legacy .item > .status > .status-button > svg .filled): Deleted. 266 (body.mac-platform.legacy .item > .status > .status-button > svg .stroked): Deleted. 267 1 268 2015-04-29 Andres Gomez <agomez@igalia.com> 2 269 -
trunk/Source/WebInspectorUI/UserInterface/Base/ImageUtilities.js
r183338 r183579 112 112 } 113 113 114 function platformImagePath(fileName)115 {116 if (WebInspector.Platform.isLegacyMacOS)117 return "Images/Legacy/" + fileName;118 return "Images/" + fileName;119 }120 121 114 function saveImageToStorage(storageKey, context, width, height, imageVersion) 122 115 { … … 499 492 function generateImage(state) 500 493 { 501 function generateModernImage() 502 { 503 const context = document.getCSSCanvasContext("2d", canvasIdentifierCallback(state), scaledWidth, scaledHeight); 504 context.save(); 505 context.scale(scaleFactor, scaleFactor); 506 507 context.clearRect(0, 0, width, height); 508 509 var gradient = context.createLinearGradient(0, 0, 0, height); 510 if (state === states.Active) { 511 gradient.addColorStop(0, "rgb(65, 65, 65)"); 512 gradient.addColorStop(1, "rgb(70, 70, 70)"); 513 } else if (state === states.Focus) { 514 gradient.addColorStop(0, "rgb(0, 123, 247)"); 515 gradient.addColorStop(1, "rgb(0, 128, 252)"); 516 } else if (state === states.ActiveFocus) { 517 gradient.addColorStop(0, "rgb(0, 62, 210)"); 518 gradient.addColorStop(1, "rgb(0, 67, 215)"); 519 } else { 520 gradient.addColorStop(0, "rgb(75, 75, 75)"); 521 gradient.addColorStop(1, "rgb(80, 80, 80)"); 522 } 523 524 context.fillStyle = gradient; 525 context.fillRect(0, 0, width, height); 526 527 // Apply the mask to keep just the inner shape of the glyph. 528 _applyImageMask(context, image); 529 530 if (!ignoreCache) { 531 const storageKey = storageKeyPrefix + canvasIdentifierCallback(state); 532 saveImageToStorage(storageKey, context, scaledWidth, scaledHeight, imageVersion); 533 } 534 535 context.restore(); 536 } 537 538 function generateLegacyImage() 539 { 540 const depth = 1 * scaleFactor; 541 const shadowDepth = depth; 542 const shadowBlur = depth - 1; 543 const glowBlur = 2; 544 545 const context = document.getCSSCanvasContext("2d", canvasIdentifierCallback(state), scaledWidth, scaledHeight); 546 context.save(); 547 context.scale(scaleFactor, scaleFactor); 548 549 context.clearRect(0, 0, width, height); 550 551 if (depth > 0) { 552 // Use scratch canvas so we can apply the draw the white drop shadow 553 // to the whole glyph at the end. 554 555 var scratchCanvas = document.createElement("canvas"); 556 scratchCanvas.width = scaledWidth; 557 scratchCanvas.height = scaledHeight; 558 559 var scratchContext = scratchCanvas.getContext("2d"); 560 scratchContext.scale(scaleFactor, scaleFactor); 561 } else 562 var scratchContext = context; 563 564 var gradient = scratchContext.createLinearGradient(0, 0, 0, height); 565 if (state === states.Active) { 566 gradient.addColorStop(0, "rgb(60, 60, 60)"); 567 gradient.addColorStop(1, "rgb(100, 100, 100)"); 568 } else if (state === states.Focus) { 569 gradient.addColorStop(0, "rgb(50, 135, 200)"); 570 gradient.addColorStop(1, "rgb(60, 155, 225)"); 571 } else if (state === states.ActiveFocus) { 572 gradient.addColorStop(0, "rgb(30, 115, 185)"); 573 gradient.addColorStop(1, "rgb(40, 135, 200)"); 574 } else { 575 gradient.addColorStop(0, "rgb(90, 90, 90)"); 576 gradient.addColorStop(1, "rgb(145, 145, 145)"); 577 } 578 579 scratchContext.fillStyle = gradient; 580 scratchContext.fillRect(0, 0, width, height); 581 582 if (depth > 0) { 583 // Invert the image to use as a reverse image mask for the inner shadows. 584 // Pass in the color to use for the opaque areas to prevent "black halos" 585 // later when applying the final image mask. 586 587 if (state === states.Active) 588 var invertedImage = _invertMaskImage(image, 60, 60, 60); 589 else if (state === states.Focus) 590 var invertedImage = _invertMaskImage(image, 45, 145, 210); 591 else if (state === states.ActiveFocus) 592 var invertedImage = _invertMaskImage(image, 35, 125, 195); 593 else 594 var invertedImage = _invertMaskImage(image, 90, 90, 90); 595 596 if (state === states.Focus) { 597 // Double draw the blurry inner shadow to get the right effect. 598 _drawImageShadow(scratchContext, 0, 0, shadowDepth, "rgb(10, 95, 150)", invertedImage); 599 _drawImageShadow(scratchContext, 0, 0, shadowDepth, "rgb(10, 95, 150)", invertedImage); 600 601 // Draw the inner shadow. 602 _drawImageShadow(scratchContext, 0, shadowDepth, shadowBlur, "rgb(0, 80, 170)", invertedImage); 603 } else if (state === states.ActiveFocus) { 604 // Double draw the blurry inner shadow to get the right effect. 605 _drawImageShadow(scratchContext, 0, 0, shadowDepth, "rgb(0, 80, 100)", invertedImage); 606 _drawImageShadow(scratchContext, 0, 0, shadowDepth, "rgb(0, 80, 100)", invertedImage); 607 608 // Draw the inner shadow. 609 _drawImageShadow(scratchContext, 0, shadowDepth, shadowBlur, "rgb(0, 65, 150)", invertedImage); 610 } else { 611 // Double draw the blurry inner shadow to get the right effect. 612 _drawImageShadow(scratchContext, 0, 0, shadowDepth, "rgba(0, 0, 0, 1)", invertedImage); 613 _drawImageShadow(scratchContext, 0, 0, shadowDepth, "rgba(0, 0, 0, 1)", invertedImage); 614 615 // Draw the inner shadow. 616 _drawImageShadow(scratchContext, 0, shadowDepth, shadowBlur, "rgba(0, 0, 0, 0.6)", invertedImage); 617 } 618 } 619 620 // Apply the mask to keep just the inner shape of the glyph. 621 _applyImageMask(scratchContext, image); 622 623 // Draw the white drop shadow. 624 if (depth > 0) 625 _drawImageShadow(context, 0, shadowDepth, shadowBlur, "rgba(255, 255, 255, 0.6)", scratchCanvas); 626 627 // Draw a subtle glow for the focus states. 628 if (state === states.Focus || state === states.ActiveFocus) 629 _drawImageShadow(context, 0, 0, glowBlur, "rgba(20, 100, 220, 0.4)", scratchCanvas); 630 631 if (!ignoreCache) { 632 const storageKey = storageKeyPrefix + canvasIdentifierCallback(state); 633 saveImageToStorage(storageKey, context, scaledWidth, scaledHeight, imageVersion); 634 } 635 636 context.restore(); 637 } 638 639 if (WebInspector.Platform.isLegacyMacOS) 640 generateLegacyImage(); 641 else 642 generateModernImage(); 494 const context = document.getCSSCanvasContext("2d", canvasIdentifierCallback(state), scaledWidth, scaledHeight); 495 context.save(); 496 context.scale(scaleFactor, scaleFactor); 497 498 context.clearRect(0, 0, width, height); 499 500 var gradient = context.createLinearGradient(0, 0, 0, height); 501 if (state === states.Active) { 502 gradient.addColorStop(0, "rgb(65, 65, 65)"); 503 gradient.addColorStop(1, "rgb(70, 70, 70)"); 504 } else if (state === states.Focus) { 505 gradient.addColorStop(0, "rgb(0, 123, 247)"); 506 gradient.addColorStop(1, "rgb(0, 128, 252)"); 507 } else if (state === states.ActiveFocus) { 508 gradient.addColorStop(0, "rgb(0, 62, 210)"); 509 gradient.addColorStop(1, "rgb(0, 67, 215)"); 510 } else { 511 gradient.addColorStop(0, "rgb(75, 75, 75)"); 512 gradient.addColorStop(1, "rgb(80, 80, 80)"); 513 } 514 515 context.fillStyle = gradient; 516 context.fillRect(0, 0, width, height); 517 518 // Apply the mask to keep just the inner shape of the glyph. 519 _applyImageMask(context, image); 520 521 if (!ignoreCache) { 522 const storageKey = storageKeyPrefix + canvasIdentifierCallback(state); 523 saveImageToStorage(storageKey, context, scaledWidth, scaledHeight, imageVersion); 524 } 525 526 context.restore(); 643 527 } 644 528 -
trunk/Source/WebInspectorUI/UserInterface/Base/Main.js
r183468 r183579 185 185 if (WebInspector.Platform.isNightlyBuild) 186 186 document.body.classList.add("nightly-build"); 187 if (WebInspector.Platform.isLegacyMacOS)188 document.body.classList.add("legacy");189 187 if (WebInspector.Platform.version.name) 190 188 document.body.classList.add(WebInspector.Platform.version.name); … … 255 253 this.stepOutAlternateKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Shift | WebInspector.KeyboardShortcut.Modifier.CommandOrControl, WebInspector.KeyboardShortcut.Key.Semicolon, this.debuggerStepOut.bind(this)); 256 254 257 this._closeToolbarButton = new WebInspector.ControlToolbarItem("dock-close", WebInspector.UIString("Close"), platformImagePath("Close.svg"), 16, 14);255 this._closeToolbarButton = new WebInspector.ControlToolbarItem("dock-close", WebInspector.UIString("Close"), "Images/Close.svg", 16, 14); 258 256 this._closeToolbarButton.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this.close, this); 259 257 … … 1233 1231 WebInspector._updateToolbarHeight = function() 1234 1232 { 1235 if (WebInspector.Platform. isLegacyMacOS)1233 if (WebInspector.Platform.name === "mac" && WebInspector.Platform.version.release < 10) 1236 1234 InspectorFrontendHost.setToolbarHeight(this.toolbar.element.offsetHeight); 1237 1235 }; -
trunk/Source/WebInspectorUI/UserInterface/Base/Platform.js
r179911 r183579 26 26 WebInspector.Platform = { 27 27 name: InspectorFrontendHost.platform(), 28 isLegacyMacOS: false,29 28 isNightlyBuild: false, 30 29 version: { … … 52 51 WebInspector.Platform.version.name = "mavericks"; 53 52 WebInspector.Platform.version.release = 9; 54 WebInspector.Platform.isLegacyMacOS = true;55 53 break; 56 54 case "8": 57 55 WebInspector.Platform.version.name = "mountain-lion"; 58 56 WebInspector.Platform.version.release = 8; 59 WebInspector.Platform.isLegacyMacOS = true;60 57 break; 61 58 default: -
trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js
r183469 r183579 443 443 oldRecording.unloaded(); 444 444 445 this._legacyFirstRecordedTimestamp = NaN;446 445 this._activeRecording = newRecording; 447 446 this.dispatchEventToListeners(WebInspector.TimelineManager.Event.RecordingLoaded, {oldRecording}); -
trunk/Source/WebInspectorUI/UserInterface/Views/ButtonNavigationItem.css
r173715 r183579 43 43 } 44 44 45 body.mac-platform.legacy .navigation-bar .item.button.text-only {46 padding: 0 10px;47 margin: 0;48 49 text-shadow: rgba(255, 255, 255, 0.5) 0 1px 0;50 line-height: 20px;51 border: none;52 text-align: inherit;53 height: 28px;54 }55 56 45 .navigation-bar .item.button > .glyph { 57 46 width: 100%; -
trunk/Source/WebInspectorUI/UserInterface/Views/ButtonToolbarItem.css
r183338 r183579 79 79 } 80 80 81 body.mac-platform.legacy .toolbar .item.button > .label {82 text-shadow: rgba(255, 255, 255, 0.5) 0 1px 0;83 color: rgb(60, 60, 60);84 }85 86 81 .toolbar.label-only .item.activate.button.activated > .label { 87 82 color: rgb(35, 125, 195); -
trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.css
r176494 r183579 34 34 } 35 35 36 body.mac-platform.legacy .style-declaration-section {37 border-bottom: none;38 }39 40 body.mac-platform.legacy .style-declaration-section + .style-declaration-section {41 border-top: 1px solid rgb(179, 179, 179);42 }43 44 36 .style-declaration-section.last-in-group { 45 37 margin-bottom: 15px; … … 48 40 } 49 41 50 body.mac-platform.legacy .style-declaration-section.last-in-group {51 box-shadow: rgba(0, 0, 0, 0.3) 0 2px 2px 0;52 }53 54 42 .style-declaration-section.last-in-group + .style-declaration-section { 55 43 margin-top: 15px; 56 44 57 45 border-top: 1px solid rgb(179, 179, 179); 58 }59 60 body.mac-platform.legacy .style-declaration-section.last-in-group + .style-declaration-section {61 box-shadow: rgba(0, 0, 0, 0.3) 0 0 2px 0;62 border-top: none;63 }64 65 body.mac-platform.legacy .style-declaration-section:first-child,66 body.mac-platform.legacy div:not(.style-declaration-section) + .style-declaration-section,67 body.mac-platform.legacy .style-declaration-section.last-in-group + .style-declaration-section:matches(.last-in-group, :last-child) {68 box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px 1px;69 46 } 70 47 -
trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDetailsSidebarPanel.css
r173715 r183579 43 43 } 44 44 45 body.mac-platform.legacy .sidebar > .panel.details.css-style > .content {46 top: 22px;47 }48 49 45 .sidebar > .panel.details.css-style > .content > .pseudo-classes { 50 46 padding: 10px; -
trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js
r183331 r183579 58 58 this._forwardKeyboardShortcut.disabled = true; 59 59 60 var forwardArrow, backArrow; 61 if (WebInspector.Platform.isLegacyMacOS) { 62 forwardArrow = {src: "Images/Legacy/ForwardArrow.svg", width: 9, height: 9}; 63 backArrow = {src: "Images/Legacy/BackArrow.svg", width: 9, height: 9}; 64 } else { 65 forwardArrow = {src: "Images/ForwardArrow.svg", width: 8, height: 13}; 66 backArrow = {src: "Images/BackArrow.svg", width: 8, height: 13}; 67 } 68 69 this._backButtonNavigationItem = new WebInspector.ButtonNavigationItem("back", WebInspector.UIString("Back (%s)").format(this._backKeyboardShortcut.displayName), backArrow.src, backArrow.width, backArrow.height); 60 this._backButtonNavigationItem = new WebInspector.ButtonNavigationItem("back", WebInspector.UIString("Back (%s)").format(this._backKeyboardShortcut.displayName), "Images/BackArrow.svg", 8, 13); 70 61 this._backButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._backButtonClicked, this); 71 62 this._backButtonNavigationItem.enabled = false; 72 63 this._navigationBar.addNavigationItem(this._backButtonNavigationItem); 73 64 74 this._forwardButtonNavigationItem = new WebInspector.ButtonNavigationItem("forward", WebInspector.UIString("Forward (%s)").format(this._forwardKeyboardShortcut.displayName), forwardArrow.src, forwardArrow.width, forwardArrow.height);65 this._forwardButtonNavigationItem = new WebInspector.ButtonNavigationItem("forward", WebInspector.UIString("Forward (%s)").format(this._forwardKeyboardShortcut.displayName), "Images/ForwardArrow.svg", 8, 13); 75 66 this._forwardButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._forwardButtonClicked, this); 76 67 this._forwardButtonNavigationItem.enabled = false; -
trunk/Source/WebInspectorUI/UserInterface/Views/ControlToolbarItem.css
r176494 r183579 33 33 } 34 34 35 body.mac-platform.legacy .toolbar .item.control {36 opacity: 0.5;37 }38 39 35 .toolbar.small-size .item.control { 40 36 padding: 2px; … … 47 43 .toolbar .item.control:hover { 48 44 opacity: 0.9; 49 }50 51 body.mac-platform.legacy .toolbar .item.control:hover {52 opacity: 0.8;53 45 } 54 46 -
trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js
r183331 r183579 30 30 WebInspector.ContentView.call(this, representedObject); 31 31 32 var layerBordersImage, shadowDOMImage; 33 if (WebInspector.Platform.isLegacyMacOS) { 34 layerBordersImage = {src: "Images/Legacy/LayerBorders.svg", width: 16, height: 16}; 35 shadowDOMImage = {src: "Images/Legacy/ShadowDOM.svg", width: 16, height: 16}; 36 } else { 37 layerBordersImage = {src: "Images/LayerBorders.svg", width: 13, height: 13}; 38 shadowDOMImage = {src: "Images/ShadowDOM.svg", width: 13, height: 13}; 39 } 40 41 this._compositingBordersButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("layer-borders", WebInspector.UIString("Show compositing borders"), WebInspector.UIString("Hide compositing borders"), layerBordersImage.src, layerBordersImage.width, layerBordersImage.height); 32 this._compositingBordersButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("layer-borders", WebInspector.UIString("Show compositing borders"), WebInspector.UIString("Hide compositing borders"), "Images/LayerBorders.svg", 13, 13); 42 33 this._compositingBordersButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._toggleCompositingBorders, this); 43 34 this._compositingBordersButtonNavigationItem.enabled = !!PageAgent.getCompositingBordersVisible; … … 50 41 51 42 WebInspector.showShadowDOMSetting.addEventListener(WebInspector.Setting.Event.Changed, this._showShadowDOMSettingChanged, this); 52 this._showsShadowDOMButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("shows-shadow-DOM", WebInspector.UIString("Show shadow DOM nodes"), WebInspector.UIString("Hide shadow DOM nodes"), shadowDOMImage.src, shadowDOMImage.width, shadowDOMImage.height);43 this._showsShadowDOMButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("shows-shadow-DOM", WebInspector.UIString("Show shadow DOM nodes"), WebInspector.UIString("Hide shadow DOM nodes"), "Images/ShadowDOM.svg", 13, 13); 53 44 this._showsShadowDOMButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._toggleShowsShadowDOMSetting, this); 54 45 this._showShadowDOMSettingChanged(); -
trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.css
r183062 r183579 49 49 } 50 50 51 body.mac-platform.legacy .dom-tree-outline li.hovered:not(.selected) .selection {52 background-color: rgba(56, 121, 217, 0.1);53 }54 55 51 .dom-tree-outline li .selection { 56 52 display: none; … … 73 69 } 74 70 75 body.mac-platform.legacy .dom-tree-outline li.elements-drag-over .selection {76 border-top: 2px solid rgb(56, 121, 217);77 }78 79 71 .dom-tree-outline:focus li.selected .selection { 80 72 background-color: rgb(0, 128, 252); 81 }82 83 body.mac-platform.legacy .dom-tree-outline:focus li.selected .selection {84 background-color: rgb(56, 121, 217);85 73 } 86 74 -
trunk/Source/WebInspectorUI/UserInterface/Views/DashboardContainerView.css
r183338 r183579 41 41 } 42 42 43 body.mac-platform.legacy .toolbar .dashboard-container {44 border: 1px solid rgb(163, 163, 163);45 background-color: transparent;46 box-shadow: rgba(255, 255, 255, 0.45) 0 0px 0;47 }48 49 43 body.window-inactive .toolbar .dashboard-container { 50 44 border: 1px solid rgb(220, 220, 220); 51 45 background-color: rgb(246, 246, 246); 52 46 box-shadow: none; 53 }54 55 body.mac-platform.legacy.window-inactive .toolbar .dashboard-container {56 border: 1px solid rgb(196, 196, 196);57 background-image: none;58 background-color: rgb(239, 239, 239);59 box-shadow: rgba(255, 255, 255, 0.45) 0 1px 0;60 47 } 61 48 … … 97 84 body.window-inactive .toolbar .dashboard { 98 85 background-color: rgb(246, 246, 246); 99 box-shadow: none;100 }101 102 body.mac-platform.legacy .toolbar .dashboard,103 body.mac-platform.legacy.window-inactive .toolbar .dashboard {104 background-image: linear-gradient(to bottom, rgba(0, 128, 255, 0), rgba(0, 128, 255, 0.075)),105 linear-gradient(to right, rgba(0, 0, 0, 0.09), transparent, rgba(0, 0, 0, 0.09)),106 linear-gradient(to bottom, rgb(240, 244, 251), rgb(250, 253, 255));107 background-size: 100% 6px, auto, auto;108 background-position: bottom, center, center;109 background-repeat: no-repeat;110 background-color: transparent;111 86 box-shadow: none; 112 87 } … … 173 148 } 174 149 175 body.mac-platform.legacy .dashboard-container .advance-arrow {176 background-image: url(../Images/Legacy/UpDownArrows.svg);177 }178 179 150 .dashboard-container .advance-arrow:hover { 180 151 opacity: 0.8; -
trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.css
r181903 r183579 147 147 } 148 148 149 body.mac-platform.legacy .data-grid:focus tr.selected td:not(:last-child) {150 border-right-color: rgb(53, 109, 189);151 }152 153 149 .data-grid :matches(th, td) > div { 154 150 white-space: nowrap; … … 253 249 } 254 250 255 body.mac-platform.legacy .data-grid:focus tr.selected {256 background-color: rgb(56, 121, 217) !important;257 }258 259 251 .data-grid tr:not(.parent) td.disclosure { 260 252 text-indent: 10px; -
trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js
r182990 r183579 1099 1099 WebInspector.DataGrid._generatedSortIndicatorImages = true; 1100 1100 1101 var specifications = {}; 1102 1103 if (WebInspector.Platform.isLegacyMacOS) { 1104 specifications["arrow"] = { 1105 fillColor: [81, 81, 81], 1106 shadowColor: [255, 255, 255, 0.5], 1107 shadowOffsetX: 0, 1108 shadowOffsetY: 1, 1109 shadowBlur: 0 1110 }; 1111 } else { 1112 specifications["arrow"] = { 1113 fillColor: [81, 81, 81], 1114 }; 1115 } 1116 1117 generateColoredImagesForCSS(platformImagePath("SortIndicatorDownArrow.svg"), specifications, 9, 8, "data-grid-sort-indicator-down-"); 1118 generateColoredImagesForCSS(platformImagePath("SortIndicatorUpArrow.svg"), specifications, 9, 8, "data-grid-sort-indicator-up-"); 1101 var specifications = {arrow: { 1102 fillColor: [81, 81, 81], 1103 }}; 1104 1105 generateColoredImagesForCSS("Images/SortIndicatorDownArrow.svg", specifications, 9, 8, "data-grid-sort-indicator-down-"); 1106 generateColoredImagesForCSS("Images/SortIndicatorUpArrow.svg", specifications, 9, 8, "data-grid-sort-indicator-up-"); 1119 1107 }, 1120 1108 -
trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseTableContentView.js
r183326 r183579 30 30 this.element.classList.add(WebInspector.DatabaseTableContentView.StyleClassName); 31 31 32 var refreshSource, refreshSize; 33 if (WebInspector.Platform.isLegacyMacOS) { 34 refreshSource = "Images/Legacy/Reload.svg"; 35 refreshSize = 16; 36 } else { 37 refreshSource = "Images/ReloadFull.svg"; 38 refreshSize = 13; 39 } 40 41 this._refreshButtonNavigationItem = new WebInspector.ButtonNavigationItem("database-table-refresh", WebInspector.UIString("Refresh"), refreshSource, refreshSize, refreshSize); 32 this._refreshButtonNavigationItem = new WebInspector.ButtonNavigationItem("database-table-refresh", WebInspector.UIString("Refresh"), "Images/ReloadFull.svg", 13, 13); 42 33 this._refreshButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._refreshButtonClicked, this); 43 34 -
trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerDashboardView.js
r183330 r183579 35 35 this.element.appendChild(this._navigationBar.element); 36 36 37 var resumeImage;38 if (WebInspector.Platform.isLegacyMacOS)39 resumeImage = {src: "Images/Legacy/Resume.svg", width: 16, height: 16};40 else41 resumeImage = {src: "Images/Resume.svg", width: 15, height: 15};42 43 37 var tooltip = WebInspector.UIString("Continue script execution (%s or %s)").format(WebInspector.pauseOrResumeKeyboardShortcut.displayName, WebInspector.pauseOrResumeAlternateKeyboardShortcut.displayName); 44 this._debuggerResumeButtonItem = new WebInspector.ActivateButtonNavigationItem("debugger-dashboard-pause", tooltip, tooltip, resumeImage.src, resumeImage.width, resumeImage.height, true);38 this._debuggerResumeButtonItem = new WebInspector.ActivateButtonNavigationItem("debugger-dashboard-pause", tooltip, tooltip, "Images/Resume.svg", 15, 15, true); 45 39 this._debuggerResumeButtonItem.activated = true; 46 40 this._debuggerResumeButtonItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._resumeButtonClicked, this); -
trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.css
r182939 r183579 26 26 .sidebar > .panel.navigation.debugger > .content { 27 27 top: 29px; 28 }29 30 body.mac-platform.legacy .sidebar > .panel.navigation.debugger > .content {31 top: 22px;32 28 } 33 29 -
trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js
r183375 r183579 49 49 this.element.appendChild(this._navigationBar.element); 50 50 51 var imageSize = WebInspector.Platform.isLegacyMacOS ? 16 : 15; 52 53 var breakpointsImage = {src: platformImagePath("Breakpoints.svg"), width: imageSize, height: imageSize}; 54 var pauseImage = {src: platformImagePath("Pause.svg"), width: imageSize, height: imageSize}; 55 var resumeImage = {src: platformImagePath("Resume.svg"), width: imageSize, height: imageSize}; 56 var stepOverImage = {src: platformImagePath("StepOver.svg"), width: imageSize, height: imageSize}; 57 var stepIntoImage = {src: platformImagePath("StepInto.svg"), width: imageSize, height: imageSize}; 58 var stepOutImage = {src: platformImagePath("StepOut.svg"), width: imageSize, height: imageSize}; 51 var breakpointsImage = {src: "Images/Breakpoints.svg", width: 15, height: 15}; 52 var pauseImage = {src: "Images/Pause.svg", width: 15, height: 15}; 53 var resumeImage = {src: "Images/Resume.svg", width: 15, height: 15}; 54 var stepOverImage = {src: "Images/StepOver.svg", width: 15, height: 15}; 55 var stepIntoImage = {src: "Images/StepInto.svg", width: 15, height: 15}; 56 var stepOutImage = {src: "Images/StepOut.svg", width: 15, height: 15}; 59 57 60 58 var toolTip = WebInspector.UIString("Enable all breakpoints (%s)").format(WebInspector.toggleBreakpointsKeyboardShortcut.displayName); … … 128 126 }; 129 127 130 this.filterBar.addFilterBarButton("debugger-show-resources-with-breakpoints-only", showResourcesWithBreakpointsOnlyFilterFunction, true, WebInspector.UIString("Show only resources with breakpoints."), WebInspector.UIString("Show resources with and without breakpoints."), platformImagePath("Breakpoints.svg"), 15, 15);131 this.filterBar.addFilterBarButton("debugger-show-resources-with-issues-only", showResourcesWithIssuesOnlyFilterFunction, true, WebInspector.UIString("Show only resources with issues."), WebInspector.UIString("Show resources with and without issues."), platformImagePath("Errors.svg"), 15, 15);128 this.filterBar.addFilterBarButton("debugger-show-resources-with-breakpoints-only", showResourcesWithBreakpointsOnlyFilterFunction, true, WebInspector.UIString("Show only resources with breakpoints."), WebInspector.UIString("Show resources with and without breakpoints."), "Images/Breakpoints.svg", 15, 15); 129 this.filterBar.addFilterBarButton("debugger-show-resources-with-issues-only", showResourcesWithIssuesOnlyFilterFunction, true, WebInspector.UIString("Show only resources with issues."), WebInspector.UIString("Show resources with and without issues."), "Images/Errors.svg", 15, 15); 132 130 133 131 this._breakpointsContentTreeOutline = this.contentTreeOutline; -
trunk/Source/WebInspectorUI/UserInterface/Views/DefaultDashboardView.css
r183328 r183579 52 52 border-radius: 4px; 53 53 border: 1px solid transparent; 54 }55 56 body.mac-platform.legacy .toolbar .dashboard.default > .item {57 font-family: -webkit-system-font, sans-serif;58 font-weight: bold;59 54 } 60 55 … … 120 115 } 121 116 122 body.mac-platform.legacy .toolbar .dashboard.default > .resourcesCount > img {123 content: url(../Images/Legacy/Resources.svg);124 }125 126 body.mac-platform.legacy .toolbar .dashboard.default > .logs > img {127 content: url(../Images/Legacy/Logs.svg);128 }129 130 body.mac-platform.legacy .toolbar .dashboard.default > .errors > img {131 content: url(../Images/Legacy/Errors.svg);132 }133 134 body.mac-platform.legacy .toolbar .dashboard.default > .errors.enabled > img {135 content: url(../Images/Legacy/ErrorsEnabled.svg);136 }137 138 117 .toolbar .dashboard.default > .errors.enabled:hover > img { 139 118 opacity: 1; … … 155 134 content: url(../Images/IssuesEnabled.svg); 156 135 opacity: 0.9; 157 }158 159 body.mac-platform.legacy .toolbar .dashboard.default > .issues > img {160 content: url(../Images/Legacy/Issues.svg);161 }162 163 body.mac-platform.legacy .toolbar .dashboard.default > .issues.enabled > img {164 content: url(../Images/Legacy/IssuesEnabled.svg);165 136 } 166 137 -
trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSection.css
r181723 r183579 30 30 } 31 31 32 body.mac-platform.legacy .details-section {33 margin-top: -1px;34 margin-bottom: -1px;35 36 border-bottom: none;37 background-color: transparent;38 }39 40 32 .details-section .details-section { 41 33 background-color: rgb(255, 255, 255); 42 34 } 43 35 44 body.mac-platform.legacy .details-section .details-section {45 background-color: transparent;46 }47 48 36 .details-section .details-section:last-child { 49 37 border-bottom: none; … … 52 40 .details-section .details-section:first-child { 53 41 border-top: 1px solid rgb(179, 179, 179); 54 }55 56 body.mac-platform.legacy .details-section .details-section:first-child {57 border-top: none;58 42 } 59 43 … … 79 63 } 80 64 81 body.mac-platform.legacy .details-section > .header {82 border-bottom: 1px solid rgb(179, 179, 179);83 box-shadow: inset rgba(255, 255, 255, 0.2) 0 1px 0;84 background-color: transparent;85 background-image: linear-gradient(to bottom, rgb(238, 240, 244), rgb(224, 226, 230));86 87 border-top: 1px solid rgb(179, 179, 179);88 89 text-shadow: rgba(255, 255, 255, 0.5) 0 1px 0;90 }91 92 65 .details-section .details-section > .header { 93 66 top: 21px; … … 102 75 } 103 76 104 body.mac-platform.legacy .details-section .details-section > .header {105 background-color: transparent;106 background-image: linear-gradient(to bottom, rgb(250, 250, 250), rgb(240, 240, 240));107 box-shadow: none;108 }109 110 body.mac-platform.legacy .details-section .details-section.collapsed > .header {111 box-shadow: none;112 }113 114 body.mac-platform.legacy .details-section:not(.collapsed) .data-grid.inline {115 border-top: none;116 }117 118 77 .details-section.computed-style-properties:not(.collapsed) > .header { 119 78 background-color: rgb(255, 255, 255); 120 }121 122 body.mac-platform.legacy .details-section.computed-style-properties:not(.collapsed) > .header {123 background-color: transparent;124 79 } 125 80 … … 194 149 } 195 150 196 body.mac-platform.legacy .details-section > .content > .group {197 border-bottom: none;198 }199 200 151 .details-section > .content > .group:last-child { 201 152 border-bottom: none; … … 206 157 } 207 158 208 body.mac-platform.legacy .details-section > .content > .group:nth-child(even) {209 background-color: rgb(222, 222, 222);210 }211 212 159 .details-section > .content > .group:nth-child(even) > .row:matches(.simple:first-child > *, :not(.simple):first-child) { 213 160 border-top: 1px solid rgb(179, 179, 179); 214 }215 216 body.mac-platform.legacy .details-section > .content > .group:matches(:nth-child(even), :last-child) > .row:not(.simple):last-child,217 body.mac-platform.legacy .details-section > .content > .group:matches(:nth-child(even), :last-child) > .row.simple:last-child > * {218 border-bottom: 1px solid rgb(179, 179, 179);219 161 } 220 162 … … 293 235 } 294 236 295 body.mac-platform.legacy .details-section > .content > .group > .row:matches(.empty, .text) {296 padding: 6px;297 }298 299 237 .details-section > .content > .group > .row.text { 300 238 -webkit-user-select: text; -
trunk/Source/WebInspectorUI/UserInterface/Views/DividerNavigationItem.css
r171885 r183579 32 32 background-position: center; 33 33 } 34 35 body.mac-platform.legacy .navigation-bar .item.divider {36 background-size: 100% 13px;37 } -
trunk/Source/WebInspectorUI/UserInterface/Views/FilterBar.css
r181872 r183579 33 33 } 34 34 35 body.mac-platform.legacy .filter-bar {36 height: 21px;37 }38 39 35 .filter-bar > .navigation-bar > .item { 40 36 padding: 0 0 3px 8px; … … 60 56 } 61 57 62 body.mac-platform.legacy .filter-bar > input[type="search"] {63 border: 1px solid rgba(0, 0, 0, 0.35);64 border-radius: 10px;65 box-shadow: inset rgba(0, 0, 0, 0.1) 0 1px 0;66 67 height: 19px;68 transition: background-color 200ms ease-in-out;69 }70 71 58 .filter-bar > input[type="search"]::-webkit-input-placeholder { 72 59 color: rgba(0, 0, 0, 0.35); … … 88 75 -webkit-appearance: none; 89 76 } 90 91 body.mac-platform.legacy .filter-bar > input[type="search"]::-webkit-search-decoration {92 background-image: url(../Images/Legacy/FilterFieldGlyph.svg);93 } -
trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css
r182976 r183579 94 94 } 95 95 96 body.mac-platform.legacy .find-banner > input[type="search"] {97 box-shadow: inset rgba(0, 0, 0, 0.1) 0 1px 0;98 }99 100 96 .find-banner > button { 101 97 margin: 1px 4px; … … 128 124 width: 7px; 129 125 height: 11px; 130 }131 132 body.mac-platform.legacy .find-banner > button > .glyph {133 height: 7px;134 126 } 135 127 … … 165 157 } 166 158 167 body.mac-platform.legacy .find-banner > button.segmented.left > .glyph {168 background-size: 7px 7px;169 }170 171 159 .find-banner > button.segmented.left:active:not(:disabled) > .glyph { 172 160 background-image: -webkit-canvas(find-banner-previous-arrow-normal-active); … … 189 177 } 190 178 191 body.mac-platform.legacy .find-banner > button.segmented.right > .glyph {192 background-size: 7px 7px;193 }194 195 179 .find-banner > button.segmented.right:active:not(:disabled) > .glyph { 196 180 background-image: -webkit-canvas(find-banner-next-arrow-normal-active); … … 201 185 padding-top: 3px; 202 186 padding-bottom: 2px; 203 }204 205 body.mac-platform.legacy .find-banner > button.segmented {206 padding-top: 2px;207 padding-bottom: 3px;208 187 } 209 188 -
trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.js
r183324 r183579 326 326 specifications["normal-active"] = {fillColor: [37, 37, 37]}; 327 327 328 var forwardArrow, backArrow; 329 if (WebInspector.Platform.isLegacyMacOS) { 330 forwardArrow = {src: "Images/Legacy/ForwardArrow.svg", width: 7, height: 7}; 331 backArrow = {src: "Images/Legacy/BackArrow.svg", width: 7, height: 7}; 332 } else { 333 forwardArrow = {src: "Images/ForwardArrow.svg", width: 7, height: 11}; 334 backArrow = {src: "Images/BackArrow.svg", width: 7, height: 11}; 335 } 336 337 generateColoredImagesForCSS(backArrow.src, specifications, backArrow.width, backArrow.height, "find-banner-previous-arrow-"); 338 generateColoredImagesForCSS(forwardArrow.src, specifications, forwardArrow.width, forwardArrow.height, "find-banner-next-arrow-"); 328 generateColoredImagesForCSS("Images/BackArrow.svg", specifications, 7, 11, "find-banner-previous-arrow-"); 329 generateColoredImagesForCSS("Images/ForwardArrow.svg", specifications, 7, 11, "find-banner-next-arrow-"); 339 330 } 340 331 }; -
trunk/Source/WebInspectorUI/UserInterface/Views/FolderIcon.css
r172379 r183579 27 27 content: -webkit-image-set(url(../Images/FolderGeneric.png) 1x, url(../Images/FolderGeneric@2x.png) 2x); 28 28 } 29 30 body.mac-platform.legacy .folder-icon .icon {31 content: -webkit-image-set(url(../Images/Legacy/FolderGeneric.png) 1x, url(../Images/Legacy/FolderGeneric@2x.png) 2x);32 } -
trunk/Source/WebInspectorUI/UserInterface/Views/HierarchicalPathComponent.css
r173707 r183579 67 67 } 68 68 69 body.mac-platform.legacy .hierarchical-path-component > .selector-arrows {70 content: url(../Images/Legacy/UpDownArrows.svg);71 }72 73 69 .hierarchical-path-component > .title { 74 70 display: flex; -
trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js
r181930 r183579 74 74 this._fetchMoreData(); 75 75 76 var refreshSource, refreshSize; 77 if (WebInspector.Platform.isLegacyMacOS) { 78 refreshSource = "Images/Legacy/Reload.svg"; 79 refreshSize = 16; 80 } else { 81 refreshSource = "Images/ReloadFull.svg"; 82 refreshSize = 13; 83 } 84 85 this._refreshButtonNavigationItem = new WebInspector.ButtonNavigationItem("indexed-database-object-store-refresh", WebInspector.UIString("Refresh"), refreshSource, refreshSize, refreshSize); 76 this._refreshButtonNavigationItem = new WebInspector.ButtonNavigationItem("indexed-database-object-store-refresh", WebInspector.UIString("Refresh"), "Images/ReloadFull.svg", 13, 13); 86 77 this._refreshButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._refreshButtonClicked, this); 87 78 }; -
trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.css
r176610 r183579 26 26 .sidebar > .panel.details.layer-tree > .content { 27 27 bottom: 28px; 28 }29 30 body.mac-platform.legacy .sidebar > .panel.details.layer-tree > .content {31 bottom: 22px;32 28 } 33 29 … … 67 63 } 68 64 69 body.mac-platform.legacy .panel.details.layer-tree .bottom-bar {70 height: 23px;71 }72 73 65 .panel.details.layer-tree .bottom-bar > div { 74 66 padding: 4px 6px; … … 84 76 } 85 77 86 body.mac-platform.legacy .panel.details.layer-tree .bottom-bar > div {87 line-height: inherit;88 text-shadow: rgba(255, 255, 255, 0.5) 0 1px 0;89 }90 91 78 .panel.details.layer-tree .layers-memory-label { 92 79 justify-content: flex-end; … … 95 82 .layer-tree-popover { 96 83 padding: 5px; 97 }98 99 body.mac-platform.legacy .layer-tree-popover {100 text-shadow: rgba(255, 255, 255, 0.5) 0 1px 0;101 84 } 102 85 -
trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.css
r182973 r183579 155 155 } 156 156 157 body.mac-platform.legacy .search-bar.log-search-bar > input[type="search"] {158 padding-left: 0;159 }160 161 157 .search-in-progress .console-item.filtered-out-by-search { 162 158 display: none; -
trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js
r183346 r183579 69 69 this._scopeBar.addEventListener(WebInspector.ScopeBar.Event.SelectionChanged, this._scopeBarSelectionDidChange, this); 70 70 71 var trashImage; 72 if (WebInspector.Platform.isLegacyMacOS) 73 trashImage = {src: "Images/Legacy/NavigationItemTrash.svg", width: 16, height: 16}; 74 else 75 trashImage = {src: "Images/NavigationItemTrash.svg", width: 15, height: 15}; 76 77 this._clearLogNavigationItem = new WebInspector.ButtonNavigationItem("clear-log", WebInspector.UIString("Clear log (%s or %s)").format(this._logViewController.messagesClearKeyboardShortcut.displayName, this._logViewController.messagesAlternateClearKeyboardShortcut.displayName), trashImage.src, trashImage.width, trashImage.height); 71 this._clearLogNavigationItem = new WebInspector.ButtonNavigationItem("clear-log", WebInspector.UIString("Clear log (%s or %s)").format(this._logViewController.messagesClearKeyboardShortcut.displayName, this._logViewController.messagesAlternateClearKeyboardShortcut.displayName), "Images/NavigationItemTrash.svg", 15, 15); 78 72 this._clearLogNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._clearLog, this); 79 73 … … 81 75 82 76 var toolTip = WebInspector.UIString("Show console tab"); 83 this._showConsoleTabNavigationItem = new WebInspector.ButtonNavigationItem("show-tab", toolTip, platformImagePath("SplitToggleUp.svg"), 16, 16);77 this._showConsoleTabNavigationItem = new WebInspector.ButtonNavigationItem("show-tab", toolTip, "Images/SplitToggleUp.svg", 16, 16); 84 78 this._showConsoleTabNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._showConsoleTab, this); 85 79 -
trunk/Source/WebInspectorUI/UserInterface/Views/Main.css
r183338 r183579 58 58 } 59 59 60 body.mac-platform.legacy:not(.docked) {61 background-color: transparent;62 }63 64 60 body.docked.bottom { 65 61 border-top: 1px solid rgb(200, 200, 200); … … 76 72 body.window-inactive.docked.right { 77 73 border-left-color: rgb(219, 219, 219); 78 }79 80 body.docked.bottom.mac-platform.legacy {81 border-top-color: rgb(85, 85, 85);82 }83 84 body.docked.right.mac-platform.legacy {85 border-left-color: rgb(85, 85, 85);86 74 } 87 75 … … 165 153 166 154 background-color: rgb(242, 242, 242); 167 }168 169 body.mac-platform.legacy #split-content-browser > .navigation-bar {170 background-image: linear-gradient(to bottom, rgb(248, 248, 248), rgb(226, 226, 226));171 155 } 172 156 -
trunk/Source/WebInspectorUI/UserInterface/Views/NavigationBar.css
r182976 r183579 44 44 } 45 45 46 body.mac-platform.legacy .navigation-bar {47 height: 22px;48 }49 50 46 .navigation-bar .item { 51 47 display: flex; … … 56 52 outline: none; 57 53 } 58 59 body.mac-platform.legacy .navigation-bar .item {60 height: 21px;61 } -
trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.css
r175767 r183579 28 28 } 29 29 30 body.mac-platform.legacy .sidebar > .panel.navigation > .content {31 bottom: 22px;32 }33 34 30 .sidebar > .panel.navigation > .filter-bar { 35 31 position: absolute; … … 53 49 } 54 50 55 body.mac-platform.legacy .sidebar > .panel.navigation > .overflow-shadow {56 border-bottom: none;57 58 background-image: -webkit-radial-gradient(center, ellipse closest-side, rgba(0, 0, 0, 0.2) 25%, transparent),59 linear-gradient(to right, rgba(0, 0, 0, 0.0125), rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0.0125));60 background-size: 125% 15px, 100% 1px;61 background-position: top center, bottom center;62 background-repeat: no-repeat;63 64 height: 5px;65 bottom: 22px;66 }67 68 51 .sidebar > .panel.navigation > .overflow-shadow.top { 69 52 top: 28px; 70 53 bottom: initial; 71 }72 73 body.mac-platform.legacy .sidebar > .panel.navigation > .overflow-shadow.top {74 top: 21px;75 background-position: bottom center, top center;76 54 } 77 55 … … 89 67 } 90 68 91 body.mac-platform.legacy .sidebar > .panel.navigation > .empty-content-placeholder {92 bottom: 21px;93 }94 95 69 .sidebar > .panel.navigation > .empty-content-placeholder > .message { 96 70 display: inline-block; … … 225 199 } 226 200 227 body.mac-platform.legacy .navigation-sidebar-panel-content-tree-outline .item.selected {228 border-top: 1px solid rgb(162, 177, 201);229 230 background-color: transparent;231 background-image: linear-gradient(to bottom, rgb(175, 190, 213), rgb(130, 151, 182));232 background-origin: padding;233 background-clip: padding;234 }235 236 201 .navigation-sidebar-panel-content-tree-outline:focus .item.selected { 237 202 color: white; … … 239 204 } 240 205 241 body.mac-platform.legacy .navigation-sidebar-panel-content-tree-outline:focus .item.selected {242 background-color: transparent;243 border-top: 1px solid rgb(148, 174, 193);244 background-image: linear-gradient(to bottom, rgb(154, 180, 203), rgb(112, 139, 176));245 }246 247 206 body.window-inactive .navigation-sidebar-panel-content-tree-outline .item.selected { 248 207 background-color: rgb(212, 212, 212); 249 }250 251 body.mac-platform.legacy.window-inactive .navigation-sidebar-panel-content-tree-outline .item.selected {252 background-color: transparent;253 border-top: 1px solid rgb(168, 168, 168);254 background-image: linear-gradient(to bottom, rgb(194, 194, 194), rgb(158, 158, 158));255 208 } 256 209 -
trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js
r183375 r183579 421 421 } 422 422 423 if (WebInspector.Platform.isLegacyMacOS) 424 var edgeThreshold = 10; 425 else 426 var edgeThreshold = 1; 427 423 var edgeThreshold = 1; 428 424 var scrollTop = this.contentElement.scrollTop; 429 425 … … 558 554 559 555 var specifications = {}; 560 561 if (WebInspector.Platform.isLegacyMacOS) { 562 specifications[WebInspector.NavigationSidebarPanel.DisclosureTriangleNormalCanvasIdentifierSuffix] = { 563 fillColor: [112, 126, 139], 564 shadowColor: [255, 255, 255, 0.8], 565 shadowOffsetX: 0, 566 shadowOffsetY: 1, 567 shadowBlur: 0 568 }; 569 570 specifications[WebInspector.NavigationSidebarPanel.DisclosureTriangleSelectedCanvasIdentifierSuffix] = { 571 fillColor: [255, 255, 255], 572 shadowColor: [61, 91, 110, 0.8], 573 shadowOffsetX: 0, 574 shadowOffsetY: 1, 575 shadowBlur: 2 576 }; 577 } else { 578 specifications[WebInspector.NavigationSidebarPanel.DisclosureTriangleNormalCanvasIdentifierSuffix] = { 579 fillColor: [140, 140, 140] 580 }; 581 582 specifications[WebInspector.NavigationSidebarPanel.DisclosureTriangleSelectedCanvasIdentifierSuffix] = { 583 fillColor: [255, 255, 255] 584 }; 585 } 556 specifications[WebInspector.NavigationSidebarPanel.DisclosureTriangleNormalCanvasIdentifierSuffix] = { 557 fillColor: [140, 140, 140] 558 }; 559 560 specifications[WebInspector.NavigationSidebarPanel.DisclosureTriangleSelectedCanvasIdentifierSuffix] = { 561 fillColor: [255, 255, 255] 562 }; 586 563 587 564 generateColoredImagesForCSS("Images/DisclosureTriangleSmallOpen.svg", specifications, 13, 13, WebInspector.NavigationSidebarPanel.DisclosureTriangleOpenCanvasIdentifier); -
trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js
r183331 r183579 225 225 } 226 226 227 wrappedSVGDocument( platformImagePath("Close.svg"), null, WebInspector.UIString("Close resource view"), function(element) {227 wrappedSVGDocument("Images/Close.svg", null, WebInspector.UIString("Close resource view"), function(element) { 228 228 this._closeStatusButton = new WebInspector.TreeElementStatusButton(element); 229 229 this._closeStatusButton.addEventListener(WebInspector.TreeElementStatusButton.Event.Clicked, this._closeStatusButtonClicked, this); -
trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js
r183331 r183579 368 368 } 369 369 370 wrappedSVGDocument( platformImagePath("Close.svg"), null, WebInspector.UIString("Close resource view"), function(element) {370 wrappedSVGDocument("Images/Close.svg", null, WebInspector.UIString("Close resource view"), function(element) { 371 371 this._closeStatusButton = new WebInspector.TreeElementStatusButton(element); 372 372 this._closeStatusButton.addEventListener(WebInspector.TreeElementStatusButton.Event.Clicked, this._closeStatusButtonClicked, this); -
trunk/Source/WebInspectorUI/UserInterface/Views/Popover.js
r182040 r183579 201 201 } 202 202 203 var titleBarOffset = WebInspector.Platform.name === "mac" && !WebInspector.Platform.isLegacyMacOS? 22 : 0;203 var titleBarOffset = WebInspector.Platform.name === "mac" && WebInspector.Platform.version.release >= 10 ? 22 : 0; 204 204 var containerFrame = new WebInspector.Rect(0, titleBarOffset, window.innerWidth, window.innerHeight - titleBarOffset); 205 205 // The frame of the window with a little inset to make sure we have room for shadows. -
trunk/Source/WebInspectorUI/UserInterface/Views/ProbeDetailsSidebarPanel.css
r176610 r183579 60 60 } 61 61 62 body.mac-platform.legacy .details-section.probe-set .options > .probe-clear-samples {63 content: url(../Images/Legacy/NavigationItemTrash.svg);64 height: 16px;65 }66 67 body.mac-platform.legacy .details-section.probe-set .options > .probe-remove {68 content: url(../Images/Legacy/CloseLarge.svg);69 }70 71 body.mac-platform.legacy .details-section.probe-set .options > .probe-add {72 content: url(../Images/Legacy/Plus.svg);73 height: 11px;74 }75 76 62 .details-section.probe-set .options > input { 77 63 height: 12px; -
trunk/Source/WebInspectorUI/UserInterface/Views/QuickConsole.css
r182976 r183579 38 38 39 39 font-family: Menlo, monospace; 40 }41 42 body.mac-platform.legacy .quick-console {43 padding: 0;44 40 } 45 41 -
trunk/Source/WebInspectorUI/UserInterface/Views/RadioButtonNavigationItem.css
r171885 r183579 37 37 } 38 38 39 body.mac-platform.legacy .navigation-bar .item.radio.button.text-only:hover {40 color: rgb(0, 0, 0);41 background-color: transparent;42 }43 44 39 .navigation-bar .item.radio.button.text-only.selected { 45 40 color: white; 46 41 background-color: rgba(34, 131, 246, 1); 47 }48 49 body.mac-platform.legacy .navigation-bar .item.radio.button.text-only.selected {50 color: rgb(0, 0, 0);51 font-weight: bold;52 53 background-repeat: no-repeat;54 background-color: transparent;55 background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0.09) 12%, rgba(0, 0, 0, 0.06) 12%, transparent), linear-gradient(to bottom, rgba(0, 0, 0, 0.45), transparent),56 linear-gradient(to bottom, rgba(0, 0, 0, 0.45), transparent);57 background-size: 100% 100%, 1px 100%, 1px 100%;58 background-position: left top, left top, right top;59 42 } 60 43 … … 67 50 background-color: rgba(31, 105, 238, 1); 68 51 } 69 70 body.mac-platform.legacy .navigation-bar .item.radio.button.text-only:active,71 body.mac-platform.legacy .navigation-bar .item.radio.button.text-only.selected:active {72 color: rgb(0, 0, 0);73 background-color: transparent;74 } -
trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.css
r172241 r183579 40 40 } 41 41 42 body.mac-platform.legacy .sidebar > .panel.details.css-style .rules .label + .style-declaration-section {43 border-top: none;44 }45 46 42 .sidebar > .panel.details.css-style .rules .new-rule { 47 43 font-size: 12px; … … 57 53 } 58 54 59 body.mac-platform.legacy .sidebar > .panel.details.css-style .rules .new-rule {60 text-shadow: white 0 1px 0;61 border-bottom: none;62 font-weight: bold;63 }64 65 55 .sidebar > .panel.details.css-style .rules .new-rule + .style-declaration-section { 66 56 border-top: 1px solid rgb(179, 179, 179); 67 }68 69 body.mac-platform.legacy .sidebar > .panel.details.css-style .rules .new-rule + .style-declaration-section {70 border-top: none;71 57 } 72 58 … … 82 68 } 83 69 84 body.mac-platform.legacy .sidebar > .panel.details.css-style .rules .new-rule img {85 content: url(../Images/Legacy/Plus.svg);86 }87 88 70 .sidebar > .panel.details.css-style .rules .new-rule:hover { 89 71 opacity: 0.6; -
trunk/Source/WebInspectorUI/UserInterface/Views/ScopeBar.css
r176610 r183579 42 42 } 43 43 44 body.mac-platform.legacy .scope-bar > li {45 font-weight: bold;46 padding: 0 8px 3px;47 border-radius: 9px;48 49 transition: 200ms ease-in-out;50 transition-property: background-color, border-color;51 }52 53 44 .scope-bar > li:matches(.selected, :active) { 54 45 transition-duration: 75ms; … … 60 51 } 61 52 62 body.mac-platform.legacy .scope-bar > li:hover {63 color: inherit;64 border-color: rgba(0, 0, 0, 0.15);65 background-color: transparent;66 }67 68 53 .scope-bar > li.selected { 69 54 color: white; 70 55 background-color: rgba(34, 131, 246, 1); 71 }72 73 body.mac-platform.legacy .scope-bar > li.selected {74 color: inherit;75 background-color: rgba(0, 0, 0, 0.06);76 border-color: rgba(0, 0, 0, 0.30);77 56 } 78 57 … … 82 61 } 83 62 84 body.mac-platform.legacy .scope-bar > li:active {85 color: inherit;86 background-color: rgba(0, 0, 0, 0.16);87 border-color: rgba(0, 0, 0, 0.40);88 }89 90 63 .scope-bar > li.selected:active { 91 64 background-color: rgba(31, 105, 238, 1); 92 65 } 93 94 body.mac-platform.legacy .scope-bar > li.selected:active {95 background-color: rgba(0, 0, 0, 0.16);96 } -
trunk/Source/WebInspectorUI/UserInterface/Views/ScriptContentView.js
r181185 r183579 49 49 this._textEditor.addEventListener(WebInspector.SourceCodeTextEditor.Event.ContentDidPopulate, this._contentDidPopulate, this); 50 50 51 var curleyBracesImage;52 if (WebInspector.Platform.isLegacyMacOS)53 curleyBracesImage = {src: "Images/Legacy/NavigationItemCurleyBraces.svg", width: 16, height: 16};54 else55 curleyBracesImage = {src: "Images/NavigationItemCurleyBraces.svg", width: 13, height: 13};56 57 51 var toolTip = WebInspector.UIString("Pretty print"); 58 52 var activatedToolTip = WebInspector.UIString("Original formatting"); 59 this._prettyPrintButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("pretty-print", toolTip, activatedToolTip, curleyBracesImage.src, curleyBracesImage.width, curleyBracesImage.height);53 this._prettyPrintButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("pretty-print", toolTip, activatedToolTip, "Images/NavigationItemCurleyBraces.svg", 13, 13); 60 54 this._prettyPrintButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._togglePrettyPrint, this); 61 55 this._prettyPrintButtonNavigationItem.enabled = false; // Enabled when the text editor is populated with content. -
trunk/Source/WebInspectorUI/UserInterface/Views/SearchBar.css
r172312 r183579 40 40 } 41 41 42 body.mac-platform.legacy .search-bar > input[type="search"] {43 border: 1px solid rgba(0, 0, 0, 0.35);44 border-radius: 10px;45 box-shadow: inset rgba(0, 0, 0, 0.1) 0 1px 0;46 height: 19px;47 transition: background-color 200ms ease-in-out;48 }49 50 42 .search-bar > input[type="search"]::-webkit-input-placeholder { 51 43 color: rgba(0, 0, 0, 0.35); -
trunk/Source/WebInspectorUI/UserInterface/Views/SearchSidebarPanel.css
r183339 r183579 28 28 } 29 29 30 body.mac-platform.legacy .sidebar > .panel.navigation.search > :matches(.content, .empty-content-placeholder) {31 top: 21px;32 }33 34 30 .sidebar > .panel.navigation.search > .search-bar { 35 31 position: absolute; … … 48 44 } 49 45 50 body.mac-platform.legacy .sidebar > .panel.navigation.search > .search-bar {51 height: 21px;52 }53 54 46 .sidebar > .panel.navigation.search > .search-bar > input[type="search"] { 55 47 display: flex; … … 59 51 padding-left: 4px; 60 52 } 61 62 body.mac-platform.legacy .sidebar > .panel.navigation.search > .search-bar > input[type="search"] {63 margin: 1px 6px;64 padding-left: 0;65 } -
trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.css
r183337 r183579 30 30 } 31 31 32 body.mac-platform.legacy .sidebar {33 background-color: rgb(227, 231, 235);34 }35 36 32 .sidebar.collapsed { 37 33 width: 0 !important; 38 34 border: none !important; 39 }40 41 body.mac-platform.legacy.window-inactive .sidebar {42 background-color: rgb(231, 231, 231);43 35 } 44 36 … … 100 92 border-left-color: rgb(219, 219, 219); 101 93 } 102 103 body.mac-platform.legacy .sidebar.right {104 background-color: rgb(231, 231, 231);105 } -
trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js
r183468 r183579 51 51 this._element.appendChild(this._contentViewContainer.element); 52 52 53 this._tabBar.newTabItem = new WebInspector.TabBarItem( platformImagePath("NewTabPlus.svg"), WebInspector.UIString("Create a new tab"), true);53 this._tabBar.newTabItem = new WebInspector.TabBarItem("Images/NewTabPlus.svg", WebInspector.UIString("Create a new tab"), true); 54 54 55 55 this._tabBar.addEventListener(WebInspector.TabBar.Event.TabBarItemSelected, this._tabBarItemSelected, this); -
trunk/Source/WebInspectorUI/UserInterface/Views/TextContentView.js
r181185 r183579 40 40 this._textEditor.string = string; 41 41 42 var curleyBracesImage;43 if (WebInspector.Platform.isLegacyMacOS)44 curleyBracesImage = {src: "Images/Legacy/NavigationItemCurleyBraces.svg", width: 16, height: 16};45 else46 curleyBracesImage = {src: "Images/NavigationItemCurleyBraces.svg", width: 13, height: 13};47 48 42 var toolTip = WebInspector.UIString("Pretty print"); 49 43 var activatedToolTip = WebInspector.UIString("Original formatting"); 50 this._prettyPrintButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("pretty-print", toolTip, activatedToolTip, curleyBracesImage.src, curleyBracesImage.width, curleyBracesImage.height);44 this._prettyPrintButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("pretty-print", toolTip, activatedToolTip, "Images/NavigationItemCurleyBraces.svg", 13, 13); 51 45 this._prettyPrintButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._togglePrettyPrint, this); 52 46 this._prettyPrintButtonNavigationItem.enabled = this._textEditor.canBeFormatted(); -
trunk/Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.js
r183318 r183579 41 41 WebInspector.probeManager.addEventListener(WebInspector.ProbeManager.Event.ProbeSetRemoved, this._probeSetsChanged, this); 42 42 43 var curleyBracesImage;44 if (WebInspector.Platform.isLegacyMacOS)45 curleyBracesImage = {src: "Images/Legacy/NavigationItemCurleyBraces.svg", width: 16, height: 16};46 else47 curleyBracesImage = {src: "Images/NavigationItemCurleyBraces.svg", width: 13, height: 13};48 49 43 var toolTip = WebInspector.UIString("Pretty print"); 50 44 var activatedToolTip = WebInspector.UIString("Original formatting"); 51 this._prettyPrintButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("pretty-print", toolTip, activatedToolTip, curleyBracesImage.src, curleyBracesImage.width, curleyBracesImage.height);45 this._prettyPrintButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("pretty-print", toolTip, activatedToolTip, "Images/NavigationItemCurleyBraces.svg", 13, 13); 52 46 this._prettyPrintButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._togglePrettyPrint, this); 53 47 this._prettyPrintButtonNavigationItem.enabled = false; // Enabled when the text editor is populated with content. -
trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.css
r172399 r183579 60 60 61 61 background-color: white; 62 }63 64 body.mac-platform.legacy .data-grid.timeline > .navigation-bar-container > .navigation-bar {65 top: 10px;66 height: 22px;67 62 } 68 63 -
trunk/Source/WebInspectorUI/UserInterface/Views/TimelineIcons.css
r182660 r183579 32 32 } 33 33 34 body.mac-platform.legacy .network-icon .icon {35 content: -webkit-image-set(url(../Images/Legacy/Network.png) 1x, url(../Images/Legacy/Network@2x.png) 2x);36 }37 38 body.mac-platform.legacy .network-icon.large .icon {39 content: -webkit-image-set(url(../Images/Legacy/NetworkLarge.png) 1x, url(../Images/Legacy/NetworkLarge@2x.png) 2x);40 }41 42 34 .colors-icon .icon { 43 35 content: -webkit-image-set(url(../Images/Colors.png) 1x, url(../Images/Colors@2x.png) 2x); … … 46 38 .colors-icon.large .icon { 47 39 content: -webkit-image-set(url(../Images/ColorsLarge.png) 1x, url(../Images/ColorsLarge@2x.png) 2x); 48 }49 50 body.mac-platform.legacy .colors-icon .icon {51 content: -webkit-image-set(url(../Images/Legacy/Colors.png) 1x, url(../Images/Legacy/Colors@2x.png) 2x);52 }53 54 body.mac-platform.legacy .colors-icon.large .icon {55 content: -webkit-image-set(url(../Images/Legacy/ColorsLarge.png) 1x, url(../Images/Legacy/ColorsLarge@2x.png) 2x);56 40 } 57 41 -
trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js
r183469 r183579 50 50 this.element.appendChild(this._contentViewContainer.element); 51 51 52 var trashImage; 53 if (WebInspector.Platform.isLegacyMacOS) 54 trashImage = {src: "Images/Legacy/NavigationItemTrash.svg", width: 16, height: 16}; 55 else 56 trashImage = {src: "Images/NavigationItemTrash.svg", width: 15, height: 15}; 57 58 this._clearTimelineNavigationItem = new WebInspector.ButtonNavigationItem("clear-timeline", WebInspector.UIString("Clear Timeline"), trashImage.src, trashImage.width, trashImage.height); 52 this._clearTimelineNavigationItem = new WebInspector.ButtonNavigationItem("clear-timeline", WebInspector.UIString("Clear Timeline"), "Images/NavigationItemTrash.svg", 15, 15); 59 53 this._clearTimelineNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._clearTimeline, this); 60 54 -
trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css
r183469 r183579 46 46 right: 0; 47 47 height: 29px; 48 }49 50 body.mac-platform.legacy .timeline-ruler > .header {51 height: 22px;52 48 } 53 49 … … 139 135 } 140 136 141 body.mac-platform.legacy .timeline-ruler > .selection-drag {142 height: 22px;143 }144 145 137 .timeline-ruler > .selection-drag:active { 146 138 cursor: -webkit-grabbing; … … 158 150 pointer-events: all; 159 151 z-index: 15; 160 }161 162 body.mac-platform.legacy .timeline-ruler > .selection-handle {163 height: 21px;164 152 } 165 153 -
trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.css
r183469 r183579 31 31 height: 29px; 32 32 border-bottom: 1px solid rgb(179, 179, 179); 33 }34 35 body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar {36 height: 22px;37 33 } 38 34 … … 70 66 } 71 67 72 body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-glyph {73 top: 0;74 75 background-image: -webkit-image-set(url(../Images/Legacy/RecordingStopped.png) 1x, url(../Images/Legacy/RecordingStopped@2x.png) 2x);76 background-size: 21px 21px;77 }78 79 body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-glyph.recording {80 background-image: -webkit-image-set(url(../Images/Legacy/Recording.png) 1x, url(../Images/Legacy/Recording@2x.png) 2x);81 }82 83 body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-glyph:hover {84 background-image: -webkit-image-set(url(../Images/Legacy/RecordingHovered.png) 1x, url(../Images/Legacy/RecordingHovered@2x.png) 2x);85 -webkit-filter: none;86 }87 88 body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-glyph.recording:hover {89 background-image: -webkit-image-set(url(../Images/Legacy/RecordingStopped.png) 1x, url(../Images/Legacy/RecordingStopped@2x.png) 2x);90 }91 92 body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-glyph.forced {93 background-image: -webkit-image-set(url(../Images/Legacy/RecordingStopped.png) 1x, url(../Images/Legacy/RecordingStopped@2x.png) 2x) !important;94 }95 96 body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-glyph.recording.forced {97 background-image: -webkit-image-set(url(../Images/Legacy/Recording.png) 1x, url(../Images/Legacy/Recording@2x.png) 2x) !important;98 }99 100 68 .sidebar > .panel.navigation.timeline > .status-bar > .record-status { 101 69 position: absolute; … … 111 79 color: rgb(76, 76, 76); 112 80 text-shadow: rgba(255, 255, 255, 0.5) 0 1px 0; 113 }114 115 body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .status-bar > .record-status {116 top: 0;117 81 } 118 82 … … 144 108 } 145 109 146 body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .title-bar {147 height: 22px;148 149 background-color: transparent;150 background-image: linear-gradient(to bottom, rgb(238, 240, 244), rgb(224, 226, 230));151 text-shadow: rgba(255, 255, 255, 0.5) 0 1px 0;152 }153 154 110 .sidebar > .panel.navigation.timeline > .title-bar.timelines { 155 111 top: 29px; … … 172 128 } 173 129 174 body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .title-bar.timelines {175 top: 22px;176 }177 178 130 .sidebar > .panel.navigation.timeline > .title-bar.timeline-events { 179 131 height: 23px; 180 132 border-top: 1px solid rgb(179, 179, 179); 181 133 top: 166px; 182 }183 184 body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .title-bar.timeline-events {185 top: 159px;186 134 } 187 135 … … 202 150 203 151 visibility: hidden; 204 }205 206 body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .timelines-content {207 top: 44px;208 }209 210 body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .timelines-content .close-button {211 margin-top: 2px;212 width: 12px;213 height: 12px;214 152 } 215 153 … … 245 183 } 246 184 247 body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .timelines-content li.item.selected + li.item {248 border-top-color: rgb(120, 139, 168);249 }250 251 body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .timelines-content :focus li.item.selected + li.item {252 border-top-color: rgb(107, 130, 164);253 }254 255 185 .sidebar > .panel.navigation.timeline > .content, 256 186 .sidebar > .panel.navigation.timeline > .empty-content-placeholder { 257 187 top: 189px; 258 }259 260 body.mac-platform.legacy .sidebar > .panel.navigation.timeline > :matches(.content, .empty-content-placeholder) {261 top: 182px;262 188 } 263 189 … … 267 193 right: -16px; 268 194 } 269 270 body.mac-platform.legacy .sidebar > .panel.navigation.timeline > .content .item > .status > .status-button {271 width: 12px;272 height: 12px;273 margin-top: 2px;274 } -
trunk/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js
r183469 r183579 115 115 this._replayNavigationBar.addNavigationItem(this._replayCaptureButtonItem); 116 116 117 var pauseImage, resumeImage;118 if (WebInspector.Platform.isLegacyMacOS) {119 pauseImage = {src: "Images/Legacy/Pause.svg", width: 16, height: 16};120 resumeImage = {src: "Images/Legacy/Resume.svg", width: 16, height: 16};121 } else {122 pauseImage = {src: "Images/Pause.svg", width: 15, height: 15};123 resumeImage = {src: "Images/Resume.svg", width: 15, height: 15};124 }125 126 117 toolTip = WebInspector.UIString("Start Playback"); 127 118 altToolTip = WebInspector.UIString("Pause Playback"); 128 this._replayPauseResumeButtonItem = new WebInspector.ToggleButtonNavigationItem("replay-pause-resume", toolTip, altToolTip, resumeImage.src, pauseImage.src, pauseImage.width, pauseImage.height, true);119 this._replayPauseResumeButtonItem = new WebInspector.ToggleButtonNavigationItem("replay-pause-resume", toolTip, altToolTip, "Images/Resume.svg", "Images/Pause.svg", 15, 15, true); 129 120 this._replayPauseResumeButtonItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._replayPauseResumeButtonClicked, this); 130 121 this._replayPauseResumeButtonItem.enabled = false; … … 490 481 var timelineTreeElement = new WebInspector.GeneralTreeElement([timeline.iconClassName, WebInspector.TimelineSidebarPanel.LargeIconStyleClass], timeline.displayName, null, timeline); 491 482 var tooltip = WebInspector.UIString("Close %s timeline view").format(timeline.displayName); 492 wrappedSVGDocument( platformImagePath("CloseLarge.svg"), WebInspector.TimelineSidebarPanel.CloseButtonStyleClass, tooltip, function(element) {483 wrappedSVGDocument("Images/CloseLarge.svg", WebInspector.TimelineSidebarPanel.CloseButtonStyleClass, tooltip, function(element) { 493 484 var button = new WebInspector.TreeElementStatusButton(element); 494 485 button.addEventListener(WebInspector.TreeElementStatusButton.Event.Clicked, this.showTimelineOverview, this); -
trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js
r183331 r183579 268 268 } 269 269 270 wrappedSVGDocument( platformImagePath("Close.svg"), null, WebInspector.UIString("Close resource view"), function(element) {270 wrappedSVGDocument("Images/Close.svg", null, WebInspector.UIString("Close resource view"), function(element) { 271 271 this._closeStatusButton = new WebInspector.TreeElementStatusButton(element); 272 272 this._closeStatusButton.addEventListener(WebInspector.TreeElementStatusButton.Event.Clicked, this._closeStatusButtonClicked, this); -
trunk/Source/WebInspectorUI/UserInterface/Views/Toolbar.css
r183339 r183579 45 45 } 46 46 47 body.mac-platform:not(. legacy, .docked) .toolbar {47 body.mac-platform:not(.docked) .toolbar { 48 48 padding-top: 21px; 49 49 height: 54px; 50 }51 52 body.mac-platform.legacy .toolbar {53 box-shadow: none;54 background-image: none;55 background-color: transparent;56 border-bottom-color: rgb(85, 85, 85);57 }58 59 body.mac-platform.legacy.docked .toolbar {60 background-image: linear-gradient(to bottom, rgb(216, 216, 216), rgb(190, 190, 190));61 box-shadow: inset rgba(255, 255, 255, 0.1) 0 1px 0, inset rgba(0, 0, 0, 0.02) 0 -1px 0;62 }63 64 body.mac-platform.legacy:not(.docked) .toolbar .item.button > .label {65 /* We need to disable sub-pixel antialiasing in the toolbar when not docked because the66 toolbar is transparent and so is the WebView. */67 -webkit-font-smoothing: antialiased;68 69 /* Compensate for the text not being sub-pixel antialiased by adding a small stroke. */70 -webkit-text-stroke: 0.2px;71 }72 73 body.mac-platform.legacy.window-inactive .toolbar {74 border-bottom-color: rgb(128, 128, 128);75 50 } 76 51 -
trunk/Source/WebInspectorUI/UserInterface/Views/TreeElementStatusButton.css
r173366 r183579 34 34 } 35 35 36 body.mac-platform.legacy .item > .status > .status-button > svg .filled {37 fill: rgb(64, 64, 64);38 }39 40 36 :focus .item.selected > .status > .status-button > svg .filled { 41 37 fill: white !important; … … 44 40 .item > .status > .status-button > svg .stroked { 45 41 stroke: rgb(128, 128, 128); 46 }47 48 body.mac-platform.legacy .item > .status > .status-button > svg .stroked {49 stroke: rgb(64, 64, 64);50 42 } 51 43
Note:
See TracChangeset
for help on using the changeset viewer.