From 4931dbf456a64c61875220987fca84c6c08819df Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Wed, 4 Nov 2015 14:53:46 +0100 Subject: update to 43.0b1 --- .../chrome/browser/devtools/animationinspector.css | 196 ++++++++++++++------- 1 file changed, 136 insertions(+), 60 deletions(-) (limited to 'arc-firefox-theme/chrome/browser/devtools/animationinspector.css') diff --git a/arc-firefox-theme/chrome/browser/devtools/animationinspector.css b/arc-firefox-theme/chrome/browser/devtools/animationinspector.css index 40efab7..dfd1b3d 100644 --- a/arc-firefox-theme/chrome/browser/devtools/animationinspector.css +++ b/arc-firefox-theme/chrome/browser/devtools/animationinspector.css @@ -12,6 +12,15 @@ --even-animation-timeline-background-color: rgba(128,128,128,0.03); } +:root { + /* How high should toolbars be */ + --toolbar-height: 20px; + /* How wide should the sidebar be */ + --timeline-sidebar-width: 150px; + /* How high should animations displayed in the timeline be */ + --timeline-animation-height: 20px; +} + html { height: 100%; } @@ -26,33 +35,47 @@ body { color: var(--theme-content-color3); } -/* The top toolbar, containing the toggle-all button */ +/* The top toolbar, containing the toggle-all button. And the timeline toolbar, + containing playback control buttons, shown only when there are animations + displayed in the timeline */ -#toolbar { +#global-toolbar, +#timeline-toolbar { border-bottom: 1px solid var(--theme-splitter-color); display: flex; flex-direction: row; align-items: center; justify-content: flex-end; - height: 20px; + height: var(--toolbar-height); } -#toolbar .label { - padding: 1px 4px; +#timeline-toolbar { + display: none; } -#toggle-all { - border-width: 0 0 0 1px; - min-height: 20px; +[timeline] #global-toolbar { + display: none; +} + +[timeline] #timeline-toolbar { + display: flex; +} + +#global-toolbar .label { + padding: 1px 4px; } /* The main animations container */ #players { - height: calc(100% - 20px); + height: calc(100% - var(--toolbar-height)); overflow: auto; } +[empty] #players { + display: none; +} + /* The error message, shown when an invalid/unanimated element is selected */ #error-message { @@ -65,16 +88,23 @@ body { display: none; } +[empty] #error-message { + display: block; +} -/* Element picker and toggle-all buttons */ +/* Element picker, toggle-all buttons, timeline pause button, ... */ -#element-picker, -#toggle-all { +#global-toolbar .devtools-button, +#timeline-toolbar .devtools-button { + border-width: 0 0 0 1px; + min-height: var(--toolbar-height); +} + +.devtools-button { position: relative; } -#element-picker::before, -#toggle-all::before { +.devtools-button::before { content: ""; display: block; width: 16px; @@ -83,10 +113,13 @@ body { left: 50%; top: 50%; margin: -8px 0 0 -8px; +} + +#element-picker::before { background-image: url("chrome://browser/skin/devtools/command-pick.png"); } -#toggle-all::before { +.pause-button::before { background-image: url("debugger-pause.png"); } @@ -95,21 +128,21 @@ body { filter: none; /* Icon is blue when checked, don't invert for light theme */ } -#toggle-all.paused::before { +.pause-button.paused::before { background-image: url("debugger-play.png"); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { #element-picker::before { background-image: url("chrome://browser/skin/devtools/command-pick@2x.png"); background-size: 64px; } - #toggle-all::before { + .pause-button::before { background-image: url("debugger-pause@2x.png"); } - #toggle-all.paused::before { + .pause-button.paused::before { background-image: url("debugger-play@2x.png"); } } @@ -119,6 +152,7 @@ body { .animation-timeline { height: 100%; overflow: hidden; + position: relative; /* The timeline gets its background-image from a canvas element created in /browser/devtools/animationinspector/utils.js drawGraphElementBackground thanks to document.mozSetImageElement("time-graduations", canvas) @@ -127,17 +161,42 @@ body { background-repeat: repeat-y; /* The animations are drawn 150px from the left edge so that animated nodes can be displayed in a sidebar */ - background-position: 150px 0; + background-position: var(--timeline-sidebar-width) 0; display: flex; flex-direction: column; } +.animation-timeline .scrubber { + position: absolute; + height: 100%; + width: var(--timeline-sidebar-width); + border-right: 1px solid red; + box-sizing: border-box; + z-index: 1; + pointer-events: none; +} + +.animation-timeline .scrubber::before { + content: ""; + position: absolute; + top: 0; + width: 1px; + right: -6px; + border-top: 5px solid red; + border-left: 5px solid transparent; + border-right: 5px solid transparent; +} + .animation-timeline .time-header { - margin-left: 150px; - height: 20px; + margin-left: var(--timeline-sidebar-width); + min-height: var(--toolbar-height); overflow: hidden; position: relative; - border-bottom: 1px solid var(--theme-splitter-color); + /* This is the same color as the time graduations in + browser/devtools/animationinspector/utils.js */ + border-bottom: 1px solid rgba(128, 136, 144, .5); + cursor: col-resize; + -moz-user-select: none; } .animation-timeline .time-header .time-tick { @@ -158,7 +217,7 @@ body { .animation-timeline .animation { margin: 4px 0; - height: 20px; + height: var(--timeline-animation-height); position: relative; } @@ -167,7 +226,7 @@ body { } .animation-timeline .animation .target { - width: 150px; + width: var(--timeline-sidebar-width); overflow: hidden; height: 100%; } @@ -179,7 +238,7 @@ body { .animation-timeline .animation .time-block { position: absolute; top: 0; - left: 150px; + left: var(--timeline-sidebar-width); right: 0; height: 100%; } @@ -189,19 +248,37 @@ body { .animation-timeline .animation .iterations { position: relative; height: 100%; - border: 1px solid var(--theme-highlight-lightorange); box-sizing: border-box; - background: var(--theme-contrast-background); - /* Iterations are displayed with a repeating linear-gradient which size is - dynamically changed from JS */ + + --timelime-border-color: var(--theme-body-color); + --timeline-background-color: var(--theme-splitter-color); + + /* Iterations of the animation are displayed with a repeating linear-gradient + which size is dynamically changed from JS. The gradient only draws 1px + borders between each iteration. These borders must have the same color as + the border of this element */ background-image: linear-gradient(to right, - var(--theme-highlight-lightorange) 0, - var(--theme-highlight-lightorange) 1px, + var(--timelime-border-color) 0, + var(--timelime-border-color) 1px, transparent 1px, transparent 2px); background-repeat: repeat-x; background-position: -1px 0; + border: 1px solid var(--timelime-border-color); + + /* The background color is set independently */ + background-color: var(--timeline-background-color); +} + +.animation-timeline .animation .cssanimation { + --timelime-border-color: var(--theme-highlight-lightorange); + --timeline-background-color: var(--theme-contrast-background); +} + +.animation-timeline .animation .csstransition { + --timelime-border-color: var(--theme-highlight-bluegrey); + --timeline-background-color: var(--theme-highlight-blue); } .animation-timeline .animation .iterations.infinite { @@ -226,42 +303,41 @@ body { top: unset; } -.animation-timeline .animation .animation-title { - height: 1.5em; +.animation-timeline .animation .name { + color: var(--theme-selection-color); + height: 100%; width: 100%; - box-sizing: border-box; overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + line-height: 150%; + padding: 0 2px; } .animation-timeline .animation .delay { position: absolute; top: 0; - height: 100%; - background-image: linear-gradient(to bottom, - transparent, - transparent 9px, - var(--theme-highlight-lightorange) 9px, - var(--theme-highlight-lightorange) 11px, - transparent 11px, - transparent); -} + /* Make sure the delay covers up the animation border */ + transform: translate(-1px, -1px); + box-sizing: border-box; + height: calc(100% + 2px); -.animation-timeline .animation .delay::before { - position: absolute; - content: ""; - left: 0; - width: 2px; - height: 8px; - top: 50%; - margin-top: -4px; - background: var(--theme-highlight-lightorange); + border: 1px solid var(--timelime-border-color); + border-width: 1px 0 1px 1px; + background-image: repeating-linear-gradient(45deg, + transparent, + transparent 1px, + var(--theme-selection-color) 1px, + var(--theme-selection-color) 4px); + background-color: var(--timelime-border-color); } -.animation-timeline .animation .name { - position: absolute; - z-index: 1; - padding: 2px; - white-space: nowrap; +.animation-timeline .animation .delay.negative { + /* Negative delays are displayed on top of the animation, so they need a + right border. Whereas normal delays are displayed just before the + animation, so there's already the animation's left border that serves as + a separation. */ + border-width: 1px; } /* Animation target node gutter, contains a preview of the dom node */ @@ -326,7 +402,7 @@ body { /* Timeline wiget */ .timeline { - height: 20px; + height: var(--timeline-animation-height); width: 100%; display: flex; flex-direction: row; @@ -362,7 +438,7 @@ body { background-image: url(rewind.png); } -@media (min-resolution: 1.25dppx) { +@media (min-resolution: 1.1dppx) { .timeline .toggle::before { background-image: url(debugger-pause@2x.png); } -- cgit v1.2.3