Merge branch 'dev' into feature/dp-7363-image-srcset

massgov · May 30, 2018 · 6d8caea · 6d8caea
2 parents 8106ddb + b8ec45e
commit 6d8caea
Show file tree

Hide file tree

Showing 84 changed files with 3,636 additions and 2,225 deletions.
diff --git a/backstopjs/reference/regression_page_binder-page-internal_0_document_0_phone.png b/backstopjs/reference/regression_page_binder-page-internal_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_binder-page-internal_0_document_1_tablet.png b/backstopjs/reference/regression_page_binder-page-internal_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_organization-boards_0_document_0_phone.png b/backstopjs/reference/regression_page_organization-boards_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_organization-boards_0_document_1_tablet.png b/backstopjs/reference/regression_page_organization-boards_0_document_1_tablet.png
diff --git a/backstopjs/reference/regression_page_regulation_0_document_0_phone.png b/backstopjs/reference/regression_page_regulation_0_document_0_phone.png
diff --git a/backstopjs/reference/regression_page_regulation_0_document_1_tablet.png b/backstopjs/reference/regression_page_regulation_0_document_1_tablet.png
diff --git a/changelogs/DP-6907.txt b/changelogs/DP-6907.txt
@@ -0,0 +1,28 @@
+___DESCRIPTION___
+Changed
+Patch
+- DP-6907: Change default ordered list type styling in rich text fields
+
+___SEMANTIC VERSION (see below)___
+
+
+___POST DEPLOY STEPS___
+1. Do this
+2. Then do this
+
+___CHANGE TYPES___
+- Added for new features.
+- Changed for changes in existing functionality.
+- Deprecated for soon-to-be removed features.
+- Removed for now removed features.
+- Fixed for any bug fixes.
+- Security in case of vulnerabilities.
+
+Note: See http://keepachangelog.com/ for more info about changelogs.
+
+___CHANGE IMPACT___
+- Minor
+- Major
+- Patch
+
+Note: Refer to `docs/versioning.md` for more info about change impact according to semantic versioning.
diff --git a/changelogs/DP-8574.txt b/changelogs/DP-8574.txt
@@ -0,0 +1,5 @@
+___DESCRIPTION___
+Fixed
+Minor
+- DP-8574: Update jQuery version for stickyTOC Firefox bug
+
diff --git a/changelogs/DP-9010.txt b/changelogs/DP-9010.txt
@@ -0,0 +1,28 @@
+___DESCRIPTION___
+Change
+Patch
+- DP-9010: MF Update row order for boards page
+
+___SEMANTIC VERSION (see below)___
+
+
+___POST DEPLOY STEPS___
+1. Do this
+2. Then do this
+
+___CHANGE TYPES___
+- Added for new features.
+- Changed for changes in existing functionality.
+- Deprecated for soon-to-be removed features.
+- Removed for now removed features.
+- Fixed for any bug fixes.
+- Security in case of vulnerabilities.
+
+Note: See http://keepachangelog.com/ for more info about changelogs.
+
+___CHANGE IMPACT___
+- Minor
+- Major
+- Patch
+
+Note: Refer to `docs/versioning.md` for more info about change impact according to semantic versioning.
diff --git a/styleguide/source/_patterns/01-atoms/08-lists/ordered-list.json b/styleguide/source/_patterns/01-atoms/08-lists/ordered-list.json
@@ -1,16 +1,40 @@
 {
-  "orderedList": [{ 
-    "text": "This is a list item in an ordered list" 
-  },{
-    "text": "An ordered list is a list in which the sequence of items is important." 
-  },{
-    "text": "Lists can be nested inside of each other",
-    "sublist" : [{
-      "text":"This is a nested list item"
-    },{
-      "text":"This is another nested list item in an ordered list"
-    }]
-  },{
-    "text":"This is the last list item"
-  }]
-}
+  "orderedList": [
+    {
+      "text": "This is a list item in an ordered list"
+    },
+    {
+      "text": "An ordered list is a list in which the sequence of items is important. Top level item counters are digits"
+    },
+    {
+      "text": "Lists can be nested inside of each other",
+      "sublist": [
+        {
+          "text": "This is a nested list item. After digits list items counters are lower-alpha."
+        },
+        {
+          "text": "This is another nested list item in an ordered list",
+           "sublist": [
+            {
+              "text": "This is a nested list item. After lower-alpha counters, lower-roman counters are used.",
+              "sublist": [
+                {
+                  "text": "This is a nested list item. After lower-roman counters, the counters loop back to digits."
+                },
+                {
+                  "text": "This is another nested list item in an ordered list"
+                }
+              ]
+            },
+            {
+              "text": "This is another nested list item in an ordered list"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "text": "This is the last list item"
+    }
+  ]
+}
diff --git a/styleguide/source/_patterns/01-atoms/08-lists/ordered-list.md b/styleguide/source/_patterns/01-atoms/08-lists/ordered-list.md
@@ -1,15 +1,22 @@
 ### Description
 An `<ol>`  element with its child `<li>` elements and optional nested child `<ol>` and `<li>` elements.
 
+### List Style Types
+The list style type loop through 3 different counters:
+
+* digits
+* lower-alpha
+* lower-roman
+
 ### Status
 * Stable as of 5.0.0
 
 ### Variables:
 ~~~
-orderedList [{ 
+orderedList [{
   text:
     type: string / required
-  sublist (optional) [{ 
+  sublist (optional) [{
     text:
       type: string / required
   }]

diff --git a/styleguide/source/_patterns/01-atoms/08-lists/ordered-list.twig b/styleguide/source/_patterns/01-atoms/08-lists/ordered-list.twig
@@ -1,12 +1,31 @@
 <ol>
-	{% for list in orderedList %}
-		<li>{{ list.text|raw }}</li>
-		{% if list.sublist %}
-			<ol>
-				{% for sublist in list.sublist %}
-					<li>{{ sublist.text|raw }}</li>
-				{% endfor %}
-			</ol>
-		{% endif %}
-	{% endfor %}
+  {% for list in orderedList %}
+    <li>{{ list.text|raw }}
+    {% if list.sublist %}
+      <ol>
+        {% for sublist in list.sublist %}
+          <li>{{ sublist.text|raw }}
+          {% if sublist.sublist %}
+            <ol>
+              {% for sublist in sublist.sublist %}
+                <li>{{ sublist.text|raw }}
+                {% if sublist.sublist %}
+				            <ol>
+				              {% for sublist in sublist.sublist %}
+				                <li>{{ sublist.text|raw }}</li>
+				              {% endfor %}
+				            </ol>
+				          {% endif %}
+				        </li>
+              {% endfor %}
+            </ol>
+          {% endif %}
+          </li>
+        {% endfor %}
+      </ol>
+      </li>
+    {% endif %}
+  {% endfor %}
 </ol>
+
+