Skip to content

Commit 88f87b3

Browse files
committed
Merge branch 'develop' into feature/resets
2 parents 8f456e4 + d98785a commit 88f87b3

File tree

211 files changed

+34688
-23326
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+34688
-23326
lines changed

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "npm"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
versioning-strategy: increase

.gitignore

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,11 @@ Thumbs.db
4141
######################
4242
*.sublime-workspace
4343

44-
# Jekyll Site #
44+
# 11ty Site #
4545
###############
4646
# This is compiled by Netlify on its servers, so no need to include it.
4747
_site/
4848
.asset-cache
49-
.jekyll-metadata
5049

5150
# Komodo Edit #
5251
###############
@@ -58,7 +57,9 @@ node_modules
5857

5958
# Compiled CSS/JS #
6059
###############
61-
/dist/css/
60+
/dist/css/*
61+
!/dist/css/stacks-flexgrid-shim.min.css
62+
/dist/js/
6263
/docs/assets/css/
6364
/docs/assets/js/stacks.*
6465
/docs/assets/js/controllers.js
@@ -80,6 +81,7 @@ node_modules
8081
# Testing Assets #
8182
###############
8283
/backstop_data/bitmaps_test/
84+
/backstop_data/bitmaps_reference/
8385
/backstop_data/html_report/
8486

8587
# GitHub Actions #

.stylelintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
node_modules
2+
*.*
3+
!*.less

.stylelintrc

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"extends": "stylelint-config-recommended-less",
3+
"customSyntax": "postcss-less",
4+
"plugins": [
5+
"stylelint-less"
6+
],
7+
"rules": {
8+
"at-rule-no-unknown": null,
9+
"less/color-no-invalid-hex": null,
10+
"less/no-duplicate-variables": null,
11+
"indentation": 4,
12+
"max-empty-lines": 2,
13+
"no-invalid-double-slash-comments": null,
14+
"rule-empty-line-before": null,
15+
"at-rule-empty-line-before": null,
16+
"declaration-empty-line-before": null,
17+
"selector-pseudo-element-colon-notation": "single",
18+
"no-descending-specificity": null,
19+
"function-whitespace-after": null,
20+
"no-invalid-position-at-import-rule": null,
21+
"selector-disallowed-list": [
22+
"/[.#]js-/",
23+
{
24+
"message": "js-* selectors can’t have visual styling. https://stackoverflow.design/product/guidelines/javascript/#javascript-classnames"
25+
}
26+
]
27+
}
28+
}

Gruntfile.js

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ module.exports = function(grunt) {
118118

119119
stacks_js: {
120120
files: ['lib/ts/**/*.ts'], // note: this doesn't watch any of the npm dependencies
121-
tasks: ['concurrent:compile_stacks_js', 'copy:js2docs', 'copy:highlightJs', 'copy:editorJs', 'copy:editorCSS']
121+
tasks: ['concurrent:compile_stacks_js', 'copy:js2docs', 'copy:jQueryJs', 'copy:highlightJs', 'copy:docsearchJs', 'copy:listJs', 'copy:editorJs', 'copy:editorCSS']
122122
},
123123
},
124124
// Run tasks in parallel
@@ -136,7 +136,7 @@ module.exports = function(grunt) {
136136
compile: [
137137
'concurrent:compile_stacks_css',
138138
'ts:docs_js',
139-
['concurrent:compile_stacks_js', 'copy:js2docs', 'copy:highlightJs', 'copy:editorJs', 'copy:editorCSS']
139+
['concurrent:compile_stacks_js', 'copy:js2docs', 'copy:jQueryJs', 'copy:highlightJs', 'copy:docsearchJs', 'copy:listJs', 'copy:editorJs', 'copy:editorCSS']
140140
],
141141

142142
// Stacks JS
@@ -176,6 +176,15 @@ module.exports = function(grunt) {
176176
return dest + src.replace('app.bundle.js','library.stacks-editor.js');
177177
}
178178
},
179+
jQueryJs: {
180+
src: 'node_modules/jquery/dist/jquery.min.js',
181+
dest: 'docs/assets/js/',
182+
flatten: true,
183+
expand: true,
184+
rename: function(dest, src) {
185+
return dest + src.replace('jquery.min.js','library.jquery.js');
186+
}
187+
},
179188
highlightJs: {
180189
src: 'node_modules/@highlightjs/cdn-assets/highlight.min.js',
181190
dest: 'docs/assets/js/',
@@ -185,6 +194,24 @@ module.exports = function(grunt) {
185194
return dest + src.replace('highlight.min.js','library.highlight.js');
186195
}
187196
},
197+
docsearchJs: {
198+
src: 'node_modules/docsearch.js/dist/cdn/docsearch.min.js',
199+
dest: 'docs/assets/js/',
200+
flatten: true,
201+
expand: true,
202+
rename: function(dest, src) {
203+
return dest + src.replace('docsearch.min.js','library.docsearch.js');
204+
}
205+
},
206+
listJs: {
207+
src: 'node_modules/list.js/dist/list.min.js',
208+
dest: 'docs/assets/js/',
209+
flatten: true,
210+
expand: true,
211+
rename: function(dest, src) {
212+
return dest + src.replace('list.min.js','library.list.js');
213+
}
214+
},
188215
editorCSS: {
189216
src: 'node_modules/@stackoverflow/stacks-editor/dist/styles.css',
190217
dest: 'docs/assets/css/',

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ Have a bug or feature request? First search existing or closed issues to make su
4444
If you’d like to contribute to Stacks, please read through our [contribution guidelines](/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
4545

4646
## License
47-
Code and documentation copyright 2017-2021 Stack Exchange, Inc and released under the [MIT License](/LICENSE.MD).
47+
Code and documentation copyright 2017-2022 Stack Exchange, Inc and released under the [MIT License](/LICENSE.MD).

backstop.json

Lines changed: 78 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,13 @@
6565
"url": "http://localhost:8080/product/guidelines/javascript"
6666
},
6767
{
68+
"selectors": [
69+
"document"
70+
],
71+
"label": "Product Theming",
72+
"url": "http://localhost:8080/product/guidelines/theming"
73+
},
74+
{
6875
"selectors": [
6976
"document"
7077
],
@@ -142,6 +149,13 @@
142149
"url": "http://localhost:8080/product/base/display"
143150
},
144151
{
152+
"selectors": [
153+
"document"
154+
],
155+
"label": "Product Flex",
156+
"url": "http://localhost:8080/product/base/flex"
157+
},
158+
{
145159
"selectors": [
146160
"document"
147161
],
@@ -170,6 +184,13 @@
170184
"url": "http://localhost:8080/product/base/lists"
171185
},
172186
{
187+
"selectors": [
188+
"document"
189+
],
190+
"label": "Product Object Fit",
191+
"url": "http://localhost:8080/product/base/object-fit"
192+
},
193+
{
173194
"selectors": [
174195
"document"
175196
],
@@ -247,6 +268,13 @@
247268
"url": "http://localhost:8080/product/base/z-index"
248269
},
249270
{
271+
"selectors": [
272+
"document"
273+
],
274+
"label": "Product Activity Indicator",
275+
"url": "http://localhost:8080/product/components/activity-indicator"
276+
},
277+
{
250278
"selectors": [
251279
"document"
252280
],
@@ -303,6 +331,20 @@
303331
"url": "http://localhost:8080/product/components/checkbox"
304332
},
305333
{
334+
"selectors": [
335+
"document"
336+
],
337+
"label": "Product Code blocks",
338+
"url": "http://localhost:8080/product/components/code-blocks"
339+
},
340+
{
341+
"selectors": [
342+
"document"
343+
],
344+
"label": "Product Editor",
345+
"url": "http://localhost:8080/product/components/editor"
346+
},
347+
{
306348
"selectors": [
307349
"document"
308350
],
@@ -387,6 +429,13 @@
387429
"url": "http://localhost:8080/product/components/popovers"
388430
},
389431
{
432+
"selectors": [
433+
"document"
434+
],
435+
"label": "Product Post Summary",
436+
"url": "http://localhost:8080/product/components/post-summary"
437+
},
438+
{
390439
"selectors": [
391440
"document"
392441
],
@@ -457,6 +506,13 @@
457506
"url": "http://localhost:8080/product/components/toggle-switch"
458507
},
459508
{
509+
"selectors": [
510+
"document"
511+
],
512+
"label": "Product Uploader",
513+
"url": "http://localhost:8080/product/components/uploader"
514+
},
515+
{
460516
"selectors": [
461517
"document"
462518
],
@@ -649,8 +705,29 @@
649705
"selectors": [
650706
"document"
651707
],
652-
"label": "Brand Logo",
708+
"label": "Brand Naming Guidelines",
709+
"url": "http://localhost:8080/brand/copywriting/naming"
710+
},
711+
{
712+
"selectors": [
713+
"document"
714+
],
715+
"label": "Brand Logos",
653716
"url": "http://localhost:8080/brand/logo"
717+
},
718+
{
719+
"selectors": [
720+
"document"
721+
],
722+
"label": "Brand Typography",
723+
"url": "http://localhost:8080/brand/typography"
724+
},
725+
{
726+
"selectors": [
727+
"document"
728+
],
729+
"label": "Brand Colors",
730+
"url": "http://localhost:8080/brand/colors"
654731
}
655732
],
656733
"paths": {

dist/css/stacks-flexgrid-shim.min.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/stacks.d.ts

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)