[gnome-devel-docs/gnome3-hig] complete menu structure. hide footnav on landing page.
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-devel-docs/gnome3-hig] complete menu structure. hide footnav on landing page.
- Date: Thu, 19 Jan 2012 21:38:17 +0000 (UTC)
commit 1b978834002a428dc5c00276aab2366c4abeab98
Author: Jakub Steiner <jimmac gmail com>
Date: Thu Jan 19 22:34:11 2012 +0100
complete menu structure. hide footnav on landing page.
- add a tiny HOWTO
- regenerate the static site
hig3/HOWTO | 6 +
hig3/site/basics-appmenu.html | 265 +++++++++++++++++++++++++++++++++
hig3/site/index.html | 285 +++++++++++++++++++++++++++++-------
hig3/site/javascripts/hig.js | 5 +
hig3/site/principles.html | 322 +++++++++++++++++++++++++++++------------
hig3/site/stylesheets/hig.css | 311 +++++++++++++++++++++++++++++-----------
hig3/src/layouts/landing.haml | 1 +
hig3/src/pages/_menu.haml | 25 +++
hig3/src/stylesheets/hig.scss | 11 ++-
9 files changed, 998 insertions(+), 233 deletions(-)
---
diff --git a/hig3/HOWTO b/hig3/HOWTO
new file mode 100644
index 0000000..aa1c596
--- /dev/null
+++ b/hig3/HOWTO
@@ -0,0 +1,6 @@
+The HIG3 is a static website, with its root in ./site/
+
+Staticmatic is used to generate it. See http://staticmatic.rubyforge.org/
+The pages are set in HAML - http://haml-lang.com/
+
+To have staticmatic watch your page editing, run with `staticmatic preview hig3` and point your browser to http://localhost:3000
diff --git a/hig3/site/basics-appmenu.html b/hig3/site/basics-appmenu.html
new file mode 100644
index 0000000..35f3ecf
--- /dev/null
+++ b/hig3/site/basics-appmenu.html
@@ -0,0 +1,265 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>GNOME Human Interface Guidelines</title>
+ <link href="/stylesheets/hig.css" media="screen" rel="stylesheet" type="text/css">
+ <script language="javascript" src="javascripts/jquery.js" type="text/javascript"></script><script language="javascript" src="javascripts/hig.js" type="text/javascript"></script>
+ <meta content="width=device-width, initial-scale=1, maximum-scale=1" name="viewport">
+ <meta charset="UTF-8">
+ </head>
+ <body>
+ <div class="gnomelink">
+ <div>
+ <a href="http://www.gnome.org">GNOME.org</a>
+ </div>
+ </div>
+ <div class="contain">
+ <aside class="sidebar">
+ <a class="smalllogo" href="/">
+ <img alt="Gnome logo" class="foot" src="images/gnome-logo.png">
+ <div class="punchline">Human Interface Guidelines</div>
+ </a>
+ <div class="menu">
+ <div class="navmenu">
+ <span class="direct">
+ <h3>
+ Design Guidelines
+ </h3>
+ <ul>
+ <li class="first"><a href="principles.html">Principles</a></li>
+ <li><a href="design_strategies.html">Design Strategies</a></li>
+ <li><a href="system_shell.html">System Shell</a></li>
+ <li><a href="visual_layout.html">Visual Layout</a></li>
+ <li><a href="writing_style.html">Writing Style</a></li>
+ <li><a href="color.html">Color</a></li>
+ <li><a href="keyboard_input.html">Keyboard Input</a></li>
+ <li class="last"><a href="pointer_and_touch_input.html">Pointer and Touch Input</a></li>
+ </ul>
+ </span>
+ <span class="nested">
+ <h3>
+ Design Patterns
+ </h3>
+ <ul class="collapsed">
+ <li>
+ <a class="expand">
+ Application Basics
+ </a>
+ <ul>
+ <li class="first current"><a href="basics-appmenu.html">Application Menu</a></li>
+ <li><a href="basics-primary-toolbar.html">Primary Toolbar</a></li>
+ <li><a href="basics-primary-windows.html">Primary Windows</a></li>
+ <li><a href="basics-notifications.html">Notifications</a></li>
+ <li><a href="basics-content-area.html">Content Area</a></li>
+ <li class="last"><a href="basics-sidebar-list.html">Sidebar List</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Presenting Content
+ </a>
+ <ul>
+ <li class="first"><a href="presenting-content-view.html">Content View</a></li>
+ <li><a href="presenting-fullscreen.html">Fullscreen</a></li>
+ <li><a href="presenting-zooming.html">Zooming</a></li>
+ <li class="last"><a href="presenting-panning.html">Panning</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Finding Content
+ </a>
+ <ul>
+ <li class="first"><a href="finding-search.html">Search</a></li>
+ <li class="last"><a href="finding-filterbuttons.html">Filter Buttons</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Selections & Actions
+ </a>
+ <ul>
+ <li class="first"><a href="selectmode-checkmark.html">Checkmark Selector</a></li>
+ <li><a href="selectmode-bottomtoolbar.html">Bottom Toolbar</a></li>
+ <li><a href="selectmode-contextmenus.html">Context Menus</a></li>
+ <li><a href="selectmode-undo.html">Undo</a></li>
+ <li class="last"><a href="selectmode-inlinetoolbars.html">Inline Toolbars</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Navigation
+ </a>
+ <ul>
+ <li class="first"><a href="navigation-back.html">Back Button</a></li>
+ <li class="last"><a href="navigation-home.html">Home Button</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Other Window Types
+ </a>
+ <ul>
+ <li class="first"><a href="other-dialogwindows.html">Dialog Windows</a></li>
+ <li><a href="other-preferences.html">Utility Windows: Preferences</a></li>
+ <li class="last"><a href="other-properties.html">Utility Windows: Property</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ User Interface Components
+ </a>
+ <ul>
+ <li class="first"><a href="component-list.html">Lists</a></li>
+ <li><a href="component-menu.html">Menus</a></li>
+ <li><a href="component-switch.html">Switches</a></li>
+ <li><a href="component-entry.html">Text Entry Fields</a></li>
+ <li class="last"><a href="entry-spinbox.html">Spin Boxes</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Other
+ </a>
+ <ul>
+ <li class="first last"><a href="other-assistant.html">Assistants</a></li>
+ </ul>
+ </li>
+ </ul>
+ </span>
+ </div>
+ </div>
+ </aside>
+ <article class="main">
+ <h1>Application Menu</h1>
+ </article>
+ </div>
+ <div id="footerpositioner">
+ <hr class="footerart">
+ <div id="footer">
+ <div class="contain">
+ <div class="navmenu">
+ <span class="direct">
+ <h3>
+ Design Guidelines
+ </h3>
+ <ul>
+ <li class="first"><a href="principles.html">Principles</a></li>
+ <li><a href="design_strategies.html">Design Strategies</a></li>
+ <li><a href="system_shell.html">System Shell</a></li>
+ <li><a href="visual_layout.html">Visual Layout</a></li>
+ <li><a href="writing_style.html">Writing Style</a></li>
+ <li><a href="color.html">Color</a></li>
+ <li><a href="keyboard_input.html">Keyboard Input</a></li>
+ <li class="last"><a href="pointer_and_touch_input.html">Pointer and Touch Input</a></li>
+ </ul>
+ </span>
+ <span class="nested">
+ <h3>
+ Design Patterns
+ </h3>
+ <ul class="collapsed">
+ <li>
+ <a class="expand">
+ Application Basics
+ </a>
+ <ul>
+ <li class="first current"><a href="basics-appmenu.html">Application Menu</a></li>
+ <li><a href="basics-primary-toolbar.html">Primary Toolbar</a></li>
+ <li><a href="basics-primary-windows.html">Primary Windows</a></li>
+ <li><a href="basics-notifications.html">Notifications</a></li>
+ <li><a href="basics-content-area.html">Content Area</a></li>
+ <li class="last"><a href="basics-sidebar-list.html">Sidebar List</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Presenting Content
+ </a>
+ <ul>
+ <li class="first"><a href="presenting-content-view.html">Content View</a></li>
+ <li><a href="presenting-fullscreen.html">Fullscreen</a></li>
+ <li><a href="presenting-zooming.html">Zooming</a></li>
+ <li class="last"><a href="presenting-panning.html">Panning</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Finding Content
+ </a>
+ <ul>
+ <li class="first"><a href="finding-search.html">Search</a></li>
+ <li class="last"><a href="finding-filterbuttons.html">Filter Buttons</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Selections & Actions
+ </a>
+ <ul>
+ <li class="first"><a href="selectmode-checkmark.html">Checkmark Selector</a></li>
+ <li><a href="selectmode-bottomtoolbar.html">Bottom Toolbar</a></li>
+ <li><a href="selectmode-contextmenus.html">Context Menus</a></li>
+ <li><a href="selectmode-undo.html">Undo</a></li>
+ <li class="last"><a href="selectmode-inlinetoolbars.html">Inline Toolbars</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Navigation
+ </a>
+ <ul>
+ <li class="first"><a href="navigation-back.html">Back Button</a></li>
+ <li class="last"><a href="navigation-home.html">Home Button</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Other Window Types
+ </a>
+ <ul>
+ <li class="first"><a href="other-dialogwindows.html">Dialog Windows</a></li>
+ <li><a href="other-preferences.html">Utility Windows: Preferences</a></li>
+ <li class="last"><a href="other-properties.html">Utility Windows: Property</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ User Interface Components
+ </a>
+ <ul>
+ <li class="first"><a href="component-list.html">Lists</a></li>
+ <li><a href="component-menu.html">Menus</a></li>
+ <li><a href="component-switch.html">Switches</a></li>
+ <li><a href="component-entry.html">Text Entry Fields</a></li>
+ <li class="last"><a href="entry-spinbox.html">Spin Boxes</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Other
+ </a>
+ <ul>
+ <li class="first last"><a href="other-assistant.html">Assistants</a></li>
+ </ul>
+ </li>
+ </ul>
+ </span>
+ </div>
+ <div class="copy">
+ <p>
+ Copyright © 2005—2012 The GNOME Project
+ </p>
+ <p>
+ Free to share and remix:
+ <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons CC-BY.</a>
+ Optimised for standards. Hosted by
+ <a href="http://canonical.com">Canonical</a>
+ Powered by WordPress.
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/hig3/site/index.html b/hig3/site/index.html
index 28ce032..56d73c7 100644
--- a/hig3/site/index.html
+++ b/hig3/site/index.html
@@ -20,48 +20,112 @@
<aside class="sidebar">
<div class="menu">
<div class="navmenu">
- <h3>
- Design Guidelines
- </h3>
- <ul>
- <li class="first"><a href="principles.html">Principles</a></li>
- <li><a href="design_strategies.html">Design Strategies</a></li>
- <li><a href="system_shell.html">System Shell</a></li>
- <li><a href="visual_layout.html">Visual Layout</a></li>
- <li><a href="writing_style.html">Writing Style</a></li>
- <li><a href="color.html">Color</a></li>
- <li><a href="keyboard_input.html">Keyboard Input</a></li>
- <li class="last"><a href="pointer_and_touch_input.html">Pointer and Touch Input</a></li>
- </ul>
- <h3>
- Design Patterns
- </h3>
- <ul class="collapsed">
- <li>
- <a class="expand">
- Application Basics
- </a>
- <ul>
- <li class="first"><a href="basics-appmenu.html">Application Menu</a></li>
- <li><a href="basics-primary-toolbar.html">Primary Toolbar</a></li>
- <li><a href="basics-primary-windows.html">Primary Windows</a></li>
- <li><a href="basics-notifications.html">Notifications</a></li>
- <li><a href="basics-content-area.html">Content Area</a></li>
- <li class="last"><a href="basics-sidebar-list.html">Sidebar List</a></li>
- </ul>
- </li>
- <li>
- <a class="expand">
- Presenting Content
- </a>
- <ul>
- <li class="first"><a href="presenting-content-view.html">Content View</a></li>
- <li><a href="presenting-fullscreen.html">Fullscreen</a></li>
- <li><a href="presenting-zooming.html">Zooming</a></li>
- <li class="last"><a href="presenting-panning.html">Panning</a></li>
- </ul>
- </li>
- </ul>
+ <span class="direct">
+ <h3>
+ Design Guidelines
+ </h3>
+ <ul>
+ <li class="first"><a href="principles.html">Principles</a></li>
+ <li><a href="design_strategies.html">Design Strategies</a></li>
+ <li><a href="system_shell.html">System Shell</a></li>
+ <li><a href="visual_layout.html">Visual Layout</a></li>
+ <li><a href="writing_style.html">Writing Style</a></li>
+ <li><a href="color.html">Color</a></li>
+ <li><a href="keyboard_input.html">Keyboard Input</a></li>
+ <li class="last"><a href="pointer_and_touch_input.html">Pointer and Touch Input</a></li>
+ </ul>
+ </span>
+ <span class="nested">
+ <h3>
+ Design Patterns
+ </h3>
+ <ul class="collapsed">
+ <li>
+ <a class="expand">
+ Application Basics
+ </a>
+ <ul>
+ <li class="first"><a href="basics-appmenu.html">Application Menu</a></li>
+ <li><a href="basics-primary-toolbar.html">Primary Toolbar</a></li>
+ <li><a href="basics-primary-windows.html">Primary Windows</a></li>
+ <li><a href="basics-notifications.html">Notifications</a></li>
+ <li><a href="basics-content-area.html">Content Area</a></li>
+ <li class="last"><a href="basics-sidebar-list.html">Sidebar List</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Presenting Content
+ </a>
+ <ul>
+ <li class="first"><a href="presenting-content-view.html">Content View</a></li>
+ <li><a href="presenting-fullscreen.html">Fullscreen</a></li>
+ <li><a href="presenting-zooming.html">Zooming</a></li>
+ <li class="last"><a href="presenting-panning.html">Panning</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Finding Content
+ </a>
+ <ul>
+ <li class="first"><a href="finding-search.html">Search</a></li>
+ <li class="last"><a href="finding-filterbuttons.html">Filter Buttons</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Selections & Actions
+ </a>
+ <ul>
+ <li class="first"><a href="selectmode-checkmark.html">Checkmark Selector</a></li>
+ <li><a href="selectmode-bottomtoolbar.html">Bottom Toolbar</a></li>
+ <li><a href="selectmode-contextmenus.html">Context Menus</a></li>
+ <li><a href="selectmode-undo.html">Undo</a></li>
+ <li class="last"><a href="selectmode-inlinetoolbars.html">Inline Toolbars</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Navigation
+ </a>
+ <ul>
+ <li class="first"><a href="navigation-back.html">Back Button</a></li>
+ <li class="last"><a href="navigation-home.html">Home Button</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Other Window Types
+ </a>
+ <ul>
+ <li class="first"><a href="other-dialogwindows.html">Dialog Windows</a></li>
+ <li><a href="other-preferences.html">Utility Windows: Preferences</a></li>
+ <li class="last"><a href="other-properties.html">Utility Windows: Property</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ User Interface Components
+ </a>
+ <ul>
+ <li class="first"><a href="component-list.html">Lists</a></li>
+ <li><a href="component-menu.html">Menus</a></li>
+ <li><a href="component-switch.html">Switches</a></li>
+ <li><a href="component-entry.html">Text Entry Fields</a></li>
+ <li class="last"><a href="entry-spinbox.html">Spin Boxes</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Other
+ </a>
+ <ul>
+ <li class="first last"><a href="other-assistant.html">Assistants</a></li>
+ </ul>
+ </li>
+ </ul>
+ </span>
</div>
</div>
</aside>
@@ -84,18 +148,131 @@
</div>
</article>
</div>
- <div id="footer">
- <div class="contain copy">
- <p>
- Copyright © 2005—2012 The GNOME Project
- </p>
- <p>
- Free to share and remix:
- <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons CC-BY.</a>
- Optimised for standards. Hosted by
- <a href="http://canonical.com">Canonical</a>
- Powered by WordPress.
- </p>
+ <div id="footerpositioner">
+ <hr class="footerart">
+ <div id="footer">
+ <div class="contain">
+ <div class="navmenu">
+ <span class="direct">
+ <h3>
+ Design Guidelines
+ </h3>
+ <ul>
+ <li class="first"><a href="principles.html">Principles</a></li>
+ <li><a href="design_strategies.html">Design Strategies</a></li>
+ <li><a href="system_shell.html">System Shell</a></li>
+ <li><a href="visual_layout.html">Visual Layout</a></li>
+ <li><a href="writing_style.html">Writing Style</a></li>
+ <li><a href="color.html">Color</a></li>
+ <li><a href="keyboard_input.html">Keyboard Input</a></li>
+ <li class="last"><a href="pointer_and_touch_input.html">Pointer and Touch Input</a></li>
+ </ul>
+ </span>
+ <span class="nested">
+ <h3>
+ Design Patterns
+ </h3>
+ <ul class="collapsed">
+ <li>
+ <a class="expand">
+ Application Basics
+ </a>
+ <ul>
+ <li class="first"><a href="basics-appmenu.html">Application Menu</a></li>
+ <li><a href="basics-primary-toolbar.html">Primary Toolbar</a></li>
+ <li><a href="basics-primary-windows.html">Primary Windows</a></li>
+ <li><a href="basics-notifications.html">Notifications</a></li>
+ <li><a href="basics-content-area.html">Content Area</a></li>
+ <li class="last"><a href="basics-sidebar-list.html">Sidebar List</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Presenting Content
+ </a>
+ <ul>
+ <li class="first"><a href="presenting-content-view.html">Content View</a></li>
+ <li><a href="presenting-fullscreen.html">Fullscreen</a></li>
+ <li><a href="presenting-zooming.html">Zooming</a></li>
+ <li class="last"><a href="presenting-panning.html">Panning</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Finding Content
+ </a>
+ <ul>
+ <li class="first"><a href="finding-search.html">Search</a></li>
+ <li class="last"><a href="finding-filterbuttons.html">Filter Buttons</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Selections & Actions
+ </a>
+ <ul>
+ <li class="first"><a href="selectmode-checkmark.html">Checkmark Selector</a></li>
+ <li><a href="selectmode-bottomtoolbar.html">Bottom Toolbar</a></li>
+ <li><a href="selectmode-contextmenus.html">Context Menus</a></li>
+ <li><a href="selectmode-undo.html">Undo</a></li>
+ <li class="last"><a href="selectmode-inlinetoolbars.html">Inline Toolbars</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Navigation
+ </a>
+ <ul>
+ <li class="first"><a href="navigation-back.html">Back Button</a></li>
+ <li class="last"><a href="navigation-home.html">Home Button</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Other Window Types
+ </a>
+ <ul>
+ <li class="first"><a href="other-dialogwindows.html">Dialog Windows</a></li>
+ <li><a href="other-preferences.html">Utility Windows: Preferences</a></li>
+ <li class="last"><a href="other-properties.html">Utility Windows: Property</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ User Interface Components
+ </a>
+ <ul>
+ <li class="first"><a href="component-list.html">Lists</a></li>
+ <li><a href="component-menu.html">Menus</a></li>
+ <li><a href="component-switch.html">Switches</a></li>
+ <li><a href="component-entry.html">Text Entry Fields</a></li>
+ <li class="last"><a href="entry-spinbox.html">Spin Boxes</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Other
+ </a>
+ <ul>
+ <li class="first last"><a href="other-assistant.html">Assistants</a></li>
+ </ul>
+ </li>
+ </ul>
+ </span>
+ </div>
+ <div class="copy">
+ <p>
+ Copyright © 2005—2012 The GNOME Project
+ </p>
+ <p>
+ Free to share and remix:
+ <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons CC-BY.</a>
+ Optimised for standards. Hosted by
+ <a href="http://canonical.com">Canonical</a>
+ Powered by WordPress.
+ </p>
+ </div>
+ </div>
</div>
</div>
</body>
diff --git a/hig3/site/javascripts/hig.js b/hig3/site/javascripts/hig.js
index 5cf481a..f8464f0 100644
--- a/hig3/site/javascripts/hig.js
+++ b/hig3/site/javascripts/hig.js
@@ -37,6 +37,11 @@ $(document).ready(function () {
$items.siblings("ul").find('li.current').parents('li').find('a').click();
//preventFOUT();
+ //footer menu hidden for landing page !mobile
+ //shown for all else
+ if (window.location.pathname != '/') {
+ $('#footer .navmenu').show();
+ }
});
$(window).ready(function () {
//run _after_ images have been loaded as well.
diff --git a/hig3/site/principles.html b/hig3/site/principles.html
index d912674..2164523 100644
--- a/hig3/site/principles.html
+++ b/hig3/site/principles.html
@@ -5,6 +5,7 @@
<link href="/stylesheets/hig.css" media="screen" rel="stylesheet" type="text/css">
<script language="javascript" src="javascripts/jquery.js" type="text/javascript"></script><script language="javascript" src="javascripts/hig.js" type="text/javascript"></script>
<meta content="width=device-width, initial-scale=1, maximum-scale=1" name="viewport">
+ <meta charset="UTF-8">
</head>
<body>
<div class="gnomelink">
@@ -20,48 +21,112 @@
</a>
<div class="menu">
<div class="navmenu">
- <h3>
- Design Guidelines
- </h3>
- <ul>
- <li class="first current"><a href="principles.html">Principles</a></li>
- <li><a href="design_strategies.html">Design Strategies</a></li>
- <li><a href="system_shell.html">System Shell</a></li>
- <li><a href="visual_layout.html">Visual Layout</a></li>
- <li><a href="writing_style.html">Writing Style</a></li>
- <li><a href="color.html">Color</a></li>
- <li><a href="keyboard_input.html">Keyboard Input</a></li>
- <li class="last"><a href="pointer_and_touch_input.html">Pointer and Touch Input</a></li>
- </ul>
- <h3>
- Design Patterns
- </h3>
- <ul class="collapsed">
- <li>
- <a class="expand">
- Application Basics
- </a>
- <ul>
- <li class="first"><a href="basics-appmenu.html">Application Menu</a></li>
- <li><a href="basics-primary-toolbar.html">Primary Toolbar</a></li>
- <li><a href="basics-primary-windows.html">Primary Windows</a></li>
- <li><a href="basics-notifications.html">Notifications</a></li>
- <li><a href="basics-content-area.html">Content Area</a></li>
- <li class="last"><a href="basics-sidebar-list.html">Sidebar List</a></li>
- </ul>
- </li>
- <li>
- <a class="expand">
- Presenting Content
- </a>
- <ul>
- <li class="first"><a href="presenting-content-view.html">Content View</a></li>
- <li><a href="presenting-fullscreen.html">Fullscreen</a></li>
- <li><a href="presenting-zooming.html">Zooming</a></li>
- <li class="last"><a href="presenting-panning.html">Panning</a></li>
- </ul>
- </li>
- </ul>
+ <span class="direct">
+ <h3>
+ Design Guidelines
+ </h3>
+ <ul>
+ <li class="first current"><a href="principles.html">Principles</a></li>
+ <li><a href="design_strategies.html">Design Strategies</a></li>
+ <li><a href="system_shell.html">System Shell</a></li>
+ <li><a href="visual_layout.html">Visual Layout</a></li>
+ <li><a href="writing_style.html">Writing Style</a></li>
+ <li><a href="color.html">Color</a></li>
+ <li><a href="keyboard_input.html">Keyboard Input</a></li>
+ <li class="last"><a href="pointer_and_touch_input.html">Pointer and Touch Input</a></li>
+ </ul>
+ </span>
+ <span class="nested">
+ <h3>
+ Design Patterns
+ </h3>
+ <ul class="collapsed">
+ <li>
+ <a class="expand">
+ Application Basics
+ </a>
+ <ul>
+ <li class="first"><a href="basics-appmenu.html">Application Menu</a></li>
+ <li><a href="basics-primary-toolbar.html">Primary Toolbar</a></li>
+ <li><a href="basics-primary-windows.html">Primary Windows</a></li>
+ <li><a href="basics-notifications.html">Notifications</a></li>
+ <li><a href="basics-content-area.html">Content Area</a></li>
+ <li class="last"><a href="basics-sidebar-list.html">Sidebar List</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Presenting Content
+ </a>
+ <ul>
+ <li class="first"><a href="presenting-content-view.html">Content View</a></li>
+ <li><a href="presenting-fullscreen.html">Fullscreen</a></li>
+ <li><a href="presenting-zooming.html">Zooming</a></li>
+ <li class="last"><a href="presenting-panning.html">Panning</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Finding Content
+ </a>
+ <ul>
+ <li class="first"><a href="finding-search.html">Search</a></li>
+ <li class="last"><a href="finding-filterbuttons.html">Filter Buttons</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Selections & Actions
+ </a>
+ <ul>
+ <li class="first"><a href="selectmode-checkmark.html">Checkmark Selector</a></li>
+ <li><a href="selectmode-bottomtoolbar.html">Bottom Toolbar</a></li>
+ <li><a href="selectmode-contextmenus.html">Context Menus</a></li>
+ <li><a href="selectmode-undo.html">Undo</a></li>
+ <li class="last"><a href="selectmode-inlinetoolbars.html">Inline Toolbars</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Navigation
+ </a>
+ <ul>
+ <li class="first"><a href="navigation-back.html">Back Button</a></li>
+ <li class="last"><a href="navigation-home.html">Home Button</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Other Window Types
+ </a>
+ <ul>
+ <li class="first"><a href="other-dialogwindows.html">Dialog Windows</a></li>
+ <li><a href="other-preferences.html">Utility Windows: Preferences</a></li>
+ <li class="last"><a href="other-properties.html">Utility Windows: Property</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ User Interface Components
+ </a>
+ <ul>
+ <li class="first"><a href="component-list.html">Lists</a></li>
+ <li><a href="component-menu.html">Menus</a></li>
+ <li><a href="component-switch.html">Switches</a></li>
+ <li><a href="component-entry.html">Text Entry Fields</a></li>
+ <li class="last"><a href="entry-spinbox.html">Spin Boxes</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Other
+ </a>
+ <ul>
+ <li class="first last"><a href="other-assistant.html">Assistants</a></li>
+ </ul>
+ </li>
+ </ul>
+ </span>
</div>
</div>
</aside>
@@ -195,62 +260,131 @@
</ul>
</article>
</div>
- <div id="footer">
- <div class="contain copy">
- <div class="navmenu">
- <h3>
- Design Guidelines
- </h3>
- <ul>
- <li class="first current"><a href="principles.html">Principles</a></li>
- <li><a href="design_strategies.html">Design Strategies</a></li>
- <li><a href="system_shell.html">System Shell</a></li>
- <li><a href="visual_layout.html">Visual Layout</a></li>
- <li><a href="writing_style.html">Writing Style</a></li>
- <li><a href="color.html">Color</a></li>
- <li><a href="keyboard_input.html">Keyboard Input</a></li>
- <li class="last"><a href="pointer_and_touch_input.html">Pointer and Touch Input</a></li>
- </ul>
- <h3>
- Design Patterns
- </h3>
- <ul class="collapsed">
- <li>
- <a class="expand">
- Application Basics
- </a>
+ <div id="footerpositioner">
+ <hr class="footerart">
+ <div id="footer">
+ <div class="contain">
+ <div class="navmenu">
+ <span class="direct">
+ <h3>
+ Design Guidelines
+ </h3>
<ul>
- <li class="first"><a href="basics-appmenu.html">Application Menu</a></li>
- <li><a href="basics-primary-toolbar.html">Primary Toolbar</a></li>
- <li><a href="basics-primary-windows.html">Primary Windows</a></li>
- <li><a href="basics-notifications.html">Notifications</a></li>
- <li><a href="basics-content-area.html">Content Area</a></li>
- <li class="last"><a href="basics-sidebar-list.html">Sidebar List</a></li>
+ <li class="first current"><a href="principles.html">Principles</a></li>
+ <li><a href="design_strategies.html">Design Strategies</a></li>
+ <li><a href="system_shell.html">System Shell</a></li>
+ <li><a href="visual_layout.html">Visual Layout</a></li>
+ <li><a href="writing_style.html">Writing Style</a></li>
+ <li><a href="color.html">Color</a></li>
+ <li><a href="keyboard_input.html">Keyboard Input</a></li>
+ <li class="last"><a href="pointer_and_touch_input.html">Pointer and Touch Input</a></li>
</ul>
- </li>
- <li>
- <a class="expand">
- Presenting Content
- </a>
- <ul>
- <li class="first"><a href="presenting-content-view.html">Content View</a></li>
- <li><a href="presenting-fullscreen.html">Fullscreen</a></li>
- <li><a href="presenting-zooming.html">Zooming</a></li>
- <li class="last"><a href="presenting-panning.html">Panning</a></li>
+ </span>
+ <span class="nested">
+ <h3>
+ Design Patterns
+ </h3>
+ <ul class="collapsed">
+ <li>
+ <a class="expand">
+ Application Basics
+ </a>
+ <ul>
+ <li class="first"><a href="basics-appmenu.html">Application Menu</a></li>
+ <li><a href="basics-primary-toolbar.html">Primary Toolbar</a></li>
+ <li><a href="basics-primary-windows.html">Primary Windows</a></li>
+ <li><a href="basics-notifications.html">Notifications</a></li>
+ <li><a href="basics-content-area.html">Content Area</a></li>
+ <li class="last"><a href="basics-sidebar-list.html">Sidebar List</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Presenting Content
+ </a>
+ <ul>
+ <li class="first"><a href="presenting-content-view.html">Content View</a></li>
+ <li><a href="presenting-fullscreen.html">Fullscreen</a></li>
+ <li><a href="presenting-zooming.html">Zooming</a></li>
+ <li class="last"><a href="presenting-panning.html">Panning</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Finding Content
+ </a>
+ <ul>
+ <li class="first"><a href="finding-search.html">Search</a></li>
+ <li class="last"><a href="finding-filterbuttons.html">Filter Buttons</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Selections & Actions
+ </a>
+ <ul>
+ <li class="first"><a href="selectmode-checkmark.html">Checkmark Selector</a></li>
+ <li><a href="selectmode-bottomtoolbar.html">Bottom Toolbar</a></li>
+ <li><a href="selectmode-contextmenus.html">Context Menus</a></li>
+ <li><a href="selectmode-undo.html">Undo</a></li>
+ <li class="last"><a href="selectmode-inlinetoolbars.html">Inline Toolbars</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Navigation
+ </a>
+ <ul>
+ <li class="first"><a href="navigation-back.html">Back Button</a></li>
+ <li class="last"><a href="navigation-home.html">Home Button</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Other Window Types
+ </a>
+ <ul>
+ <li class="first"><a href="other-dialogwindows.html">Dialog Windows</a></li>
+ <li><a href="other-preferences.html">Utility Windows: Preferences</a></li>
+ <li class="last"><a href="other-properties.html">Utility Windows: Property</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ User Interface Components
+ </a>
+ <ul>
+ <li class="first"><a href="component-list.html">Lists</a></li>
+ <li><a href="component-menu.html">Menus</a></li>
+ <li><a href="component-switch.html">Switches</a></li>
+ <li><a href="component-entry.html">Text Entry Fields</a></li>
+ <li class="last"><a href="entry-spinbox.html">Spin Boxes</a></li>
+ </ul>
+ </li>
+ <li>
+ <a class="expand">
+ Other
+ </a>
+ <ul>
+ <li class="first last"><a href="other-assistant.html">Assistants</a></li>
+ </ul>
+ </li>
</ul>
- </li>
- </ul>
+ </span>
+ </div>
+ <div class="copy">
+ <p>
+ Copyright © 2005—2012 The GNOME Project
+ </p>
+ <p>
+ Free to share and remix:
+ <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons CC-BY.</a>
+ Optimised for standards. Hosted by
+ <a href="http://canonical.com">Canonical</a>
+ Powered by WordPress.
+ </p>
+ </div>
</div>
- <p>
- Copyright © 2005—2012 The GNOME Project
- </p>
- <p>
- Free to share and remix:
- <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons CC-BY.</a>
- Optimised for standards. Hosted by
- <a href="http://canonical.com">Canonical</a>
- Powered by WordPress.
- </p>
</div>
</div>
</body>
diff --git a/hig3/site/stylesheets/hig.css b/hig3/site/stylesheets/hig.css
index debb650..208fc3b 100644
--- a/hig3/site/stylesheets/hig.css
+++ b/hig3/site/stylesheets/hig.css
@@ -41,7 +41,6 @@ body {
margin: 0;
padding: 0;
background: white url(../images/html-bg.png) 0 10px repeat-x;
- background: white url(../images/grid.png) top center repeat-y;
}
/* line 36 */
@@ -176,68 +175,82 @@ h1 {
}
/* line 127 */
.contain .sidebar .menu ul.collapsed > li {
- margin-top: 2em;
padding: 0;
}
-/* line 130 */
+/* line 129 */
.contain .sidebar .menu ul.collapsed > li a.expand {
+ background: url(../images/minus.png) no-repeat 4px 7px;
+}
+/* line 132 */
+.contain .sidebar .menu ul.collapsed > li a.collapse {
background: url(../images/plus.png) no-repeat 4px 7px;
}
-/* line 133 */
+/* line 135 */
.contain .sidebar .menu ul.collapsed > li > a {
display: block;
- color: black;
+ color: #666;
+ font-weight: bold;
padding-left: 24px;
+ cursor: pointer;
}
-/* line 138 */
+/* line 141 */
.contain .sidebar .menu ul.collapsed > li > a:hover {
text-decoration: none;
}
-/* line 142 */
+/* line 145 */
.contain .sidebar .menu ul.collapsed > li:first-child {
margin-top: 0;
}
-/* line 146 */
+/* line 149 */
.contain .sidebar .menu ul.collapsed > li ul {
margin-top: 1em;
}
-/* line 148 */
+/* line 151 */
.contain .sidebar .menu ul.collapsed > li ul li {
padding: 0;
}
-/* line 150 */
+/* line 153 */
.contain .sidebar .menu ul.collapsed > li ul li a {
padding-left: 24px;
color: #3465a4;
}
-/* line 159 */
+/* line 158 */
+.contain .sidebar .menu ul.collapsed > li ul li.current a {
+ cursor: default;
+ color: black;
+}
+/* line 161 */
+.contain .sidebar .menu ul.collapsed > li ul li.current a:hover {
+ text-decoration: none;
+}
+/* line 171 */
.contain .sidebar .menu a {
text-decoration: none;
}
-/* line 161 */
+/* line 173 */
.contain .sidebar .menu a:hover {
text-decoration: underline;
}
-/* line 166 */
+/* line 178 */
.contain .sidebar .smalllogo {
display: block;
text-decoration: none;
}
-/* line 169 */
+/* line 181 */
.contain .sidebar .smalllogo + .menu {
margin: 25px 0 0;
}
-/* line 172 */
+/* line 184 */
.contain .sidebar .smalllogo img {
width: 170px;
height: auto;
}
-/* line 176 */
+/* line 188 */
.contain .sidebar .smalllogo .punchline {
font-size: 115%;
margin-top: 8px;
}
-/* line 179 */
+/* line 191 */
.contain .main {
display: inline;
float: left;
@@ -245,7 +258,7 @@ h1 {
margin: 0 10px;
}
-/* line 183 */
+/* line 195 */
.columns {
display: block;
width: 660px;
@@ -261,7 +274,7 @@ h1 {
.columns:after {
clear: both;
}
-/* line 186 */
+/* line 198 */
.columns img {
display: inline;
float: left;
@@ -270,7 +283,7 @@ h1 {
margin-bottom: 1em;
float: right;
}
-/* line 192 */
+/* line 204 */
.columns p {
display: inline;
float: left;
@@ -279,7 +292,7 @@ h1 {
margin-bottom: 1em;
}
-/* line 198 */
+/* line 210 */
.blurb {
display: inline;
float: left;
@@ -287,38 +300,59 @@ h1 {
margin: 0 10px;
}
-/* line 202 */
-#footer {
+/* line 214 */
+hr.footerart {
+ display: block;
margin: 0;
padding: 0;
border: 0;
width: 100%;
- overflow: hidden;
- position: inline;
+ width: 925;
+ height: 116px;
+ background: url(../images/footer-art.png) no-repeat bottom center;
}
-/* line 211 */
-#footer.fixedfooter {
+
+/* line 225 */
+#footerpositioner {
+ margin: 2em 0 0;
+ padding: 0;
+ width: 100%;
+}
+/* line 229 */
+#footerpositioner.fixedfooter {
position: absolute;
bottom: 0;
}
-/* line 216 */
-#footer .copy {
- margin-bottom: 2em;
+
+/* line 235 */
+#footer {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ width: 100%;
+ background-color: #d3d7cf;
+ overflow: hidden;
+ position: inline;
}
-/* line 219 */
-#footer .copy p {
+/* line 245 */
+#footer .copy {
display: inline;
float: left;
width: 940px;
margin: 0 10px;
+ margin-top: 2em;
+ margin-bottom: 2em;
+ font-size: 80%;
}
-/* line 224 */
+/* line 252 */
#footer .navmenu {
display: block;
width: 960px;
margin: 0 -10px;
*zoom: 1;
+ display: none;
margin: 0;
+ line-height: 200%;
}
/* line 27, /home/jimmac/src/cvs/gnome/gnome-devel-docs/hig3/src/stylesheets/grid.scss */
#footer .navmenu:before, #footer .navmenu:after {
@@ -329,79 +363,112 @@ h1 {
#footer .navmenu:after {
clear: both;
}
-/* line 227 */
-#footer .navmenu ul {
+/* line 257 */
+#footer .navmenu li.current a {
+ color: black !important;
+ cursor: default;
+}
+/* line 260 */
+#footer .navmenu li.current a:hover {
+ text-decoration: none !important;
+}
+/* line 264 */
+#footer .navmenu h3 {
+ font-size: 110%;
+}
+/* line 267 */
+#footer .navmenu a {
+ color: #fff;
+ text-decoration: none;
+}
+/* line 270 */
+#footer .navmenu a:hover {
+ color: #444;
+ text-decoration: underline;
+}
+/* line 275 */
+#footer .navmenu .direct {
display: inline;
float: left;
width: 220px;
margin: 0 10px;
- background-color: rgba(0, 0, 0, 0.05);
}
-/* line 231 */
-#footer .navmenu h3 {
+/* line 277 */
+#footer .navmenu .direct ul {
+ display: block;
+ margin-bottom: 2em;
+ padding: 0;
+}
+/* line 282 */
+#footer .navmenu .direct ul li {
+ display: block;
+ padding: 0;
+ margin: 0;
+}
+/* line 289 */
+#footer .navmenu .nested {
display: inline;
float: left;
- width: 220px;
+ width: 700px;
margin: 0 10px;
}
-/* line 234 */
-#footer .navmenu ul.collapsed {
- background-color: rgba(255, 0, 0, 0.4);
+/* line 291 */
+#footer .navmenu .nested ul.collapsed {
display: block;
width: 720px;
margin: 0 -10px;
*zoom: 1;
- margin: 0;
+ margin-bottom: 0;
}
/* line 27, /home/jimmac/src/cvs/gnome/gnome-devel-docs/hig3/src/stylesheets/grid.scss */
-#footer .navmenu ul.collapsed:before, #footer .navmenu ul.collapsed:after {
+#footer .navmenu .nested ul.collapsed:before, #footer .navmenu .nested ul.collapsed:after {
content: "";
display: table;
}
/* line 31, /home/jimmac/src/cvs/gnome/gnome-devel-docs/hig3/src/stylesheets/grid.scss */
-#footer .navmenu ul.collapsed:after {
+#footer .navmenu .nested ul.collapsed:after {
clear: both;
}
-/* line 238 */
-#footer .navmenu ul.collapsed ul {
- display: block;
- width: 240px;
- margin: 0 -10px;
- *zoom: 1;
- background-color: blue;
-}
-/* line 27, /home/jimmac/src/cvs/gnome/gnome-devel-docs/hig3/src/stylesheets/grid.scss */
-#footer .navmenu ul.collapsed ul:before, #footer .navmenu ul.collapsed ul:after {
- content: "";
- display: table;
+/* line 294 */
+#footer .navmenu .nested ul.collapsed a {
+ color: #888a85;
+ font-size: 105%;
}
-/* line 31, /home/jimmac/src/cvs/gnome/gnome-devel-docs/hig3/src/stylesheets/grid.scss */
-#footer .navmenu ul.collapsed ul:after {
- clear: both;
+/* line 297 */
+#footer .navmenu .nested ul.collapsed a:hover {
+ text-decoration: none;
}
-/* line 241 */
-#footer .navmenu ul.collapsed ul li {
+/* line 301 */
+#footer .navmenu .nested ul.collapsed li {
display: inline;
float: left;
width: 220px;
margin: 0 10px;
+ margin-bottom: 2em;
}
-/* line 245 */
-#footer .navmenu ul.collapsed > li {
- display: inline;
- float: left;
- width: 220px;
- margin: 0 10px;
+/* line 304 */
+#footer .navmenu .nested ul.collapsed li ul li {
+ margin: 0;
+}
+/* line 306 */
+#footer .navmenu .nested ul.collapsed li ul li a {
+ color: #fff;
+ text-decoration: none;
+}
+/* line 309 */
+#footer .navmenu .nested ul.collapsed li ul li a:hover {
+ color: #444;
+ text-decoration: underline;
}
/* MOBILE VERSION BELOW */
@media screen and (max-width: 960px) {
- /* line 256 */
+ /* line 325 */
.gnomelink {
display: none;
}
- /* line 259 */
+ /* line 328 */
.blurb {
display: block;
width: 100%;
@@ -418,25 +485,25 @@ h1 {
clear: both;
}
- /* line 262 */
+ /* line 331 */
.logo {
position: static;
margin: 20px auto;
width: 94%;
overflow: hidden;
}
- /* line 267 */
+ /* line 336 */
.logo img {
width: 100px;
height: auto;
}
- /* line 271 */
+ /* line 340 */
.logo div {
margin: .5em 0 0;
font-size: 120%;
}
- /* line 277 */
+ /* line 346 */
.columns {
display: block;
width: 100%;
@@ -452,7 +519,7 @@ h1 {
.columns:after {
clear: both;
}
- /* line 280 */
+ /* line 349 */
.columns img {
display: inline;
float: left;
@@ -460,7 +527,7 @@ h1 {
margin: 0 1.042%;
margin-bottom: 1em;
}
- /* line 285 */
+ /* line 354 */
.columns p {
display: inline;
float: left;
@@ -469,27 +536,27 @@ h1 {
margin-bottom: 1em;
}
- /* line 291 */
+ /* line 360 */
.contain {
width: 97.917%;
margin: 0 auto;
}
- /* line 294 */
+ /* line 363 */
.contain .menu {
display: none;
}
- /* line 295 */
+ /* line 364 */
.contain .main {
display: inline;
float: left;
width: 97.917%;
margin: 0 1.042%;
}
- /* line 296 */
+ /* line 365 */
.contain .sidebar {
margin: 0;
}
- /* line 298 */
+ /* line 367 */
.contain .sidebar .smalllogo {
position: static;
display: block;
@@ -497,19 +564,95 @@ h1 {
width: 94%;
overflow: hidden;
}
- /* line 304 */
+ /* line 373 */
.contain .sidebar .smalllogo img {
width: 100px;
height: auto;
}
- /* line 308 */
+ /* line 377 */
.contain .sidebar .smalllogo div {
margin: .5em 0 0;
font-size: 120%;
}
- /* line 316 */
+ /* line 385 */
+ hr.footerart {
+ width: 96%;
+ margin: 0 auto;
+ background-size: contain;
+ }
+
+ /* line 391 */
#footer {
@inlude column(16);
}
+ /* line 394 */
+ #footer .navmenu {
+ font-size: 130%;
+ line-height: 300%;
+ margin-bottom: 2em;
+ display: inline;
+ float: left;
+ width: 97.917%;
+ margin: 0 1.042%;
+ }
+ /* line 398 */
+ #footer .navmenu h3 {
+ margin: 2em 0 1em;
+ }
+ /* line 402 */
+ #footer .navmenu li {
+ display: inline;
+ float: left;
+ width: 97.917%;
+ margin: 0 1.042%;
+ }
+ /* line 405 */
+ #footer .navmenu .direct {
+ display: inline;
+ float: left;
+ width: 97.917%;
+ margin: 0 1.042%;
+ margin: 0;
+ }
+ /* line 409 */
+ #footer .navmenu .nested {
+ display: inline;
+ float: left;
+ width: 97.917%;
+ margin: 0 1.042%;
+ margin: 0;
+ }
+ /* line 412 */
+ #footer .navmenu .nested ul.collapsed {
+ display: inline;
+ float: left;
+ width: 97.917%;
+ margin: 0 1.042%;
+ margin: 0;
+ }
+ /* line 415 */
+ #footer .navmenu .nested ul.collapsed li {
+ display: inline;
+ float: left;
+ width: 97.917%;
+ margin: 0 1.042%;
+ margin: 0;
+ }
+ /* line 418 */
+ #footer .navmenu .nested ul.collapsed li ul li {
+ display: block;
+ float: none;
+ width: 100%;
+ margin: 0;
+ }
+ /* line 429 */
+ #footer .copy {
+ display: inline;
+ float: left;
+ width: 97.917%;
+ margin: 0 1.042%;
+ margin-top: 2em;
+ margin-bottom: 2em;
+ }
}
diff --git a/hig3/src/layouts/landing.haml b/hig3/src/layouts/landing.haml
index 9c08c99..e5d7b3f 100644
--- a/hig3/src/layouts/landing.haml
+++ b/hig3/src/layouts/landing.haml
@@ -22,6 +22,7 @@
%hr.footerart
#footer
.contain
+ = partial('menu')
.copy
%p
Copyright © 2005—2012 The GNOME Project
diff --git a/hig3/src/pages/_menu.haml b/hig3/src/pages/_menu.haml
index 6720f73..2d8ea8d 100644
--- a/hig3/src/pages/_menu.haml
+++ b/hig3/src/pages/_menu.haml
@@ -16,3 +16,28 @@
%a.expand
Presenting Content
= menubar ['Content View', 'presenting-content-view.html'], ['Fullscreen','presenting-fullscreen.html'], ['Zooming','presenting-zooming.html'], ['Panning','presenting-panning.html']
+ %li
+ %a.expand
+ Finding Content
+ = menubar ['Search', 'finding-search.html'], ['Filter Buttons','finding-filterbuttons.html']
+ %li
+ %a.expand
+ Selections & Actions
+ = menubar ['Checkmark Selector', 'selectmode-checkmark.html'], ['Bottom Toolbar','selectmode-bottomtoolbar.html'], ['Context Menus', 'selectmode-contextmenus.html'], ['Undo', 'selectmode-undo.html'], ['Inline Toolbars', 'selectmode-inlinetoolbars.html']
+ %li
+ %a.expand
+ Navigation
+ = menubar ['Back Button', 'navigation-back.html'],['Home Button', 'navigation-home.html']
+ %li
+ %a.expand
+ Other Window Types
+ = menubar ['Dialog Windows','other-dialogwindows.html'], ['Utility Windows: Preferences', 'other-preferences.html'], ['Utility Windows: Property', 'other-properties.html']
+ %li
+ %a.expand
+ User Interface Components
+ = menubar ['Lists','component-list.html'], ['Menus', 'component-menu.html'], ['Switches', 'component-switch.html'], ['Text Entry Fields', 'component-entry.html'], ['Spin Boxes', 'entry-spinbox.html']
+ %li
+ %a.expand
+ Other
+ = menubar ['Assistants','other-assistant.html']
+
diff --git a/hig3/src/stylesheets/hig.scss b/hig3/src/stylesheets/hig.scss
index 89f4180..2771454 100644
--- a/hig3/src/stylesheets/hig.scss
+++ b/hig3/src/stylesheets/hig.scss
@@ -223,7 +223,7 @@ hr.footerart {
}
#footerpositioner {
- margin: 0;
+ margin: 2em 0 0;
padding: 0;
width: 100%;
&.fixedfooter {
@@ -251,8 +251,16 @@ hr.footerart {
.navmenu {
@include row(16);
+ display: none;
margin: 0; //not included in a grid column, thus no need for negative margins
line-height: 200%;
+ li.current a {
+ color: black !important;
+ cursor: default;
+ &:hover {
+ text-decoration: none !important;
+ }
+ }
h3 {
font-size: 110%;
}
@@ -292,6 +300,7 @@ hr.footerart {
}
li {
@include column(4,12);
+ margin-bottom: 2em;
ul li {
margin: 0;
a {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]