Skip to content

Commit 573eede

Browse files
tabatkinstabatkins
committed
merge
2 parents 550b1ad + 0a1679d commit 573eede

2 files changed

Lines changed: 16 additions & 14 deletions

File tree

‎mediaqueries/Overview.bs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,9 +1033,6 @@ resolution</h3>
10331033
(the resolution for printing dots of arbitrary color).
10341034
Printers might have a different resolution for grayscale printing.
10351035

1036-
<p class="issue">
1037-
Another media feature should probably be added to deal with the type of resolution authors want to know to deal with monochrome printing.
1038-
10391036
<div class='example'>
10401037
This media query simply detects “high-resolution” screens
10411038
(those with a hardware pixel to CSS ''px'' ratio of at least 2):
@@ -1811,6 +1808,9 @@ Assorted Issues</h2>
18111808
MQ for detecting if the device is willing to display/print backgrounds and other ink-hungry properties.
18121809
</div>
18131810

1811+
<p class="issue">
1812+
Another media feature should probably be added to deal with the type of resolution authors want to know to deal with monochrome printing.
1813+
18141814
<!--
18151815
██████ ██ ██ ██████ ████████ ███████ ██ ██ ██ ██ ███████
18161816
██ ██ ██ ██ ██ ██ ██ ██ ██ ███ ███ ███ ███ ██ ██

‎mediaqueries/Overview.html‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1388,9 +1388,6 @@ <h3 class="heading settled" data-level=5.1 id=resolution><span class=secno>5.1.
13881388
(the resolution for printing dots of arbitrary color).
13891389
Printers might have a different resolution for grayscale printing.</p>
13901390

1391-
<p class=issue id=issue-7ddcf400><a class=self-link href=#issue-7ddcf400></a>
1392-
Another media feature should probably be added to deal with the type of resolution authors want to know to deal with monochrome printing.
1393-
13941391
<div class=example>
13951392
This media query simply detects “high-resolution” screens
13961393
(those with a hardware pixel to CSS <span class=css>px</span> ratio of at least 2):
@@ -2036,6 +2033,9 @@ <h2 class="heading settled" data-level=10 id=assorted-issues><span class=secno>1
20362033
<p>MQ for detecting if the device is willing to display/print backgrounds and other ink-hungry properties.</p>
20372034
</div>
20382035

2036+
<p class=issue id=issue-7ddcf400><a class=self-link href=#issue-7ddcf400></a>
2037+
Another media feature should probably be added to deal with the type of resolution authors want to know to deal with monochrome printing.
2038+
20392039

20402040

20412041
<h2 class="heading settled" data-level=11 id=custom-mq><span class=secno>11. </span><span class=content>
@@ -2119,9 +2119,9 @@ <h3 class="heading settled" data-level=11.2 id=custom-mq-cssom><span class=secno
21192119

21202120
<p>The <a class=idl-code data-link-type=interface href=#dom-csscustommediarule title=CSSCustomMediaRule>CSSCustomMediaRule</a> interface represents a <a class=css data-link-type=maybe href=#at-ruledef-custom-media title=@custom-media>@custom-media</a> rule.</p>
21212121

2122-
<pre class=idl>interface <dfn class=idl-code data-dfn-type=interface data-export="" data-global-name="" id=dom-csscustommediarule>CSSCustomMediaRule<a class=self-link href=#dom-csscustommediarule></a></dfn> : <a data-link-type=idl href=http://dev.w3.org/csswg/cssom-1/#cssrule title=CSSRule>CSSRule</a> {
2122+
<pre class=idl>interface <dfn class=idl-code data-dfn-type=interface data-export="" data-global-name="" id=dom-csscustommediarule>CSSCustomMediaRule<a class=self-link href=#dom-csscustommediarule></a></dfn> : <a data-link-type=idl-name href=http://dev.w3.org/csswg/cssom-1/#cssrule title=CSSRule>CSSRule</a> {
21232123
attribute DOMString <a class=idl-code data-global-name="CSSCustomMediaRule<interface>/name<attribute>" data-link-for=CSSCustomMediaRule data-link-type=attribute data-type="DOMString " href=#dom-csscustommediarule-name title=name>name</a>;
2124-
[SameObject, PutForwards=mediaText] readonly attribute <a data-link-type=idl href=http://dev.w3.org/csswg/cssom-1/#medialist title=MediaList>MediaList</a> <a class=idl-code data-global-name="CSSCustomMediaRule<interface>/media<attribute>" data-link-for=CSSCustomMediaRule data-link-type=attribute data-readonly="" data-type="MediaList " href=#dom-csscustommediarule-media title=media>media</a>;
2124+
[SameObject, PutForwards=mediaText] readonly attribute <a data-link-type=idl-name href=http://dev.w3.org/csswg/cssom-1/#medialist title=MediaList>MediaList</a> <a class=idl-code data-global-name="CSSCustomMediaRule<interface>/media<attribute>" data-link-for=CSSCustomMediaRule data-link-type=attribute data-readonly="" data-type="MediaList " href=#dom-csscustommediarule-media title=media>media</a>;
21252125
};
21262126
</pre>
21272127

@@ -2436,15 +2436,12 @@ <h2 class="no-num heading settled" id=references><span class=content>References<
24362436
const unsigned short <a data-dfn-for=CSSRule data-dfn-type=const data-export="" data-global-name="CSSRule<interface>/custom_media_rule<const>" href=#dom-cssrule-custom_media_rule title=CUSTOM_MEDIA_RULE>CUSTOM_MEDIA_RULE</a> = 17;
24372437
};
24382438

2439-
interface <a data-dfn-type=interface data-export="" data-global-name="" href=#dom-csscustommediarule title=CSSCustomMediaRule>CSSCustomMediaRule</a> : <a data-link-type=idl href=http://dev.w3.org/csswg/cssom-1/#cssrule title=CSSRule>CSSRule</a> {
2439+
interface <a data-dfn-type=interface data-export="" data-global-name="" href=#dom-csscustommediarule title=CSSCustomMediaRule>CSSCustomMediaRule</a> : <a data-link-type=idl-name href=http://dev.w3.org/csswg/cssom-1/#cssrule title=CSSRule>CSSRule</a> {
24402440
attribute DOMString <a class=idl-code data-global-name="CSSCustomMediaRule<interface>/name<attribute>" data-link-for=CSSCustomMediaRule data-link-type=attribute data-type="DOMString " href=#dom-csscustommediarule-name title=name>name</a>;
2441-
[SameObject, PutForwards=mediaText] readonly attribute <a data-link-type=idl href=http://dev.w3.org/csswg/cssom-1/#medialist title=MediaList>MediaList</a> <a class=idl-code data-global-name="CSSCustomMediaRule<interface>/media<attribute>" data-link-for=CSSCustomMediaRule data-link-type=attribute data-readonly="" data-type="MediaList " href=#dom-csscustommediarule-media title=media>media</a>;
2441+
[SameObject, PutForwards=mediaText] readonly attribute <a data-link-type=idl-name href=http://dev.w3.org/csswg/cssom-1/#medialist title=MediaList>MediaList</a> <a class=idl-code data-global-name="CSSCustomMediaRule<interface>/media<attribute>" data-link-for=CSSCustomMediaRule data-link-type=attribute data-readonly="" data-type="MediaList " href=#dom-csscustommediarule-media title=media>media</a>;
24422442
};
24432443

2444-
</pre><h2 class="no-num heading settled" id=issues-index><span class=content>Issues Index</span><a class=self-link href=#issues-index></a></h2><div style=counter-reset:issue><div class=issue>TODO: Fill this in.<a href=#issue-e6168a18> ↵ </a></div><div class=issue>
2445-
Another media feature should probably be added to deal with the type of resolution authors want to know to deal with monochrome printing.
2446-
2447-
<a href=#issue-7ddcf400> ↵ </a></div><div class=issue>“Viewport” isn’t the right term here, or in <a class=property data-link-type=propdesc href=#descdef-media-overflow-inline title=overflow-inline>overflow-inline</a>.<a href=#issue-ef273004> ↵ </a></div><div class=issue>The names of <a class=property data-link-type=propdesc href=#descdef-media-overflow-block title=overflow-block>overflow-block</a> and <a class=property data-link-type=propdesc href=#descdef-media-overflow-inline title=overflow-inline>overflow-inline</a> are possibly confusing.
2444+
</pre><h2 class="no-num heading settled" id=issues-index><span class=content>Issues Index</span><a class=self-link href=#issues-index></a></h2><div style=counter-reset:issue><div class=issue>TODO: Fill this in.<a href=#issue-e6168a18> ↵ </a></div><div class=issue>“Viewport” isn’t the right term here, or in <a class=property data-link-type=propdesc href=#descdef-media-overflow-inline title=overflow-inline>overflow-inline</a>.<a href=#issue-ef273004> ↵ </a></div><div class=issue>The names of <a class=property data-link-type=propdesc href=#descdef-media-overflow-block title=overflow-block>overflow-block</a> and <a class=property data-link-type=propdesc href=#descdef-media-overflow-inline title=overflow-inline>overflow-inline</a> are possibly confusing.
24482445
Any better names?<a href=#issue-3d4e0e00> ↵ </a></div><div class=issue>
24492446
Using this media feature for accessibility purposes overlaps a lot with <a href=http://msdn.microsoft.com/en-us/library/windows/apps/hh465764.aspx>the high-contrast media feature proposed by Microsoft</a>.
24502447
Can we adjust this so that it covers all use cases for both,
@@ -2483,6 +2480,11 @@ <h2 class="no-num heading settled" id=references><span class=content>References<
24832480

24842481
<p>MQ for detecting if the device is willing to display/print backgrounds and other ink-hungry properties.</p>
24852482
<a href=#issue-c2124305> ↵ </a></div><div class=issue>
2483+
Another media feature should probably be added to deal with the type of resolution authors want to know to deal with monochrome printing.
2484+
2485+
2486+
2487+
<a href=#issue-7ddcf400> ↵ </a></div><div class=issue>
24862488
Define a map of names to values for JS.
24872489
Values can be either a MediaQueryList object or a boolean,
24882490
in which case it’s treated identically to the above,

0 commit comments

Comments
 (0)