improve touch support, clean up files, extend documentation, create s…

…itemap
greenpeace · Apr 14, 2015 · 732861c · 732861c
1 parent 1fd1a42
commit 732861c
Show file tree

Hide file tree

Showing 150 changed files with 12,934 additions and 1,047 deletions.
diff --git a/bower.json b/bower.json
@@ -7,6 +7,7 @@
     "leaflet": "~0.7.3",
     "leaflet.markercluster": "~0.4.0",
     "respimage": "~1.3.0",
-    "lazysizes": "~0.9.0"
+    "lazysizes": "~0.9.0",
+    "jquery-touchswipe": "~1.6.8"
   }
 }
diff --git a/build b/build
diff --git a/config.rb b/config.rb
@@ -106,7 +106,7 @@ def nav_link(name, url, options={})
 configure :build do
   # For example, change the Compass output style for deployment
   activate :minify_css
-  activate :minify_html
+  #activate :minify_html
 
   activate :imageoptim
 
@@ -116,7 +116,7 @@ def nav_link(name, url, options={})
 
   ignore 'libraries/*'
 
-  activate :gzip
+  #activate :gzip
 
   # Uniquely-named assets, preventing users from using outdated files
   # Exclude files that are called from template files directly

diff --git a/source/backstop.json b/source/backstop.json
@@ -18,17 +18,16 @@
   ],
   "scenarios": [
     {
-      "label": "http://greenwire.greenpeace.org",
-      "url": "../../../build/prototype/lu/index.html",
+      "label": "Greenwire",
+      "url": "http://ggw-prototype.goalgorilla.com/prototype/lu/index.html",
       "hideSelectors": [],
       "removeSelectors": [],
       "selectors": [
         "header",
         ".block-events",
-        ".block-comments",
+        ".comment-form-holder",
         ".l-branding-header",
-        "footer",
-        "body"
+        ".footer"
       ],
       "readyEvent": null,
       "delay": 500

diff --git a/source/components/blocks.html.haml b/source/components/blocks.html.haml
@@ -1,11 +1,21 @@
 ---
 title: Blocks
-body_class: page-blocks
+body_class: page-blocks l-has-sidebar-first
+layout: styleguide
+direct_parent:
+  -
+    name: "Styleguide"
+    url: "/"
+  -
+    name: "UI Components"
+    url: "./blocks.html"
+
 layout: styleguide
-design_status: Needs review
 ---
 
-%aside.sidebar-left
+= partial :"blocks/breadcrumbs"
+
+%aside.sidebar-first
   = partial :"nav/uicomponents"
 #content.l-main-column
   %section.block

diff --git a/source/components/breadcrumbs.html.haml b/source/components/breadcrumbs.html.haml
@@ -1,19 +1,29 @@
 ---
 title: Breadcrumbs
-body_class: page-breadcrumbs
+body_class: page-breadcrumbs l-has-sidebar-first
+layout: styleguide
+direct_parent:
+  -
+    name: "Styleguide"
+    url: "/"
+  -
+    name: "UI Components"
+    url: "./blocks.html"
+
 layout: styleguide
-design_status: Needs review
 ---
 
-%aside.sidebar-left
+= partial :"blocks/breadcrumbs"
+
+%aside.sidebar-first
   = partial :"nav/uicomponents"
 #content.l-main-column
   %section.block
     %i.block-icon.icon-info.icon-bg-default
     %h2.block-title Breadcrumbs
     .content
       :markdown
-        Breadcrumbs are shown on all pages, except the homepage.
+        Breadcrumbs are shown on all pages, except the homepage. On screen sizes smaller than `900px` breadcrumbs are hidden.
 
       .demo
         %nav.breadcrumb{:role => "navigation"}

diff --git a/source/components/buttons.html.haml b/source/components/buttons.html.haml
@@ -1,11 +1,21 @@
 ---
 title: Buttons
-body_class: page-buttons
+body_class: page-buttons l-has-sidebar-first
+layout: styleguide
+direct_parent:
+  -
+    name: "Styleguide"
+    url: "/"
+  -
+    name: "UI Components"
+    url: "./blocks.html"
+
 layout: styleguide
-design_status: Needs review
 ---
 
-%aside.sidebar-left
+= partial :"blocks/breadcrumbs"
+
+%aside.sidebar-first
   = partial :"nav/uicomponents"
 #content.l-main-column
   %section.block

diff --git a/source/components/dropdowns.html.haml b/source/components/dropdowns.html.haml
@@ -1,11 +1,21 @@
 ---
 title: Dropdowns
-body_class: page-dropdowns
+body_class: page-dropdowns l-has-sidebar-first
+layout: styleguide
+direct_parent:
+  -
+    name: "Styleguide"
+    url: "/"
+  -
+    name: "UI Components"
+    url: "./blocks.html"
+
 layout: styleguide
-design_status: Needs review
 ---
 
-%aside.sidebar-left
+= partial :"blocks/breadcrumbs"
+
+%aside.sidebar-first
   = partial :"nav/uicomponents"
 #content.l-main-column
   %section.block

diff --git a/source/components/forms.html.haml b/source/components/forms.html.haml
@@ -1,11 +1,21 @@
 ---
 title: Forms
-body_class: page-forms
+body_class: page-forms l-has-sidebar-first
+layout: styleguide
+direct_parent:
+  -
+    name: "Styleguide"
+    url: "/"
+  -
+    name: "UI Components"
+    url: "./blocks.html"
+
 layout: styleguide
-design_status: Needs review
 ---
 
-%aside.sidebar-left
+= partial :"blocks/breadcrumbs"
+
+%aside.sidebar-first
   = partial :"nav/uicomponents"
 .l-main-column
   %section.block#content

diff --git a/source/components/images.html.haml b/source/components/images.html.haml
@@ -1,11 +1,21 @@
 ---
 title: Images
-body_class: page-images
+body_class: page-images l-has-sidebar-first
+layout: styleguide
+direct_parent:
+  -
+    name: "Styleguide"
+    url: "/"
+  -
+    name: "UI Components"
+    url: "./blocks.html"
+
 layout: styleguide
-design_status: Work in progress
 ---
 
-%aside.sidebar-left
+= partial :"blocks/breadcrumbs"
+
+%aside.sidebar-first
   = partial :"nav/uicomponents"
 #content.l-main-column
   %section.block

diff --git a/source/components/progress-bar.html.haml b/source/components/progress-bar.html.haml
@@ -1,11 +1,21 @@
 ---
 title: Progress bar
-body_class: page-progress-bar
+body_class: page-progress-bar l-has-sidebar-first
+layout: styleguide
+direct_parent:
+  -
+    name: "Styleguide"
+    url: "/"
+  -
+    name: "UI Components"
+    url: "./blocks.html"
+
 layout: styleguide
-design_status: Needs review
 ---
 
-%aside.sidebar-left
+= partial :"blocks/breadcrumbs"
+
+%aside.sidebar-first
   = partial :"nav/uicomponents"
 #content.l-main-column
   %section.block

diff --git a/source/components/tabs.html.haml b/source/components/tabs.html.haml
@@ -1,11 +1,21 @@
 ---
 title: Tabs
-body_class: page-tabs
+body_class: page-tabs l-has-sidebar-first
+layout: styleguide
+direct_parent:
+  -
+    name: "Styleguide"
+    url: "/"
+  -
+    name: "UI Components"
+    url: "./blocks.html"
+
 layout: styleguide
-design_status: Needs review
 ---
 
-%aside.sidebar-left
+= partial :"blocks/breadcrumbs"
+
+%aside.sidebar-first
   = partial :"nav/uicomponents"
 #content.l-main-column
   %section.block

diff --git a/source/components/teasers.html.haml b/source/components/teasers.html.haml
@@ -1,12 +1,23 @@
 ---
 title: Teasers
-body_class: page-teasers
+body_class: page-teasers l-has-sidebar-first
+layout: styleguide
+direct_parent:
+  -
+    name: "Styleguide"
+    url: "/"
+  -
+    name: "UI Components"
+    url: "./blocks.html"
+
 layout: styleguide
-design_status: Needs review
 ---
 
-%aside.sidebar-left
+= partial :"blocks/breadcrumbs"
+
+%aside.sidebar-first
   = partial :"nav/uicomponents"
+
 #content.l-main-column
   %section.block
     %i.block-icon.icon-info.icon-bg-default

diff --git a/source/css/base/_typography.scss b/source/css/base/_typography.scss
@@ -150,6 +150,12 @@ article {
 
 }
 
+::selection {
+  background: $green1;
+  color: $white;
+  text-shadow: none;
+}
+
 .small-link {
   @include font-size($p);
   display: block;

diff --git a/source/css/base/_visibility.scss b/source/css/base/_visibility.scss
@@ -21,3 +21,25 @@
 .clear {
   @extend %inline-cf;
 }
+
+@include breakpoint($desk) {
+
+  .affix {
+    position: fixed;
+  }
+
+}
+
+.hidden-mobile {
+  display: none;
+
+  @include breakpoint($desk) {
+    display: block;
+  }
+}
+
+@include breakpoint($desk) {
+  .only-mobile {
+    display: none;
+  }
+}
diff --git a/source/css/components/_article.scss b/source/css/components/_article.scss
@@ -27,7 +27,7 @@ article {
     margin-top: $def-mar-half;
 
     @include breakpoint($desk) {
-      margin-top: $def-mar;
+      margin-top: $def-mar + 10px;
     }
 
   }