Skip to content

Commit

Permalink
Merge pull request #244 from milligram/release/v1.4.0
Browse files Browse the repository at this point in the history
Milligram v1.4.0
  • Loading branch information
cjpatoilo committed Jun 1, 2020
2 parents 6dbea0b + 77d5b50 commit af339b2
Show file tree
Hide file tree
Showing 82 changed files with 15,027 additions and 7,282 deletions.
7 changes: 3 additions & 4 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
os: Visual Studio 2015
version: "{build}"
version: '{build}'
build: off
platform: x64
environment:
matrix:
- nodejs_version: 10
- nodejs_version: 8
- nodejs_version: 12
install:
- ps: Install-Product node $env:nodejs_version x64
- set CI=true
- npm i -g npm@latest
- set PATH=%APPDATA%\npm;%PATH%
- npm install
- npm i
matrix:
fast_finish: true
shallow_clone: true
Expand Down
14 changes: 0 additions & 14 deletions .editorconfig

This file was deleted.

3 changes: 0 additions & 3 deletions .eslintrc

This file was deleted.

52 changes: 22 additions & 30 deletions .github/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

We would love for you to contribute to Milligram and help us make this even better! Start reading this document to see it is not difficult as you might have imagined.

_Note: For issues relating to the site, please use the [milligram/milligram.github.io](https://github.com/milligram/milligram.github.io)_

## Table of Contents

Expand All @@ -13,12 +14,10 @@ We would love for you to contribute to Milligram and help us make this even bett
- [Code of Conduct](#code-of-conduct)
- [License](#license)


## Open an Issue

[Open an Issue](../../../issues/new) to report any problems or improvements. When necessary, use [Codepen](http://codepen.io/) to show the problem. Be sure to include some description to explain the problem.


## Submit a Pull Request

To submit a new feature, make sure that changes are done to the source code. [Follow our style guide](#style-guide) and do not forget the tests and attach the link [Codepen](http://codepen.io/) along with the description.
Expand All @@ -31,17 +30,13 @@ Try to solve a problem for each pull request, this increases the chances of acce
1. Push to the branch: `git push origin my-feature-name`
1. Submit a pull request!

You can do all of this from yoru browser using Gitpod, the free online dev environment.

[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/milligram/milligram)

*Note: For issues relating to the site, please use the [milligram.github.io](https://github.com/milligram/milligram.github.io)*


## Building

First install [Node.js](https://nodejs.org/en/download/) for the build process. Now install all the dependencies, run `npm install` from the project directory. Once you have the dependencies installed, run `npm start`. This will run the build task which compiles the Sass files into Milligram.css file in the expanded and compressed version.

You can do all of this from your browser using Gitpod, the free online dev environment.

[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/milligram/milligram)

## Style Guide

Expand All @@ -64,37 +59,34 @@ Milligram use [Sass](http://sass-lang.com/) to give super powers to CSS. Look at
.selector-b,
.selector-c,
.selector-d[type='text']
box-sizing: border-box
color: #333
content: ''
display: inline-block
font-family: 'Helvetica-Neue', 'Helvetica', 'Arial', sans-serif
margin-bottom: 0
margin-left: 5.0rem
.other-selector-a
background: #fff
.other-selector-b
background: #fff
&.increasing-the-specificity
color: #000
box-sizing: border-box
color: #333
content: ''
display: inline-block
font-family: 'Helvetica-Neue', 'Helvetica', 'Arial', sans-serif
margin-bottom: 0
margin-left: 5.0rem
.other-selector-a
background: #fff
.other-selector-b
background: #fff
&.increasing-the-specificity
color: #000
```

*Note: This style guide was inspired by [Idiomatic.css](https://github.com/necolas/idiomatic-css). Milligram uses an `.editorconfig` file, which most editors support, to enforce these coding standards.*

_Note: This style guide was inspired by [Idiomatic.css](https://github.com/necolas/idiomatic-css)._

## Test

Breaking CSS is easy. Checking every responsive page element is hard. That's why Milligram uses automated visual regression testing for responsive web UI by comparing DOM screenshots at various viewport sizes. To view the comparison run `npm test` after making changes to the source code.

Breaking CSS is easy. Checking every responsive page element is hard. That's why Milligram uses automated visual regression testing for responsive web UI by comparing DOM screenshots at various viewport sizes. To view the comparison run `npm run visual-regression` after making changes to the source code.

## Code of Conduct

Help us keep Milligram open and inclusive. Please read and follow our thoughts on [Code of Conduct](http://confcodeofconduct.com/).


## License

By contributing your code, you agree to license your contribution under the [MIT license](../license).
2 changes: 1 addition & 1 deletion .github/funding.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
patreon: cjpatoilo
open_collective: milligram
patreon: cjpatoilo
5 changes: 0 additions & 5 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ By contributing your code, you agree to license your contribution under the [MIT
-->


### Version info

<!-- What versions of the following libraries are you using? Note that your issue may already
Expand All @@ -26,22 +25,18 @@ be fixed in the latest versions. -->

**Other (e.g. normalize.css, node.js, npm, bower, browser, operating system) (if applicable):**


### Test case

<!-- Provide code samples on [Codepen](http://codepen.io/). -->


### Steps to reproduce

<!-- Provide the steps needed to reproduce the issue given the above test case. -->


### Expected behavior

<!-- What is the expected behavior? -->


### Actual behavior

<!-- What is the actual behavior? -->
3 changes: 1 addition & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Try to solve a problem for each pull request, this increases the chances of acce
1. Push to the branch: `git push origin my-feature-name`
1. Submit a pull request!
*Note: For issues relating to the site, please use the [milligram.github.io](https://github.com/milligram/milligram.github.io)*
_Note: For issues relating to the site, please use the [milligram/milligram.github.io](https://github.com/milligram/milligram.github.io)_
Code of Conduct
==============================
Expand All @@ -26,7 +26,6 @@ By contributing your code, you agree to license your contribution under the [MIT
-->


### Description

<!-- Are you fixing a bug? Implementing a new feature? Updating the documentation? Describe here something about your changes. Don't forget to add the link to the open issue, or to other pull request related. -->
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Temporary Items
Thumbs.db
build/Release
coverage
dist
ehthumbs.db
lib-cov
logs
Expand Down
14 changes: 7 additions & 7 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
tasks:
- init: yarn install
command: yarn start
- init: yarn install
command: yarn start

# list the ports to be exposed
ports:
- port: 3000
onOpen: open-preview
- port: 3001
onOpen: ignore
- port: 3000
onOpen: open-preview
- port: 3001
onOpen: ignore

vscode:
extensions:
- syler.sass-indented@1.6.7:gAbIL/5IWvH0xYAbwe0Vag==
- syler.sass-indented@1.6.7:gAbIL/5IWvH0xYAbwe0Vag==
6 changes: 4 additions & 2 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@
.eslintrc
.github
.gitignore
.gitpod.yml
.npmignore
.nyc_output
.prettierignore
.sasslintrc
.travis.yml
backstop.conf.js
backstop.config.js
bower.json
changelog.md
composer.json
package.js
package.json
src
test
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
dist
.nyc_output
11 changes: 7 additions & 4 deletions .sasslintrc
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
#########################
## Sass Lint File
## SASS Lint File
## See rules https://github.com/sasstools/sass-lint/tree/master/docs/rules
#########################

# Linter Options
options:
# Don't merge default rules
merge-default-rules: false

# File Options
files:
include: 'src/**/*.s+(a|c)ss'
ignore:
- 'node_modules/**/*.*'
- 'node_modules'

# Rule Configuration
rules:
attribute-quotes:
Expand Down Expand Up @@ -52,9 +55,9 @@ rules:
indentation:
- 2
-
size: 'tab'
size: 2
property-sort-order:
- 1
- 2
-
order: 'alphabetical'
ignore-custom-properties: true
Expand Down
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
language: node_js
node_js:
- 10
- 8
- 12
before_install:
- npm i -g npm@latest
cache:
directories:
- node_modules
before_script:
- npm run lint

0 comments on commit af339b2

Please sign in to comment.