Skip to content

Commit

Permalink
Merge branch 'develop' into feature/resets
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronshekey committed Jan 6, 2022
2 parents 8f456e4 + d98785a commit 88f87b3
Show file tree
Hide file tree
Showing 211 changed files with 34,688 additions and 23,326 deletions.
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "weekly"
versioning-strategy: increase
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,11 @@ Thumbs.db
######################
*.sublime-workspace

# Jekyll Site #
# 11ty Site #
###############
# This is compiled by Netlify on its servers, so no need to include it.
_site/
.asset-cache
.jekyll-metadata

# Komodo Edit #
###############
Expand All @@ -58,7 +57,9 @@ node_modules

# Compiled CSS/JS #
###############
/dist/css/
/dist/css/*
!/dist/css/stacks-flexgrid-shim.min.css
/dist/js/
/docs/assets/css/
/docs/assets/js/stacks.*
/docs/assets/js/controllers.js
Expand All @@ -80,6 +81,7 @@ node_modules
# Testing Assets #
###############
/backstop_data/bitmaps_test/
/backstop_data/bitmaps_reference/
/backstop_data/html_report/

# GitHub Actions #
Expand Down
3 changes: 3 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules
*.*
!*.less
28 changes: 28 additions & 0 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"extends": "stylelint-config-recommended-less",
"customSyntax": "postcss-less",
"plugins": [
"stylelint-less"
],
"rules": {
"at-rule-no-unknown": null,
"less/color-no-invalid-hex": null,
"less/no-duplicate-variables": null,
"indentation": 4,
"max-empty-lines": 2,
"no-invalid-double-slash-comments": null,
"rule-empty-line-before": null,
"at-rule-empty-line-before": null,
"declaration-empty-line-before": null,
"selector-pseudo-element-colon-notation": "single",
"no-descending-specificity": null,
"function-whitespace-after": null,
"no-invalid-position-at-import-rule": null,
"selector-disallowed-list": [
"/[.#]js-/",
{
"message": "js-* selectors can’t have visual styling. https://stackoverflow.design/product/guidelines/javascript/#javascript-classnames"
}
]
}
}
31 changes: 29 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ module.exports = function(grunt) {

stacks_js: {
files: ['lib/ts/**/*.ts'], // note: this doesn't watch any of the npm dependencies
tasks: ['concurrent:compile_stacks_js', 'copy:js2docs', 'copy:highlightJs', 'copy:editorJs', 'copy:editorCSS']
tasks: ['concurrent:compile_stacks_js', 'copy:js2docs', 'copy:jQueryJs', 'copy:highlightJs', 'copy:docsearchJs', 'copy:listJs', 'copy:editorJs', 'copy:editorCSS']
},
},
// Run tasks in parallel
Expand All @@ -136,7 +136,7 @@ module.exports = function(grunt) {
compile: [
'concurrent:compile_stacks_css',
'ts:docs_js',
['concurrent:compile_stacks_js', 'copy:js2docs', 'copy:highlightJs', 'copy:editorJs', 'copy:editorCSS']
['concurrent:compile_stacks_js', 'copy:js2docs', 'copy:jQueryJs', 'copy:highlightJs', 'copy:docsearchJs', 'copy:listJs', 'copy:editorJs', 'copy:editorCSS']
],

// Stacks JS
Expand Down Expand Up @@ -176,6 +176,15 @@ module.exports = function(grunt) {
return dest + src.replace('app.bundle.js','library.stacks-editor.js');
}
},
jQueryJs: {
src: 'node_modules/jquery/dist/jquery.min.js',
dest: 'docs/assets/js/',
flatten: true,
expand: true,
rename: function(dest, src) {
return dest + src.replace('jquery.min.js','library.jquery.js');
}
},
highlightJs: {
src: 'node_modules/@highlightjs/cdn-assets/highlight.min.js',
dest: 'docs/assets/js/',
Expand All @@ -185,6 +194,24 @@ module.exports = function(grunt) {
return dest + src.replace('highlight.min.js','library.highlight.js');
}
},
docsearchJs: {
src: 'node_modules/docsearch.js/dist/cdn/docsearch.min.js',
dest: 'docs/assets/js/',
flatten: true,
expand: true,
rename: function(dest, src) {
return dest + src.replace('docsearch.min.js','library.docsearch.js');
}
},
listJs: {
src: 'node_modules/list.js/dist/list.min.js',
dest: 'docs/assets/js/',
flatten: true,
expand: true,
rename: function(dest, src) {
return dest + src.replace('list.min.js','library.list.js');
}
},
editorCSS: {
src: 'node_modules/@stackoverflow/stacks-editor/dist/styles.css',
dest: 'docs/assets/css/',
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ Have a bug or feature request? First search existing or closed issues to make su
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.

## License
Code and documentation copyright 2017-2021 Stack Exchange, Inc and released under the [MIT License](/LICENSE.MD).
Code and documentation copyright 2017-2022 Stack Exchange, Inc and released under the [MIT License](/LICENSE.MD).
79 changes: 78 additions & 1 deletion backstop.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,13 @@
"url": "http://localhost:8080/product/guidelines/javascript"
},
{
"selectors": [
"document"
],
"label": "Product Theming",
"url": "http://localhost:8080/product/guidelines/theming"
},
{
"selectors": [
"document"
],
Expand Down Expand Up @@ -142,6 +149,13 @@
"url": "http://localhost:8080/product/base/display"
},
{
"selectors": [
"document"
],
"label": "Product Flex",
"url": "http://localhost:8080/product/base/flex"
},
{
"selectors": [
"document"
],
Expand Down Expand Up @@ -170,6 +184,13 @@
"url": "http://localhost:8080/product/base/lists"
},
{
"selectors": [
"document"
],
"label": "Product Object Fit",
"url": "http://localhost:8080/product/base/object-fit"
},
{
"selectors": [
"document"
],
Expand Down Expand Up @@ -247,6 +268,13 @@
"url": "http://localhost:8080/product/base/z-index"
},
{
"selectors": [
"document"
],
"label": "Product Activity Indicator",
"url": "http://localhost:8080/product/components/activity-indicator"
},
{
"selectors": [
"document"
],
Expand Down Expand Up @@ -303,6 +331,20 @@
"url": "http://localhost:8080/product/components/checkbox"
},
{
"selectors": [
"document"
],
"label": "Product Code blocks",
"url": "http://localhost:8080/product/components/code-blocks"
},
{
"selectors": [
"document"
],
"label": "Product Editor",
"url": "http://localhost:8080/product/components/editor"
},
{
"selectors": [
"document"
],
Expand Down Expand Up @@ -387,6 +429,13 @@
"url": "http://localhost:8080/product/components/popovers"
},
{
"selectors": [
"document"
],
"label": "Product Post Summary",
"url": "http://localhost:8080/product/components/post-summary"
},
{
"selectors": [
"document"
],
Expand Down Expand Up @@ -457,6 +506,13 @@
"url": "http://localhost:8080/product/components/toggle-switch"
},
{
"selectors": [
"document"
],
"label": "Product Uploader",
"url": "http://localhost:8080/product/components/uploader"
},
{
"selectors": [
"document"
],
Expand Down Expand Up @@ -649,8 +705,29 @@
"selectors": [
"document"
],
"label": "Brand Logo",
"label": "Brand Naming Guidelines",
"url": "http://localhost:8080/brand/copywriting/naming"
},
{
"selectors": [
"document"
],
"label": "Brand Logos",
"url": "http://localhost:8080/brand/logo"
},
{
"selectors": [
"document"
],
"label": "Brand Typography",
"url": "http://localhost:8080/brand/typography"
},
{
"selectors": [
"document"
],
"label": "Brand Colors",
"url": "http://localhost:8080/brand/colors"
}
],
"paths": {
Expand Down
1 change: 1 addition & 0 deletions dist/css/stacks-flexgrid-shim.min.css

Large diffs are not rendered by default.

16 changes: 0 additions & 16 deletions dist/js/stacks.d.ts

This file was deleted.

0 comments on commit 88f87b3

Please sign in to comment.