diff options
Diffstat (limited to 'coverage/htmlfiles')
-rw-r--r-- | coverage/htmlfiles/index.html | 33 | ||||
-rw-r--r-- | coverage/htmlfiles/pyfile.html | 50 | ||||
-rw-r--r-- | coverage/htmlfiles/style.css | 14 | ||||
-rw-r--r-- | coverage/htmlfiles/style.scss | 20 |
4 files changed, 60 insertions, 57 deletions
diff --git a/coverage/htmlfiles/index.html b/coverage/htmlfiles/index.html index d1cf0041..bde46eaf 100644 --- a/coverage/htmlfiles/index.html +++ b/coverage/htmlfiles/index.html @@ -21,15 +21,15 @@ <span class="pc_cov">{{totals.pc_covered_str}}%</span> </h1> - <div id="help_panel_wrapper"> + <aside id="help_panel_wrapper"> <input id="help_panel_state" type="checkbox"> <label for="help_panel_state"> <img id="keyboard_icon" src="keybd_closed.png" alt="Show/hide keyboard shortcuts" /> </label> <div id="help_panel"> <p class="legend">Shortcuts on this page</p> - <div> - <p class="keyhelp"> + <div class="keyhelp"> + <p> <kbd>n</kbd> <kbd>s</kbd> <kbd>m</kbd> @@ -38,25 +38,26 @@ <kbd>b</kbd> <kbd>p</kbd> {% endif %} - <kbd>c</kbd> change column sorting + <kbd>c</kbd> + change column sorting </p> - <p class="keyhelp"> + <p> <kbd>[</kbd> <kbd>]</kbd> prev/next file </p> - <p class="keyhelp"> + <p> <kbd>?</kbd> show/hide this help </p> </div> </div> - </div> + </aside> <form id="filter_container"> <input id="filter" type="text" value="" placeholder="filter..." /> </form> - <p> + <p class="text"> <a class="nav" href="{{__url__}}">coverage.py v{{__version__}}</a>, created at {{ time_stamp }} </p> @@ -128,15 +129,13 @@ created at {{ time_stamp }} </p> </div> - <div style="display: none;"> - <p> - <a id="prevFileLink" class="nav" href="{{ final_html }}">first file</a> - <a id="nextFileLink" class="nav" href="{{ first_html }}">final file</a> - </p> - <button type="button" class="button_prev_file" data-shortcut="[">Previous file</button> - <button type="button" class="button_next_file" data-shortcut="]">Next file</button> - <button type="button" class="button_show_hide_help" data-shortcut="?">Show/hide keyboard shortcuts</button> - </div> + <aside class="hidden"> + <a id="prevFileLink" class="nav" href="{{ final_html }}"/> + <a id="nextFileLink" class="nav" href="{{ first_html }}"/> + <button type="button" class="button_prev_file" data-shortcut="["/> + <button type="button" class="button_next_file" data-shortcut="]"/> + <button type="button" class="button_show_hide_help" data-shortcut="?"/> + </aside> </footer> </body> diff --git a/coverage/htmlfiles/pyfile.html b/coverage/htmlfiles/pyfile.html index c52da160..8fcfc660 100644 --- a/coverage/htmlfiles/pyfile.html +++ b/coverage/htmlfiles/pyfile.html @@ -5,9 +5,6 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - {# IE8 rounds line-height incorrectly, and adding this emulateIE7 line makes it right! #} - {# http://social.msdn.microsoft.com/Forums/en-US/iewebdevelopment/thread/7684445e-f080-4d8f-8529-132763348e21 #} - <meta http-equiv="X-UA-Compatible" content="IE=emulateIE7" /> <title>Coverage for {{relative_filename|escape}}: {{nums.pc_covered_str}}%</title> <link rel="icon" sizes="32x32" href="favicon_32.png"> <link rel="stylesheet" href="style.css" type="text/css"> @@ -25,15 +22,15 @@ <span class="pc_cov">{{nums.pc_covered_str}}%</span> </h1> - <div id="help_panel_wrapper"> + <aside id="help_panel_wrapper"> <input id="help_panel_state" type="checkbox"> <label for="help_panel_state"> <img id="keyboard_icon" src="keybd_closed.png" alt="Show/hide keyboard shortcuts" /> </label> <div id="help_panel"> <p class="legend">Shortcuts on this page</p> - <div> - <p class="keyhelp"> + <div class="keyhelp"> + <p> <kbd>r</kbd> <kbd>m</kbd> <kbd>x</kbd> @@ -42,30 +39,31 @@ {% endif %} toggle line displays </p> - <p class="keyhelp"> + <p> <kbd>j</kbd> - <kbd>k</kbd> next/prev highlighted chunk + <kbd>k</kbd> + next/prev highlighted chunk </p> - <p class="keyhelp"> + <p> <kbd>0</kbd> (zero) top of page </p> - <p class="keyhelp"> + <p> <kbd>1</kbd> (one) first highlighted chunk </p> - <p class="keyhelp"> + <p> <kbd>[</kbd> <kbd>]</kbd> prev/next file </p> - <p class="keyhelp"> - <kbd>u</kbd> back to the index + <p> + <kbd>u</kbd> up to the index </p> - <p class="keyhelp"> + <p> <kbd>?</kbd> show/hide this help </p> </div> </div> - </div> + </aside> <h2> <span class="text">{{nums.n_statements}} statements </span> @@ -77,7 +75,7 @@ {% endif %} </h2> - <p> + <p class="text"> <a id="prevFileLink" class="nav" href="{{ prev_html }}">« prev</a> <a id="indexLink" class="nav" href="index.html">^ index</a> <a id="nextFileLink" class="nav" href="{{ next_html }}">» next</a> @@ -86,16 +84,16 @@ created at {{ time_stamp }} </p> - <div style="display: none;"> - <button type="button" class="button_next_chunk" data-shortcut="j">Next highlighted chunk</button> - <button type="button" class="button_prev_chunk" data-shortcut="k">Previous highlighted chunk</button> - <button type="button" class="button_top_of_page" data-shortcut="0">Goto top of page</button> - <button type="button" class="button_first_chunk" data-shortcut="1">Goto first highlighted chunk</button> - <button type="button" class="button_prev_file" data-shortcut="[">Previous file</button> - <button type="button" class="button_next_file" data-shortcut="]">Next file</button> - <button type="button" class="button_to_index" data-shortcut="u">Back to the index</button> - <button type="button" class="button_show_hide_help" data-shortcut="?">Show/hide keyboard shortcuts</button> - </div> + <aside class="hidden"> + <button type="button" class="button_next_chunk" data-shortcut="j"/> + <button type="button" class="button_prev_chunk" data-shortcut="k"/> + <button type="button" class="button_top_of_page" data-shortcut="0"/> + <button type="button" class="button_first_chunk" data-shortcut="1"/> + <button type="button" class="button_prev_file" data-shortcut="["/> + <button type="button" class="button_next_file" data-shortcut="]"/> + <button type="button" class="button_to_index" data-shortcut="u"/> + <button type="button" class="button_show_hide_help" data-shortcut="?"/> + </aside> </div> </header> diff --git a/coverage/htmlfiles/style.css b/coverage/htmlfiles/style.css index f13703c2..d6768a35 100644 --- a/coverage/htmlfiles/style.css +++ b/coverage/htmlfiles/style.css @@ -28,6 +28,8 @@ a.nav { text-decoration: none; color: inherit; } a.nav:hover { text-decoration: underline; color: inherit; } +.hidden { display: none; } + header { background: #f8f8f8; width: 100%; z-index: 2; border-bottom: 1px solid #ccc; } @media (prefers-color-scheme: dark) { header { background: black; } } @@ -38,13 +40,13 @@ header .content { padding: 1rem 3.5rem; } header h2 { margin-top: .5em; font-size: 1em; } -header p { margin: .5em 0 -.5em; color: #666; font-style: italic; } +header p.text { margin: .5em 0 -.5em; color: #666; font-style: italic; } -@media (prefers-color-scheme: dark) { header p { color: #aaa; } } +@media (prefers-color-scheme: dark) { header p.text { color: #aaa; } } header.sticky { position: fixed; left: 0; right: 0; height: 2.5em; } -header.sticky p, header.sticky .text { display: none; } +header.sticky .text { display: none; } header.sticky h1, header.sticky h2 { font-size: 1em; margin-top: 0; display: inline-block; } @@ -126,7 +128,9 @@ header button.par.show_par { background: #ffa; border: 2px solid #bbbb00; margin #help_panel_state { display: none; } -#help_panel { top: 25px; right: 0; padding: .75em; border: 1px solid #883; } +#help_panel { top: 25px; right: 0; padding: .75em; border: 1px solid #883; color: #333; } + +#help_panel .keyhelp p { margin-top: .75em; } #help_panel .legend { font-style: italic; margin-bottom: 1em; } @@ -136,8 +140,6 @@ header button.par.show_par { background: #ffa; border: 2px solid #bbbb00; margin #help_panel_state:checked ~ #help_panel { display: block; } -.keyhelp { margin-top: .75em; } - kbd { border: 1px solid black; border-color: #888 #333 #333 #888; padding: .1em .35em; font-family: SFMono-Regular, Menlo, Monaco, Consolas, monospace; font-weight: bold; background: #eee; border-radius: 3px; } #source { padding: 1em 0 1em 3.5rem; font-family: SFMono-Regular, Menlo, Monaco, Consolas, monospace; } diff --git a/coverage/htmlfiles/style.scss b/coverage/htmlfiles/style.scss index 41315196..1e9103fd 100644 --- a/coverage/htmlfiles/style.scss +++ b/coverage/htmlfiles/style.scss @@ -156,6 +156,10 @@ a.nav { } } +.hidden { + display: none; +} + // Page structure header { background: $light-gray1; @@ -174,7 +178,7 @@ header { font-size: 1em; } - p { + p.text { margin: .5em 0 -.5em; color: $light-gray5; @include color-dark($dark-gray5); @@ -187,7 +191,7 @@ header { right: 0; height: 2.5em; - p, .text { + .text { display: none; } @@ -354,6 +358,12 @@ header button { padding: .75em; border: 1px solid #883; + color: #333; + + .keyhelp p { + margin-top: .75em; + } + .legend { font-style: italic; margin-bottom: 1em; @@ -361,12 +371,10 @@ header button { .indexfile & { width: 25em; - //min-height: 4em; } .pyfile & { width: 18em; - //min-height: 8em; } #help_panel_state:checked ~ & { @@ -374,10 +382,6 @@ header button { } } -.keyhelp { - margin-top: .75em; -} - kbd { border: 1px solid black; border-color: #888 #333 #333 #888; |