[gnome-devel-docs] hig - rework advice on menus, including a new page for button menus



commit 36dd4da064fd56449afbce326e0f76ac8bc7cde0
Author: Allan Day <allanpday gmail com>
Date:   Wed Aug 27 11:33:07 2014 +0100

    hig - rework advice on menus, including a new page for button menus

 hig3/C/figures/ui-elements/menu.svg    |  732 ++++++++++++++------------------
 hig3/C/figures/ui-elements/popover.svg |  568 +------------------------
 hig3/C/menus.page                      |   42 +--
 hig3/C/popovers.page                   |   36 +-
 hig3/C/ui-elements.page                |   30 +-
 5 files changed, 373 insertions(+), 1035 deletions(-)
---
diff --git a/hig3/C/figures/ui-elements/menu.svg b/hig3/C/figures/ui-elements/menu.svg
index 2f9ca76..dbd86fb 100644
--- a/hig3/C/figures/ui-elements/menu.svg
+++ b/hig3/C/figures/ui-elements/menu.svg
@@ -57,9 +57,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.9997383"
-     inkscape:cx="271.98003"
-     inkscape:cy="224.89518"
+     inkscape:zoom="1"
+     inkscape:cx="151.53289"
+     inkscape:cy="122.09147"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -68,7 +68,13 @@
      inkscape:window-height="874"
      inkscape:window-x="234"
      inkscape:window-y="144"
-     inkscape:window-maximized="0" />
+     inkscape:window-maximized="0"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4006" />
+  </sodipodi:namedview>
   <metadata
      id="metadata11714">
     <rdf:RDF>
@@ -77,7 +83,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -87,427 +93,317 @@
      id="layer1"
      transform="translate(0,-772.36218)">
     <g
-       id="g15615"
-       transform="translate(-512.0921,14.04088)">
+       id="g4008"
+       transform="translate(-2.9802322e-8,-4.0000331)">
+      <rect
+         y="811.86224"
+         x="46.5"
+         height="208.99994"
+         width="186"
+         id="rect3073"
+         
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
 />
+      <text
+         sodipodi:linespacing="220%"
+         id="text15086"
+         y="838.22717"
+         x="82"
+         
style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:220.00000477%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell"
+         xml:space="preserve"><tspan
+           id="tspan15088"
+           y="838.22717"
+           x="82"
+           sodipodi:role="line">Steak</tspan></text>
       <g
-         id="g15082"
-         transform="translate(-3745.9079,2628.959)">
-        <path
-           
style="fill:#eeeeec;fill-opacity:1;stroke:#babdb6;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
-           d="m 4305.5,-1836.1377 78,0 14,-12 14,12 78,0 c 3.324,0 6,2.676 6,6 l 0,207 c 0,3.324 -2.676,6 
-6,6 l -184,0 c -3.324,0 -6,-2.676 -6,-6 l 0,-207 c 0,-3.324 2.6768,-6.0707 6,-6 z"
-           id="path15084"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="scccssssssss" />
-        <text
-           xml:space="preserve"
-           
style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:220.00000477%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell"
-           x="4320"
-           y="-1804.7727"
-           id="text15086"
-           sodipodi:linespacing="220%"><tspan
-             sodipodi:role="line"
-             x="4320"
-             y="-1804.7727"
-             id="tspan15088">Steak</tspan></text>
-        <g
-           style="fill:#2e3436"
-           transform="translate(4459.0175,-1817.6552)"
-           id="g15090">
-          <g
-             id="g15092"
-             inkscape:label="status"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-221.00015,-317)">
-            <path
-               inkscape:connector-curvature="0"
-               d="m 229.00015,322.01754 c -1.64587,0 -2.98246,1.33658 -2.98246,2.98246 0,1.64587 
1.33659,2.98246 2.98246,2.98246 1.64587,0 2.98246,-1.33659 2.98246,-2.98246 0,-1.64588 -1.33659,-2.98246 
-2.98246,-2.98246 z"
-               id="path15094"
-               sodipodi:nodetypes="csssc"
-               
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;color:#bebebe;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78125;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Andale
 Mono" />
-          </g>
-          <g
-             id="g15096"
-             inkscape:label="devices"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-221.00015,-317)" />
-          <g
-             style="fill:#2e3436"
-             id="g15098"
-             inkscape:label="apps"
-             transform="translate(-221.00015,-317)" />
-          <g
-             id="g15100"
-             inkscape:label="places"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-221.00015,-317)" />
-          <g
-             style="fill:#2e3436"
-             id="g15102"
-             inkscape:label="mimetypes"
-             transform="translate(-221.00015,-317)" />
-          <g
-             id="g15104"
-             inkscape:label="emblems"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-221.00015,-317)" />
-          <g
-             id="g15106"
-             inkscape:label="emotes"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-221.00015,-317)" />
-          <g
-             id="g15108"
-             inkscape:label="categories"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-221.00015,-317)" />
-          <g
-             id="g15110"
-             inkscape:label="actions"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-221.00015,-317)" />
-        </g>
-        <text
-           sodipodi:linespacing="220%"
-           id="text15112"
-           y="-1776.7727"
-           x="4320"
-           
style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:220.00000477%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell"
-           xml:space="preserve"><tspan
-             id="tspan15114"
-             y="-1776.7727"
-             x="4320"
-             sodipodi:role="line">Pizza</tspan></text>
-        <g
-           id="g15116"
-           transform="translate(4459.1087,-1789.6377)">
-          <g
-             transform="translate(-221.09131,-316.98246)"
-             style="display:inline"
-             inkscape:label="status"
-             id="g15118">
-            <path
-               
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78125;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Andale
 Mono"
-               sodipodi:nodetypes="csssc"
-               id="path15120"
-               d="m 229.00015,322.01754 c -1.64587,0 -2.98246,1.33658 -2.98246,2.98246 0,1.64587 
1.33659,2.98246 2.98246,2.98246 1.64587,0 2.98246,-1.33659 2.98246,-2.98246 0,-1.64588 -1.33659,-2.98246 
-2.98246,-2.98246 z"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(-221.00015,-317)"
-             style="display:inline"
-             inkscape:label="devices"
-             id="g15122" />
-          <g
-             transform="translate(-221.00015,-317)"
-             inkscape:label="apps"
-             id="g15124" />
-          <g
-             transform="translate(-221.00015,-317)"
-             style="display:inline"
-             inkscape:label="places"
-             id="g15126" />
-          <g
-             transform="translate(-221.00015,-317)"
-             inkscape:label="mimetypes"
-             id="g15128" />
-          <g
-             transform="translate(-221.00015,-317)"
-             style="display:inline"
-             inkscape:label="emblems"
-             id="g15130" />
-          <g
-             transform="translate(-221.00015,-317)"
-             style="display:inline"
-             inkscape:label="emotes"
-             id="g15132" />
-          <g
-             transform="translate(-221.00015,-317)"
-             style="display:inline"
-             inkscape:label="categories"
-             id="g15134" />
-          <g
-             transform="translate(-221.00015,-317)"
-             style="display:inline"
-             inkscape:label="actions"
-             id="g15136" />
-        </g>
-        <text
-           sodipodi:linespacing="220%"
-           id="text15138"
-           y="-1735.7716"
-           x="4320.0024"
-           
style="font-size:13.99999142px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:220.00000477%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell"
-           xml:space="preserve"><tspan
-             id="tspan15140"
-             y="-1735.7716"
-             x="4320.0024"
-             sodipodi:role="line">Wine</tspan></text>
-        <text
-           xml:space="preserve"
-           
style="font-size:13.99999142px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:220.00000477%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell"
-           x="4320.0024"
-           y="-1707.7716"
-           id="text15142"
-           sodipodi:linespacing="220%"><tspan
-             sodipodi:role="line"
-             x="4320.0024"
-             y="-1707.7716"
-             id="tspan15144">Beer</tspan></text>
-        <text
-           xml:space="preserve"
-           
style="font-size:13.99999142px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:220.00000477%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell"
-           x="4320.0024"
-           y="-1679.7717"
-           id="text15146"
-           sodipodi:linespacing="220%"><tspan
-             sodipodi:role="line"
-             x="4320.0024"
-             y="-1679.7717"
-             id="tspan15148">Water</tspan></text>
-        <g
-           style="fill:#2e3436"
-           transform="matrix(0.99999877,0,0,1,4459.0074,-1748.7627)"
-           id="g15150">
-          <g
-             id="g15152"
-             inkscape:label="status"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-261.0002,-317)">
-            <path
-               inkscape:connector-curvature="0"
-               d="M 272.9375,320.9375 268,325.875 l -1.9375,-1.9375 -2.125,2.125 3,3 1.0625,1.0625 
1.0625,-1.0625 6,-6 -2.125,-2.125 z"
-               id="path15154"
-               
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
 />
-          </g>
-          <g
-             id="g15156"
-             inkscape:label="devices"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-261.0002,-317)" />
-          <g
-             style="fill:#2e3436"
-             id="g15158"
-             inkscape:label="apps"
-             transform="translate(-261.0002,-317)" />
-          <g
-             id="g15160"
-             inkscape:label="places"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-261.0002,-317)" />
-          <g
-             style="fill:#2e3436"
-             id="g15162"
-             inkscape:label="mimetypes"
-             transform="translate(-261.0002,-317)" />
-          <g
-             id="g15164"
-             inkscape:label="emblems"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-261.0002,-317)" />
-          <g
-             id="g15166"
-             inkscape:label="emotes"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-261.0002,-317)" />
-          <g
-             id="g15168"
-             inkscape:label="categories"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-261.0002,-317)" />
-          <g
-             id="g15170"
-             inkscape:label="actions"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-261.0002,-317)" />
+         id="g15090"
+         transform="translate(57.0175,825.3447)"
+         style="fill:#2e3436">
+        <g
+           transform="translate(-221.00015,-317)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="status"
+           id="g15092">
+          <path
+             
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;color:#bebebe;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78125;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Andale
 Mono"
+             sodipodi:nodetypes="csssc"
+             id="path15094"
+             d="m 229.00015,322.01754 c -1.64587,0 -2.98246,1.33658 -2.98246,2.98246 0,1.64587 
1.33659,2.98246 2.98246,2.98246 1.64587,0 2.98246,-1.33659 2.98246,-2.98246 0,-1.64588 -1.33659,-2.98246 
-2.98246,-2.98246 z"
+             inkscape:connector-curvature="0" />
         </g>
         <g
-           style="fill:#2e3436"
-           id="g15172"
-           transform="matrix(0.99999877,0,0,1,4458.9964,-1720.7627)">
-          <g
-             transform="translate(-261.0002,-317)"
-             style="fill:#2e3436;display:inline"
-             inkscape:label="status"
-             id="g15174">
-            <path
-               
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-               id="path15176"
-               d="M 272.9375,320.9375 268,325.875 l -1.9375,-1.9375 -2.125,2.125 3,3 1.0625,1.0625 
1.0625,-1.0625 6,-6 -2.125,-2.125 z"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(-261.0002,-317)"
-             style="fill:#2e3436;display:inline"
-             inkscape:label="devices"
-             id="g15178" />
-          <g
-             style="fill:#2e3436"
-             transform="translate(-261.0002,-317)"
-             inkscape:label="apps"
-             id="g15180" />
-          <g
-             transform="translate(-261.0002,-317)"
-             style="fill:#2e3436;display:inline"
-             inkscape:label="places"
-             id="g15182" />
-          <g
-             style="fill:#2e3436"
-             transform="translate(-261.0002,-317)"
-             inkscape:label="mimetypes"
-             id="g15184" />
-          <g
-             transform="translate(-261.0002,-317)"
-             style="fill:#2e3436;display:inline"
-             inkscape:label="emblems"
-             id="g15186" />
-          <g
-             transform="translate(-261.0002,-317)"
-             style="fill:#2e3436;display:inline"
-             inkscape:label="emotes"
-             id="g15188" />
-          <g
-             transform="translate(-261.0002,-317)"
-             style="fill:#2e3436;display:inline"
-             inkscape:label="categories"
-             id="g15190" />
-          <g
-             transform="translate(-261.0002,-317)"
-             style="fill:#2e3436;display:inline"
-             inkscape:label="actions"
-             id="g15192" />
+           transform="translate(-221.00015,-317)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="devices"
+           id="g15096" />
+        <g
+           transform="translate(-221.00015,-317)"
+           inkscape:label="apps"
+           id="g15098"
+           style="fill:#2e3436" />
+        <g
+           transform="translate(-221.00015,-317)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="places"
+           id="g15100" />
+        <g
+           transform="translate(-221.00015,-317)"
+           inkscape:label="mimetypes"
+           id="g15102"
+           style="fill:#2e3436" />
+        <g
+           transform="translate(-221.00015,-317)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="emblems"
+           id="g15104" />
+        <g
+           transform="translate(-221.00015,-317)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="emotes"
+           id="g15106" />
+        <g
+           transform="translate(-221.00015,-317)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="categories"
+           id="g15108" />
+        <g
+           transform="translate(-221.00015,-317)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="actions"
+           id="g15110" />
+      </g>
+      <text
+         xml:space="preserve"
+         
style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:220.00000477%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell"
+         x="82"
+         y="866.22717"
+         id="text15112"
+         sodipodi:linespacing="220%"><tspan
+           sodipodi:role="line"
+           x="82"
+           y="866.22717"
+           id="tspan15114">Pizza</tspan></text>
+      <text
+         xml:space="preserve"
+         
style="font-size:13.99999142px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:220.00000477%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell"
+         x="82.002441"
+         y="907.22827"
+         id="text15138"
+         sodipodi:linespacing="220%"><tspan
+           sodipodi:role="line"
+           x="82.002441"
+           y="907.22827"
+           id="tspan15140">Wine</tspan></text>
+      <text
+         sodipodi:linespacing="220%"
+         id="text15142"
+         y="935.22827"
+         x="82.002441"
+         
style="font-size:13.99999142px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:220.00000477%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell"
+         xml:space="preserve"><tspan
+           id="tspan15144"
+           y="935.22827"
+           x="82.002441"
+           sodipodi:role="line">Beer</tspan></text>
+      <text
+         sodipodi:linespacing="220%"
+         id="text15146"
+         y="963.22815"
+         x="82.002441"
+         
style="font-size:13.99999142px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:220.00000477%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell"
+         xml:space="preserve"><tspan
+           id="tspan15148"
+           y="963.22815"
+           x="82.002441"
+           sodipodi:role="line">Water</tspan></text>
+      <g
+         id="g15150"
+         transform="matrix(0.99999877,0,0,1,57.0074,894.2372)"
+         style="fill:#2e3436">
+        <g
+           transform="translate(-261.0002,-317)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="status"
+           id="g15152">
+          <path
+             
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+             id="path15154"
+             d="M 272.9375,320.9375 268,325.875 l -1.9375,-1.9375 -2.125,2.125 3,3 1.0625,1.0625 
1.0625,-1.0625 6,-6 -2.125,-2.125 z"
+             inkscape:connector-curvature="0" />
         </g>
         <g
-           id="g15194"
-           transform="matrix(0.99999877,0,0,1,4459.0156,-1692.7627)">
-          <g
-             transform="translate(-261.0002,-317)"
-             style="display:inline"
-             inkscape:label="status"
-             id="g15196">
-            <path
-               
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-               id="path15198"
-               d="M 272.9375,320.9375 268,325.875 l -1.9375,-1.9375 -2.125,2.125 3,3 1.0625,1.0625 
1.0625,-1.0625 6,-6 -2.125,-2.125 z"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(-261.0002,-317)"
-             style="display:inline"
-             inkscape:label="devices"
-             id="g15200" />
-          <g
-             transform="translate(-261.0002,-317)"
-             inkscape:label="apps"
-             id="g15202" />
-          <g
-             transform="translate(-261.0002,-317)"
-             style="display:inline"
-             inkscape:label="places"
-             id="g15204" />
-          <g
-             transform="translate(-261.0002,-317)"
-             inkscape:label="mimetypes"
-             id="g15206" />
-          <g
-             transform="translate(-261.0002,-317)"
-             style="display:inline"
-             inkscape:label="emblems"
-             id="g15208" />
-          <g
-             transform="translate(-261.0002,-317)"
-             style="display:inline"
-             inkscape:label="emotes"
-             id="g15210" />
-          <g
-             transform="translate(-261.0002,-317)"
-             style="display:inline"
-             inkscape:label="categories"
-             id="g15212" />
-          <g
-             transform="translate(-261.0002,-317)"
-             style="display:inline"
-             inkscape:label="actions"
-             id="g15214" />
+           transform="translate(-261.0002,-317)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="devices"
+           id="g15156" />
+        <g
+           transform="translate(-261.0002,-317)"
+           inkscape:label="apps"
+           id="g15158"
+           style="fill:#2e3436" />
+        <g
+           transform="translate(-261.0002,-317)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="places"
+           id="g15160" />
+        <g
+           transform="translate(-261.0002,-317)"
+           inkscape:label="mimetypes"
+           id="g15162"
+           style="fill:#2e3436" />
+        <g
+           transform="translate(-261.0002,-317)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="emblems"
+           id="g15164" />
+        <g
+           transform="translate(-261.0002,-317)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="emotes"
+           id="g15166" />
+        <g
+           transform="translate(-261.0002,-317)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="categories"
+           id="g15168" />
+        <g
+           transform="translate(-261.0002,-317)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="actions"
+           id="g15170" />
+      </g>
+      <g
+         transform="matrix(0.99999877,0,0,1,56.9964,922.2372)"
+         id="g15172"
+         style="fill:#2e3436">
+        <g
+           id="g15174"
+           inkscape:label="status"
+           style="fill:#2e3436;display:inline"
+           transform="translate(-261.0002,-317)">
+          <path
+             inkscape:connector-curvature="0"
+             d="M 272.9375,320.9375 268,325.875 l -1.9375,-1.9375 -2.125,2.125 3,3 1.0625,1.0625 
1.0625,-1.0625 6,-6 -2.125,-2.125 z"
+             id="path15176"
+             
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
 />
         </g>
-        <text
-           sodipodi:linespacing="220%"
-           id="text15216"
-           y="-1638.7717"
-           x="4320.0024"
-           
style="font-size:13.99999142px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:220.00000477%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell"
-           xml:space="preserve"><tspan
-             id="tspan15218"
-             y="-1638.7717"
-             x="4320.0024"
-             sodipodi:role="line">Dessert</tspan></text>
-        <g
-           style="fill:#2e3436"
-           transform="matrix(0,-1,0.99999877,0,4459.0622,-1635.6377)"
-           id="g15220">
-          <g
-             id="g15222"
-             inkscape:label="status"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-341.0002,-807.00001)" />
-          <g
-             id="g15224"
-             inkscape:label="devices"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-341.0002,-807.00001)" />
-          <g
-             style="fill:#2e3436"
-             id="g15226"
-             inkscape:label="apps"
-             transform="translate(-341.0002,-807.00001)" />
-          <g
-             id="g15228"
-             inkscape:label="places"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-341.0002,-807.00001)" />
-          <g
-             style="fill:#2e3436"
-             id="g15230"
-             inkscape:label="mimetypes"
-             transform="translate(-341.0002,-807.00001)" />
-          <g
-             id="g15232"
-             inkscape:label="emblems"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-341.0002,-807.00001)" />
-          <g
-             id="g15234"
-             inkscape:label="emotes"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-341.0002,-807.00001)" />
-          <g
-             id="g15236"
-             inkscape:label="categories"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-341.0002,-807.00001)" />
-          <g
-             id="g15238"
-             inkscape:label="actions"
-             style="fill:#2e3436;display:inline"
-             transform="translate(-341.0002,-807.00001)">
-            <path
-               inkscape:connector-curvature="0"
-               d="m 354.0002,812.93751 -5,5 -5,-5 z"
-               id="path15240"
-               sodipodi:nodetypes="cccc"
-               style="fill:#2e3436;fill-opacity:1;stroke:none" />
-          </g>
+        <g
+           id="g15178"
+           inkscape:label="devices"
+           style="fill:#2e3436;display:inline"
+           transform="translate(-261.0002,-317)" />
+        <g
+           id="g15180"
+           inkscape:label="apps"
+           transform="translate(-261.0002,-317)"
+           style="fill:#2e3436" />
+        <g
+           id="g15182"
+           inkscape:label="places"
+           style="fill:#2e3436;display:inline"
+           transform="translate(-261.0002,-317)" />
+        <g
+           id="g15184"
+           inkscape:label="mimetypes"
+           transform="translate(-261.0002,-317)"
+           style="fill:#2e3436" />
+        <g
+           id="g15186"
+           inkscape:label="emblems"
+           style="fill:#2e3436;display:inline"
+           transform="translate(-261.0002,-317)" />
+        <g
+           id="g15188"
+           inkscape:label="emotes"
+           style="fill:#2e3436;display:inline"
+           transform="translate(-261.0002,-317)" />
+        <g
+           id="g15190"
+           inkscape:label="categories"
+           style="fill:#2e3436;display:inline"
+           transform="translate(-261.0002,-317)" />
+        <g
+           id="g15192"
+           inkscape:label="actions"
+           style="fill:#2e3436;display:inline"
+           transform="translate(-261.0002,-317)" />
+      </g>
+      <text
+         xml:space="preserve"
+         
style="font-size:13.99999142px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:220.00000477%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell"
+         x="82.002441"
+         y="1004.2281"
+         id="text15216"
+         sodipodi:linespacing="220%"><tspan
+           sodipodi:role="line"
+           x="82.002441"
+           y="1004.2281"
+           id="tspan15218">Dessert</tspan></text>
+      <g
+         id="g15220"
+         transform="matrix(0,-1,0.99999877,0,201.0622,1007.3622)"
+         style="fill:#2e3436">
+        <g
+           transform="translate(-341.0002,-807.00001)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="status"
+           id="g15222" />
+        <g
+           transform="translate(-341.0002,-807.00001)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="devices"
+           id="g15224" />
+        <g
+           transform="translate(-341.0002,-807.00001)"
+           inkscape:label="apps"
+           id="g15226"
+           style="fill:#2e3436" />
+        <g
+           transform="translate(-341.0002,-807.00001)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="places"
+           id="g15228" />
+        <g
+           transform="translate(-341.0002,-807.00001)"
+           inkscape:label="mimetypes"
+           id="g15230"
+           style="fill:#2e3436" />
+        <g
+           transform="translate(-341.0002,-807.00001)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="emblems"
+           id="g15232" />
+        <g
+           transform="translate(-341.0002,-807.00001)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="emotes"
+           id="g15234" />
+        <g
+           transform="translate(-341.0002,-807.00001)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="categories"
+           id="g15236" />
+        <g
+           transform="translate(-341.0002,-807.00001)"
+           style="fill:#2e3436;display:inline"
+           inkscape:label="actions"
+           id="g15238">
+          <path
+             style="fill:#2e3436;fill-opacity:1;stroke:none"
+             sodipodi:nodetypes="cccc"
+             id="path15240"
+             d="m 354.0002,812.93751 -5,5 -5,-5 z"
+             inkscape:connector-curvature="0" />
         </g>
-        <path
-           inkscape:connector-curvature="0"
-           id="path15242"
-           d="m 4312.4971,-1761.1377 170,0"
-           
style="fill:none;stroke:#babdb6;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
 />
-        <path
-           
style="fill:none;stroke:#babdb6;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-           d="m 4312.4973,-1664.1377 169.9998,0"
-           id="path15244"
-           inkscape:connector-curvature="0" />
       </g>
+      <path
+         
style="fill:none;stroke:#eeeeec;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 52.497099,881.8622 174.000001,0"
+         id="path15242"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path15244"
+         d="m 52.497304,978.8622 173.999796,0"
+         
style="fill:none;stroke:#eeeeec;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
 />
     </g>
   </g>
 </svg>
diff --git a/hig3/C/figures/ui-elements/popover.svg b/hig3/C/figures/ui-elements/popover.svg
index 71fea14..6be918f 100644
--- a/hig3/C/figures/ui-elements/popover.svg
+++ b/hig3/C/figures/ui-elements/popover.svg
@@ -24,9 +24,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.9997383"
-     inkscape:cx="112.93841"
-     inkscape:cy="124.869"
+     inkscape:zoom="1"
+     inkscape:cx="252.51905"
+     inkscape:cy="182.96756"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -44,7 +44,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -53,559 +53,11 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-772.36218)">
-    <g
-       transform="translate(-4318,3707)"
-       id="g13798">
-      <path
-         
style="fill:#eeeeec;fill-opacity:1;stroke:#babdb6;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
-         d="m 4361.5,-2903.1378 82,0 14,-12 14,12 82,0 c 3.324,0 6,2.676 6,6 l 0,217 c 0,3.324 -2.676,6 -6,6 
l -192,0 c -3.324,0 -6,-2.676 -6,-6 l 0,-217 c 0,-3.324 2.6768,-6.0707 6,-6 z"
-         id="path13588"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="scccssssssss" />
-      <rect
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/lapo.fedora/SparkleShare/gnome-mockups/content 
selection/content-selection.png"
-         ry="3"
-         rx="3.0000005"
-         y="-2888.1377"
-         x="4368.5"
-         height="33"
-         width="177"
-         id="rect13590"
-         
style="color:#000000;fill:#d3d7cf;fill-opacity:1;fill-rule:nonzero;stroke:#a7a7a7;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
 />
-      <path
-         inkscape:connector-curvature="0"
-         id="path13592"
-         d="m 4427.5,-2888.1378 0,32.75"
-         
style="fill:none;stroke:#a7a7a7;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 
/>
-      <text
-         xml:space="preserve"
-         
style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:220.00000477%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell"
-         x="4376.0029"
-         y="-2816.7727"
-         id="text13594"
-         sodipodi:linespacing="220%"><tspan
-           sodipodi:role="line"
-           x="4376.0029"
-           y="-2816.7727"
-           id="tspan13596">Steak</tspan></text>
-      <g
-         style="fill:#2e3436"
-         transform="translate(4523.0204,-2829.6552)"
-         id="g13598">
-        <g
-           id="g13600"
-           inkscape:label="status"
-           style="fill:#2e3436;display:inline"
-           transform="translate(-221.00015,-317)">
-          <path
-             inkscape:connector-curvature="0"
-             d="m 229.00015,322.01754 c -1.64587,0 -2.98246,1.33658 -2.98246,2.98246 0,1.64587 
1.33659,2.98246 2.98246,2.98246 1.64587,0 2.98246,-1.33659 2.98246,-2.98246 0,-1.64588 -1.33659,-2.98246 
-2.98246,-2.98246 z"
-             id="path13602"
-             sodipodi:nodetypes="csssc"
-             
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;color:#bebebe;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78125;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Andale
 Mono" />
-        </g>
-        <g
-           id="g13604"
-           inkscape:label="devices"
-           style="fill:#2e3436;display:inline"
-           transform="translate(-221.00015,-317)" />
-        <g
-           style="fill:#2e3436"
-           id="g13606"
-           inkscape:label="apps"
-           transform="translate(-221.00015,-317)" />
-        <g
-           id="g13608"
-           inkscape:label="places"
-           style="fill:#2e3436;display:inline"
-           transform="translate(-221.00015,-317)" />
-        <g
-           style="fill:#2e3436"
-           id="g13610"
-           inkscape:label="mimetypes"
-           transform="translate(-221.00015,-317)" />
-        <g
-           id="g13612"
-           inkscape:label="emblems"
-           style="fill:#2e3436;display:inline"
-           transform="translate(-221.00015,-317)" />
-        <g
-           id="g13614"
-           inkscape:label="emotes"
-           style="fill:#2e3436;display:inline"
-           transform="translate(-221.00015,-317)" />
-        <g
-           id="g13616"
-           inkscape:label="categories"
-           style="fill:#2e3436;display:inline"
-           transform="translate(-221.00015,-317)" />
-        <g
-           id="g13618"
-           inkscape:label="actions"
-           style="fill:#2e3436;display:inline"
-           transform="translate(-221.00015,-317)" />
-      </g>
-      <text
-         sodipodi:linespacing="220%"
-         id="text13620"
-         y="-2788.7727"
-         x="4376.0029"
-         
style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:220.00000477%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell"
-         xml:space="preserve"><tspan
-           id="tspan13622"
-           y="-2788.7727"
-           x="4376.0029"
-           sodipodi:role="line">Pizza</tspan></text>
-      <g
-         id="g13624"
-         transform="translate(4523.1116,-2801.6377)">
-        <g
-           transform="translate(-221.09131,-316.98246)"
-           style="display:inline"
-           inkscape:label="status"
-           id="g13626">
-          <path
-             
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78125;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Andale
 Mono"
-             sodipodi:nodetypes="csssc"
-             id="path13628"
-             d="m 229.00015,322.01754 c -1.64587,0 -2.98246,1.33658 -2.98246,2.98246 0,1.64587 
1.33659,2.98246 2.98246,2.98246 1.64587,0 2.98246,-1.33659 2.98246,-2.98246 0,-1.64588 -1.33659,-2.98246 
-2.98246,-2.98246 z"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           transform="translate(-221.00015,-317)"
-           style="display:inline"
-           inkscape:label="devices"
-           id="g13630" />
-        <g
-           transform="translate(-221.00015,-317)"
-           inkscape:label="apps"
-           id="g13632" />
-        <g
-           transform="translate(-221.00015,-317)"
-           style="display:inline"
-           inkscape:label="places"
-           id="g13634" />
-        <g
-           transform="translate(-221.00015,-317)"
-           inkscape:label="mimetypes"
-           id="g13636" />
-        <g
-           transform="translate(-221.00015,-317)"
-           style="display:inline"
-           inkscape:label="emblems"
-           id="g13638" />
-        <g
-           transform="translate(-221.00015,-317)"
-           style="display:inline"
-           inkscape:label="emotes"
-           id="g13640" />
-        <g
-           transform="translate(-221.00015,-317)"
-           style="display:inline"
-           inkscape:label="categories"
-           id="g13642" />
-        <g
-           transform="translate(-221.00015,-317)"
-           style="display:inline"
-           inkscape:label="actions"
-           id="g13644" />
-      </g>
-      <text
-         sodipodi:linespacing="220%"
-         id="text13646"
-         y="-2747.7715"
-         x="4376.0054"
-         
style="font-size:13.99999142px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:220.00000477%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell"
-         xml:space="preserve"><tspan
-           id="tspan13648"
-           y="-2747.7715"
-           x="4376.0054"
-           sodipodi:role="line">Wine</tspan></text>
-      <text
-         xml:space="preserve"
-         
style="font-size:13.99999142px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:220.00000477%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell"
-         x="4376.0054"
-         y="-2719.7715"
-         id="text13650"
-         sodipodi:linespacing="220%"><tspan
-           sodipodi:role="line"
-           x="4376.0054"
-           y="-2719.7715"
-           id="tspan13652">Beer</tspan></text>
-      <text
-         xml:space="preserve"
-         
style="font-size:13.99999142px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:220.00000477%;letter-spacing:0px;word-spacing:0px;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell"
-         x="4376.0054"
-         y="-2691.7717"
-         id="text13654"
-         sodipodi:linespacing="220%"><tspan
-           sodipodi:role="line"
-           x="4376.0054"
-           y="-2691.7717"
-           id="tspan13656">Water</tspan></text>
-      <g
-         style="fill:#2e3436"
-         transform="matrix(0.99999877,0,0,1,4523.0103,-2760.7627)"
-         id="g13658">
-        <g
-           id="g13660"
-           inkscape:label="status"
-           style="fill:#2e3436;display:inline"
-           transform="translate(-261.0002,-317)">
-          <path
-             inkscape:connector-curvature="0"
-             d="M 272.9375,320.9375 268,325.875 l -1.9375,-1.9375 -2.125,2.125 3,3 1.0625,1.0625 
1.0625,-1.0625 6,-6 -2.125,-2.125 z"
-             id="path13662"
-             
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
 />
-        </g>
-        <g
-           id="g13664"
-           inkscape:label="devices"
-           style="fill:#2e3436;display:inline"
-           transform="translate(-261.0002,-317)" />
-        <g
-           style="fill:#2e3436"
-           id="g13666"
-           inkscape:label="apps"
-           transform="translate(-261.0002,-317)" />
-        <g
-           id="g13668"
-           inkscape:label="places"
-           style="fill:#2e3436;display:inline"
-           transform="translate(-261.0002,-317)" />
-        <g
-           style="fill:#2e3436"
-           id="g13670"
-           inkscape:label="mimetypes"
-           transform="translate(-261.0002,-317)" />
-        <g
-           id="g13672"
-           inkscape:label="emblems"
-           style="fill:#2e3436;display:inline"
-           transform="translate(-261.0002,-317)" />
-        <g
-           id="g13674"
-           inkscape:label="emotes"
-           style="fill:#2e3436;display:inline"
-           transform="translate(-261.0002,-317)" />
-        <g
-           id="g13676"
-           inkscape:label="categories"
-           style="fill:#2e3436;display:inline"
-           transform="translate(-261.0002,-317)" />
-        <g
-           id="g13678"
-           inkscape:label="actions"
-           style="fill:#2e3436;display:inline"
-           transform="translate(-261.0002,-317)" />
-      </g>
-      <g
-         style="fill:#2e3436"
-         id="g13680"
-         transform="matrix(0.99999877,0,0,1,4522.9993,-2732.7627)">
-        <g
-           transform="translate(-261.0002,-317)"
-           style="fill:#2e3436;display:inline"
-           inkscape:label="status"
-           id="g13682">
-          <path
-             
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-             id="path13684"
-             d="M 272.9375,320.9375 268,325.875 l -1.9375,-1.9375 -2.125,2.125 3,3 1.0625,1.0625 
1.0625,-1.0625 6,-6 -2.125,-2.125 z"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           transform="translate(-261.0002,-317)"
-           style="fill:#2e3436;display:inline"
-           inkscape:label="devices"
-           id="g13686" />
-        <g
-           style="fill:#2e3436"
-           transform="translate(-261.0002,-317)"
-           inkscape:label="apps"
-           id="g13688" />
-        <g
-           transform="translate(-261.0002,-317)"
-           style="fill:#2e3436;display:inline"
-           inkscape:label="places"
-           id="g13690" />
-        <g
-           style="fill:#2e3436"
-           transform="translate(-261.0002,-317)"
-           inkscape:label="mimetypes"
-           id="g13692" />
-        <g
-           transform="translate(-261.0002,-317)"
-           style="fill:#2e3436;display:inline"
-           inkscape:label="emblems"
-           id="g13694" />
-        <g
-           transform="translate(-261.0002,-317)"
-           style="fill:#2e3436;display:inline"
-           inkscape:label="emotes"
-           id="g13696" />
-        <g
-           transform="translate(-261.0002,-317)"
-           style="fill:#2e3436;display:inline"
-           inkscape:label="categories"
-           id="g13698" />
-        <g
-           transform="translate(-261.0002,-317)"
-           style="fill:#2e3436;display:inline"
-           inkscape:label="actions"
-           id="g13700" />
-      </g>
-      <g
-         id="g13702"
-         transform="matrix(0.99999877,0,0,1,4523.0185,-2704.7627)">
-        <g
-           transform="translate(-261.0002,-317)"
-           style="display:inline"
-           inkscape:label="status"
-           id="g13704">
-          <path
-             
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-             id="path13706"
-             d="M 272.9375,320.9375 268,325.875 l -1.9375,-1.9375 -2.125,2.125 3,3 1.0625,1.0625 
1.0625,-1.0625 6,-6 -2.125,-2.125 z"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           transform="translate(-261.0002,-317)"
-           style="display:inline"
-           inkscape:label="devices"
-           id="g13708" />
-        <g
-           transform="translate(-261.0002,-317)"
-           inkscape:label="apps"
-           id="g13710" />
-        <g
-           transform="translate(-261.0002,-317)"
-           style="display:inline"
-           inkscape:label="places"
-           id="g13712" />
-        <g
-           transform="translate(-261.0002,-317)"
-           inkscape:label="mimetypes"
-           id="g13714" />
-        <g
-           transform="translate(-261.0002,-317)"
-           style="display:inline"
-           inkscape:label="emblems"
-           id="g13716" />
-        <g
-           transform="translate(-261.0002,-317)"
-           style="display:inline"
-           inkscape:label="emotes"
-           id="g13718" />
-        <g
-           transform="translate(-261.0002,-317)"
-           style="display:inline"
-           inkscape:label="categories"
-           id="g13720" />
-        <g
-           transform="translate(-261.0002,-317)"
-           style="display:inline"
-           inkscape:label="actions"
-           id="g13722" />
-      </g>
-      <path
-         inkscape:connector-curvature="0"
-         id="path13724"
-         d="m 4368.6025,-2773.1377 176.9117,0"
-         
style="fill:none;stroke:#babdb6;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
 />
-      <path
-         
style="fill:none;stroke:#babdb6;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 4368.6908,-2842.1378 176.9117,0"
-         id="path13726"
-         inkscape:connector-curvature="0" />
-      <g
-         id="g13728"
-         transform="translate(4390.0001,-2879.651)"
-         style="fill:#2e3436">
-        <g
-           style="fill:#2e3436;display:inline"
-           inkscape:label="status"
-           id="g13730"
-           transform="translate(-40,-668)" />
-        <g
-           inkscape:label="devices"
-           id="g13732"
-           transform="translate(-40,-668)"
-           style="fill:#2e3436" />
-        <g
-           inkscape:label="apps"
-           id="g13734"
-           transform="translate(-40,-668)"
-           style="fill:#2e3436" />
-        <g
-           inkscape:label="actions"
-           id="g13736"
-           transform="translate(-40,-668)"
-           style="fill:#2e3436">
-          <path
-             
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:4.79973984;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream
 Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
-             id="path13738"
-             d="m 43.5,676.98684 c -1.904524,0 -3.492268,1.57485 -3.492268,3.51316 0,1.93831 
1.587744,3.51316 3.492268,3.51316 1.904524,0 3.492268,-1.57485 3.492268,-3.51316 0,-1.93831 
-1.587744,-3.51316 -3.492268,-3.51316 z m 0,2.02632 c 0.8569,0 1.507732,0.66373 1.507732,1.48684 0,0.82312 
-0.650832,1.48684 -1.507732,1.48684 -0.8569,0 -1.507732,-0.66372 -1.507732,-1.48684 0,-0.82311 
0.650832,-1.48684 1.507732,-1.48684 z"
-             inkscape:connector-curvature="0" />
-          <path
-             
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:4.79973984;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream
 Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
-             id="path13740"
-             d="m 52.499999,676.98685 c -1.904524,0 -3.492268,1.57485 -3.492268,3.51315 0,1.93831 
1.587744,3.51316 3.492268,3.51316 1.904525,0 3.492269,-1.57485 3.492269,-3.51316 0,-1.9383 -1.587744,-3.51315 
-3.492269,-3.51315 z m 0,2.02631 c 0.8569,0 1.507733,0.66373 1.507733,1.48684 0,0.82312 -0.650833,1.48685 
-1.507733,1.48685 -0.8569,0 -1.507732,-0.66373 -1.507732,-1.48685 0,-0.82311 0.650832,-1.48684 
1.507732,-1.48684 z"
-             inkscape:connector-curvature="0" />
-          <path
-             style="fill:#2e3436;fill-opacity:1;stroke:none"
-             sodipodi:nodetypes="ccccccccccccc"
-             id="path13742"
-             d="m 43.096112,668 c -1.060411,0.554 -1.406518,1.7592 -0.794292,2.71875 L 46.722226,678 l 
-1.746288,2.36796 1.414082,2.08517 1.60998,-2.48438 1.57873,2.48438 1.401138,-1.99679 L 49.277774,678 
53.69818,670.71875 C 54.310406,669.7592 53.964299,668.554 52.903888,668 L 48,676 43.096112,668 z"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           inkscape:label="places"
-           id="g13744"
-           transform="translate(-40,-668)"
-           style="fill:#2e3436" />
-        <g
-           inkscape:label="mimetypes"
-           id="g13746"
-           transform="translate(-40,-668)"
-           style="fill:#2e3436" />
-        <g
-           style="fill:#2e3436;display:inline"
-           inkscape:label="emblems"
-           id="g13748"
-           transform="translate(-40,-668)" />
-      </g>
-      <g
-         id="g13750"
-         transform="translate(4449.0046,-2879.6065)"
-         style="fill:#2e3436">
-        <g
-           style="fill:#2e3436;display:inline"
-           inkscape:label="status"
-           id="g13752"
-           transform="translate(-80,-668)" />
-        <g
-           inkscape:label="devices"
-           id="g13754"
-           transform="translate(-80,-668)"
-           style="fill:#2e3436" />
-        <g
-           inkscape:label="apps"
-           id="g13756"
-           transform="translate(-80,-668)"
-           style="fill:#2e3436" />
-        <g
-           inkscape:label="actions"
-           id="g13758"
-           transform="translate(-80,-668)"
-           style="fill:#2e3436">
-          <path
-             style="fill:#2e3436;fill-opacity:1;stroke:none"
-             sodipodi:nodetypes="ccccccc"
-             id="path13760"
-             d="m 87,675 0,6.96874 5.000005,0 1.990842,-1.98705 -0.0221,-4.98168 -6.96875,0 L 87,675 z"
-             inkscape:connector-curvature="0" />
-          <path
-             style="fill:#2e3436;fill-opacity:1;stroke:none"
-             sodipodi:nodetypes="cccccccc"
-             id="path13762"
-             d="m 82.000003,670 0,7.96874 L 86,678 l 0,-4 3,0 -0.03125,-3.99999 -6.96875,0 3e-6,-10e-6 z"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           inkscape:label="places"
-           id="g13764"
-           transform="translate(-80,-668)"
-           style="fill:#2e3436" />
-        <g
-           inkscape:label="mimetypes"
-           id="g13766"
-           transform="translate(-80,-668)"
-           style="fill:#2e3436" />
-        <g
-           style="fill:#2e3436;display:inline"
-           inkscape:label="emblems"
-           id="g13768"
-           transform="translate(-80,-668)" />
-      </g>
-      <g
-         id="g13770"
-         transform="translate(4508.5156,-2879.3377)"
-         style="fill:#2e3436">
-        <g
-           style="fill:#2e3436;display:inline"
-           inkscape:label="status"
-           id="g13772"
-           transform="translate(-60,-668)" />
-        <g
-           inkscape:label="devices"
-           id="g13774"
-           transform="translate(-60,-668)"
-           style="fill:#2e3436" />
-        <g
-           inkscape:label="apps"
-           id="g13776"
-           transform="translate(-60,-668)"
-           style="fill:#2e3436" />
-        <g
-           inkscape:label="actions"
-           id="g13778"
-           transform="translate(-60,-668)"
-           style="fill:#2e3436">
-          <path
-             style="fill:#2e3436;fill-opacity:1;stroke:none"
-             sodipodi:nodetypes="ccccccc"
-             id="path13780"
-             d="m 64.031245,673.03127 0,6.96874 5.000005,0 1.990842,-1.98705 -0.0221,-4.98168 -6.96875,0 
3e-6,-1e-5 z"
-             inkscape:connector-curvature="0" />
-          <rect
-             style="fill:#2e3436;fill-opacity:1;stroke:none"
-             width="5.0625052"
-             height="4"
-             ry="0.53033006"
-             rx="0.53033006"
-             id="rect13782"
-             y="668"
-             x="64.999992" />
-          <path
-             
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream
 Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
-             id="path13784"
-             d="m 62.5,669 c -0.293087,0 -0.646731,0.036 -1,0.3125 -0.353269,0.27647 -0.53125,0.76875 
-0.53125,1.125 l 0,12.03125 c 0,0.384 0.127689,0.81517 0.4375,1.125 0.285418,0.28544 0.709136,0.38602 
1.09375,0.375 l 0,0.0313 0.09375,0 9.875,0 c 0.362847,0 0.759922,-0.12788 1.0625,-0.40625 C 
73.833828,683.31538 74,682.88305 74,682.46875 L 74,670.375 c 0,-0.33333 -0.118934,-0.72959 -0.40625,-1 C 
73.306434,669.10459 72.924851,669 72.625,669 l -1.65625,0 0,2 1.03125,0 0,11 -9.03125,0 0,-11 0.96875,0 0,-2 
-1.4375,0 z"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           inkscape:label="places"
-           id="g13786"
-           transform="translate(-60,-668)"
-           style="fill:#2e3436" />
-        <g
-           inkscape:label="mimetypes"
-           id="g13788"
-           transform="translate(-60,-668)"
-           style="fill:#2e3436" />
-        <g
-           style="fill:#2e3436;display:inline"
-           inkscape:label="emblems"
-           id="g13790"
-           transform="translate(-60,-668)" />
-      </g>
-      <path
-         
style="fill:none;stroke:#a7a7a7;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 4486.5,-2888.1378 0,32.75"
-         id="path13792"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path13794"
-         d="m 4427.5,-2888.1378 0,32.75"
-         
style="fill:none;stroke:#a7a7a7;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 
/>
-      <path
-         
style="fill:none;stroke:#a7a7a7;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 4486.5,-2888.1378 0,32.75"
-         id="path13796"
-         inkscape:connector-curvature="0" />
-    </g>
+    <path
+       sodipodi:nodetypes="scccssssssss"
+       inkscape:connector-curvature="0"
+       id="path13588"
+       d="m 43.5,801.86218 82,0 14,-12 14,12 82,0 c 3.324,0 6,2.676 6,6 l 0,217.00002 c 0,3.324 -2.676,6 
-6,6 l -192,0 c -3.324,0 -6,-2.676 -6,-6 l 0,-217.00002 c 0,-3.324 2.6768,-6.0707 6,-6 z"
+       
style="fill:#eeeeec;fill-opacity:1;stroke:#babdb6;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
 />
   </g>
 </svg>
diff --git a/hig3/C/menus.page b/hig3/C/menus.page
index 6ec0abd..4e94943 100644
--- a/hig3/C/menus.page
+++ b/hig3/C/menus.page
@@ -24,49 +24,41 @@
 
 <title>Menus</title>
 
-<p>A menu is a list of actions and/or options which is revealed by selecting a heading or button or, in the 
case of context menus, by using a secondary click or long press on an item of content.</p>
+<p>A menu is a list of actions and/or options which is revealed by pressing a heading or button. In the case 
of context menus, the menu is opened through a secondary action (such as secondary click with a mouse, or 
long press with a touch screen) on an item of content.</p>
 
 <media type="image" mime="image/svg" src="figures/ui-elements/menu.svg"/>
 
 <section id="when-to-use">
 <title>When to use</title>
 
-<p>Primary actions and options are typically situated in an application’s <link xref="header-bars">header 
bar</link>. The main role of menus is to host secondary options or actions, which may not be essential to the 
functioning of the application, or may not be used as frequently.</p>
+<p>Menus can appear as a part of a <link xref="menu-bars">menu bar</link>, as context menus (see <link 
xref="selection-mode">selection mode</link>), or as part of a <link xref="button-menus">button menu</link>. 
Refer to the relevant pages for advice on when to use these elements.</p>
 
-<p>Menus can reduce the visual footprint of your application, making it simpler at first glance, and 
highlighting primary functionality. They should be used when it is necessary to include actions and options 
that cannot be comfortably accommodated within other standard design patterns, toolbars in particular.</p>
+</section>
 
-<p>However, be wary of using a large number of menus in your application. For example: more than one menu 
button in a toolbar could be confusing, making it difficult for people to find particular menu items.</p>
+<section id="size-and-structure">
+<title>Size and structure</title>
 
-</section>
+<p>Menus should contain between three and 12 top-level items. If a menu contains more than 12 items, 
evaluate whether all the items are necessary and belong in the menu. If you are unable to reduce the size, 
submenus can be used. However, they should be avoided if at all possible, as they are physically difficult to 
use.</p>
+
+<p>Submenus should contain between three and six items, and should never contain other submenus.</p>
 
-<section id="guidelines">
-<title>Guidelines</title>
+<p>Organize similar menu items into groups using dividers - this will make them easier to understand and 
quicker to use. When creating groups:</p>
 
 <list>
-<item><p>Do not have menus with fewer than three or more than about 12 top-level items. Dialog windows 
containing a List can be used as an alternative to menus in many situations, including this one.</p></item>
-<item><p>Label menu items with verbs for commands and adjectives for settings, according to the 
capitalization rules in the Writing Style guidelines.</p></item>
-<item><p>Make a menu item insensitive when its command is unavailable.</p></item>
-<item><p>Provide an <link xref="keyboard-input#access-keys">access key</link> for every menu item. You may 
use the same access key on different menus in your application, but avoid duplicating access keys on the same 
menu. Note that unlike other controls, once a menu is displayed, its access keys may be used by just typing 
the letter; it is not necessary to press the Alt key at the same time.</p></item>
-<item><p>Submenus are physically difficult to use, so avoid them if at all possible.</p></item>
-<item><p>Never embed submenus in submenus.</p></item>
-<item><p>Submenus should contain three or more items.</p></item>
-<item><p>Group similar items together using dividers. The best size for a group is around 2-5 items. 
Single-item groups are best placed at the top or bottom of a menu, otherwise try to group them with other 
single items of the same type on the same menu.</p></item>
-<item><p>Order items within a group logically, numerically, in task order or by expected frequency of use, 
as appropriate.</p></item>
-<item><p>Only place one type of menu item in each group— command, mutable, check box or radio button. For 
example, do not place commands and settings in the same group.</p></item>
-<item><p>Menus can contain <link xref="check-boxes">check boxes</link> and <link xref="radio-buttons">radio 
buttons</link> for settings.</p></item>
+<item><p>Order groups and group items logically, either by importance, task order, or expected frequency of 
use. Items at the top and bottom of the menu are more noticable and easily targetted, so reserve these 
locations for particularly important or interesting functionality.</p></item>
+<item><p>Place single-item groups at the top or bottom of the menu, or group them together with other single 
items.</p></item>
+<item><p>Do not mix different types of menu item within each group - actions, check box and radio button 
items should be kept separate.</p></item>
 </list>
 
 </section>
 
-<section id="mutable-command-items">
-<title>Mutable command items</title>
-
-<p>A mutable command item changes its label when selected. For example, a Reload item may change to Stop to 
allow the user to interrupt the operation if it is taking a long time.</p>
+<section id="general-guidelines">
+<title>General guidelines</title>
 
 <list>
-<item><p>Mutable menu items can be problematic because the user never sees the menu item changing, so it is 
not obvious that a different function has become available.</p></item>
-<item><p>Consider providing two adjacent menu items for the commands instead. Then make the items sensitive 
or insensitive as the situation demands.</p></item>
-<item><p>Do not use mutable menu items to toggle a two-state setting (for example, Show and Hide). Use a 
check box or radio buttons instead.</p></item>
+<item><p>Provide an <link xref="keyboard-input#access-keys">access key</link> for every menu item. You may 
use the same access key on different menus in your application, but avoid duplicating access keys on the same 
menu. Note that unlike other controls, once a menu is displayed, its access keys may be used by just typing 
the letter; it is not necessary to press the Alt key at the same time.</p></item>
+<item><p>Label menu items with verbs for commands and adjectives for settings, using <link 
xref="writing-style#capitalization">header capitalization</link>.</p></item>
+<item><p>Two linked actions can be combined into a single menu item, by changing the label when the item is 
selected. For example, a <gui>Play</gui> item may change to <gui>Pause</gui>. However, only use this type of 
item when actions are logical opposites which are obvious to users. Likewise, do not use this technique for 
settings - use check boxes or radio buttons instead.</p></item>
 </list>
 
 </section>
diff --git a/hig3/C/popovers.page b/hig3/C/popovers.page
index bb27299..a37ef60 100644
--- a/hig3/C/popovers.page
+++ b/hig3/C/popovers.page
@@ -12,16 +12,16 @@
 
 <title>Popovers</title>
 
-<p>A popover is a transient container that appears over its parent window in response to a user action. 
Popovers can contain a variety of UI elements.</p>
+<p>A popover is a transient container that appears over its parent window in response to a user action. 
Popovers can contain a variety of UI elements, including buttons, lists or menus. They are often used as a 
part of button menus or context menus.</p>
 
 <media type="image" mime="image/svg" src="figures/ui-elements/popover.svg"/>
 
 <section id="when-to-use">
 <title>When to use</title>
 
-<p>Popovers can be used to reveal additional controls that are not always needed by the user. They can 
include settings or properties, or can allow the user to take actions.</p>
+<p>Popovers can be used to reveal additional controls that are not always needed by the user. They can can 
allow the user to take actions or they can contain settings and preferences. They are a very flexible 
interface element that lend themselves to creative design solutions.</p>
 
-<p>Examples of popover usage include:</p>
+<p>A popover should always relate to a specific interface element which acts as the source of the popover. 
Typically, this is either a button or a content item. When they are triggered by a button, a popover can be 
used as a more flexible version of a button menu, allowing groups of controls to be accessed when needed. 
Examples of this include:</p>
 
 <list>
 <item><p>Revealing a small toolbox of text formatting controls.</p></item>
@@ -29,20 +29,7 @@
 <item><p>A collection of view controls, such as zoom, list/grid and content ordering.</p></item>
 </list>
 
-<p>Popovers are a means to disclose additional user interface elements. As such, they are similar to dialog 
windows. Their main advantage over dialogs is that they are less disruptive and have a close relationship 
with a single element which the popover points to.</p>
-
-<p>However, despite popovers having advantages over dialogs, dialogs can still be a better choice. In 
particular, you should consider using a dialog if you want to display large amounts of information, or more 
complex arrangements of controls, or if the situation requires one of the common conventions for dialog 
usage, such as a confirmation dialog.</p>
-
-<p>For more details, see the <link xref="dialogs">dialog window pattern</link>.</p>
-
-</section>
-
-<section id="general-guidelines">
-<title>General guidelines</title>
-
-<p>Popovers should always be small in size (as a rule of thumb, they should not cover more than a third of 
their parent window) and low in complexity. They should always appear as subordinates to their parent 
windows.</p>
-
-<p>A popover should only ever appear in response to a user action, and should always relate to a specific 
interface element which acts as the source of the popover. A common pattern is to use a button as the way to 
reveal a popover.</p>
+<p>As a mechanism for disclosing additional controls or information, popovers are similar to <link 
xref="dialogs">dialog windows</link>. Their main advantage over dialogs is that they are less disruptive and 
have a close relationship with a single element which the popover points to. However, you should still 
consider using a dialog if you want to display large amounts of information, or more complex arrangements of 
controls, or if the situation requires one of the common conventions for dialog usage, such as a confirmation 
dialog.</p>
 
 </section>
 
@@ -50,12 +37,21 @@
 <title>Popover content</title>
 
 <list>
-<item><p>A popover can just contain a menu, including submenus.</p></item>
-<item><p>You can combine a menu with other controls, such as buttons, sliders or text fields. However, don’t 
mix too many different types of control, and try to group controls of the same type together.</p></item>
-<item><p>Popovers can be given a heading to clarify their purpose.</p></item>
+<item><p>A popover is a generic container, and can include a wide variety of controls, such as buttons, 
sliders, lists, switches and text fields. However, don’t mix too many different types of control within the 
same popover, and try to group controls of the same type together.</p></item>
+<item><p>Popovers can function as a container for a menu, or for a menu in combination with a small number 
of supplementary controls.</p></item>
+<item><p>If the purpose of a popover’s controls is ambigious, the popover can be given a heading.</p></item>
 <item><p><gui>Close</gui> or <gui>Done</gui> buttons are not usually required in a popover.</p></item>
 </list>
 
 </section>
 
+
+<section id="general-guidelines">
+<title>General guidelines</title>
+
+<p>Popovers should always be small in size (as a rule of thumb, they should not cover more than a third of 
their parent window) and low in complexity. They should always appear as subordinates to their parent 
windows.</p>
+<p>A popover should only ever appear in response to a user action, and should never appear in a surprising 
or unintended manner.</p>
+
+</section>
+
 </page>
diff --git a/hig3/C/ui-elements.page b/hig3/C/ui-elements.page
index 9c42ca9..774a655 100644
--- a/hig3/C/ui-elements.page
+++ b/hig3/C/ui-elements.page
@@ -18,46 +18,48 @@
 <tr>
 <td><p><link xref="buttons">Buttons</link></p></td>
 <td><media type="image" mime="image/svg" src="figures/ui-elements/buttons.svg"/></td>
-<td><p><link xref="check-boxes">Check boxes</link></p></td>
-<td><media type="image" mime="image/svg" src="figures/ui-elements/check-boxes.svg"/></td>
+<td><p><link xref="button-menus">Button Menus</link></p></td>
+<td><media type="image" mime="image/svg" src="figures/ui-elements/button-menu.svg"/></td>
 </tr>
 <tr>
+<td><p><link xref="check-boxes">Check boxes</link></p></td>
+<td><media type="image" mime="image/svg" src="figures/ui-elements/check-boxes.svg"/></td>
 <td><p><link xref="drop-down-lists">Drop down lists</link></p></td>
 <td><media type="image" mime="image/svg" src="figures/ui-elements/drop-down-list.svg"/></td>
-<td><p><link xref="menus">Menus</link></p></td>
-<td><media type="image" mime="image/svg" src="figures/ui-elements/menu.svg"/></td>
 </tr>
 <tr>
+<td><p><link xref="menus">Menus</link></p></td>
+<td><media type="image" mime="image/svg" src="figures/ui-elements/menu.svg"/></td>
 <td><p><link xref="menu-bars">Menu bars</link></p></td>
 <td><media type="image" mime="image/svg" src="figures/ui-elements/menu-bar.svg"/></td>
-<td><p><link xref="popovers">Popovers</link></p></td>
-<td><media type="image" mime="image/svg" src="figures/ui-elements/popover.svg"/></td>
 </tr>
 <tr>
+<td><p><link xref="popovers">Popovers</link></p></td>
+<td><media type="image" mime="image/svg" src="figures/ui-elements/popover.svg"/></td>
 <td><p><link xref="progress-bars">Progress bars</link></p></td>
 <td><media type="image" mime="image/svg" src="figures/ui-elements/progress-bars.svg"/></td>
-<td><p><link xref="progress-spinners">Progress spinners</link></p></td>
-<td><media type="image" mime="image/svg" src="figures/ui-elements/progress-spinner.svg"/></td>
 </tr>
 <tr>
+<td><p><link xref="progress-spinners">Progress spinners</link></p></td>
+<td><media type="image" mime="image/svg" src="figures/ui-elements/progress-spinner.svg"/></td>
 <td><p><link xref="sliders">Sliders</link></p></td>
 <td><media type="image" mime="image/svg" src="figures/ui-elements/sliders.svg"/></td>
-<td><p><link xref="spin-boxes">Spin boxes</link></p></td>
-<td><media type="image" mime="image/svg" src="figures/ui-elements/spin-boxes.svg"/></td>
 </tr>
 <tr>
+<td><p><link xref="spin-boxes">Spin boxes</link></p></td>
+<td><media type="image" mime="image/svg" src="figures/ui-elements/spin-boxes.svg"/></td>
 <td><p><link xref="switches">Switches</link></p></td>
 <td><media type="image" mime="image/svg" src="figures/ui-elements/switches.svg"/></td>
-<td><p><link xref="radio-buttons">Radio buttons</link></p></td>
-<td><media type="image" mime="image/svg" src="figures/ui-elements/radio-buttons.svg"/></td>
 </tr>
 <tr>
+<td><p><link xref="radio-buttons">Radio buttons</link></p></td>
+<td><media type="image" mime="image/svg" src="figures/ui-elements/radio-buttons.svg"/></td>
 <td><p><link xref="tabs">Tabs</link></p></td>
 <td><media type="image" mime="image/svg" src="figures/ui-elements/tabs.svg"/></td>
-<td><p><link xref="text-fields">Text fields</link></p></td>
-<td><media type="image" mime="image/svg" src="figures/ui-elements/text-fields.svg"/></td>
 </tr>
 <tr>
+<td><p><link xref="text-fields">Text fields</link></p></td>
+<td><media type="image" mime="image/svg" src="figures/ui-elements/text-fields.svg"/></td>
 <td><p><link xref="toolbars">Toolbars</link></p></td>
 <td><media type="image" mime="image/svg" src="figures/ui-elements/toolbar.svg"/></td>
 </tr>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]