Merge branch 'feature/improvements' into develop

This commit is contained in:
CJ Patoilo
2016-07-30 00:31:59 -03:00
16 changed files with 160 additions and 260 deletions
+1 -1
View File
@@ -35,7 +35,7 @@ Try to solve a problem for each pull request, this increases the chances of acce
## Building ## Building
First install [Node.js](https://nodejs.org/en/download/), em seguida [Grunt](http://gruntjs.com/getting-started) e [Sass](http://sass-lang.com/install) for the build process. Now install all the dependencies, run `npm install` from the project directory. Once you have the dependencies installed, run `grunt`. This will run the default grunt task which compiles the Sass files into milligram.css file. 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.
## Style Guide ## Style Guide
+1 -1
View File
@@ -24,7 +24,7 @@ be fixed in the latest versions. -->
**Milligram:** **Milligram:**
**Other (e.g. Normalize.css, Node, Grunt, browser, operating system) (if applicable):** **Other (e.g. Normalize.css, Node.js, npm, bower, browser, operating system) (if applicable):**
### Test case ### Test case
+36 -37
View File
@@ -1,42 +1,41 @@
logs
*.log
npm-debug.log*
pids
*.pid
*.seed
lib-cov
coverage
.grunt
.lock-wscript
build/Release
node_modules
.npm
.node_repl_history
*~
.directory
.Trash-*
.DS_Store
.AppleDouble
.LSOverride
Icon
._*
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
Thumbs.db
ehthumbs.db
Desktop.ini
$RECYCLE.BIN/ $RECYCLE.BIN/
*.cab *.cab
*.lnk
*.log
*.msi *.msi
*.msm *.msm
*.msp *.msp
*.lnk *.pid
*.seed
*~
.AppleDB
.AppleDesktop
.AppleDouble
.DS_Store
.DocumentRevisions-V100
.LSOverride
.Spotlight-V100
.TemporaryItems
.Trash-*
.Trashes
.VolumeIcon.icns
._*
.apdisk
.directory
.fseventsd
.lock-wscript
.node_repl_history
.npm
Desktop.ini
Icon
Network Trash Folder
Temporary Items
Thumbs.db
build/Release
coverage
ehthumbs.db
lib-cov
logs
node_modules
npm-debug.log*
pids
-1
View File
@@ -7,7 +7,6 @@ bower.json
changelog.md changelog.md
component.json component.json
composer.json composer.json
gruntfile.js
package.js package.js
package.json package.json
src src
+3 -4
View File
@@ -1,8 +1,7 @@
sudo: false sudo: false
language: node_js language: node_js
node_js: node_js:
- 0.12 - 6
before_install: before_install:
- gem update --system - node --version
- gem install sass - npm --version
- npm install grunt-cli --global
-1
View File
@@ -37,7 +37,6 @@
"changelog.md", "changelog.md",
"component.json", "component.json",
"composer.json", "composer.json",
"gruntfile.js",
"package.js", "package.js",
"package.json", "package.json",
"src", "src",
-1
View File
@@ -37,7 +37,6 @@
"changelog.md", "changelog.md",
"component.json", "component.json",
"composer.json", "composer.json",
"gruntfile.js",
"package.js", "package.js",
"package.json", "package.json",
"src", "src",
-1
View File
@@ -37,7 +37,6 @@
"component.json", "component.json",
"composer.json", "composer.json",
"contributing.md", "contributing.md",
"gruntfile.js",
"package.js", "package.js",
"package.json", "package.json",
"src", "src",
+97 -43
View File
@@ -6,7 +6,6 @@
* Licensed under the MIT license * Licensed under the MIT license
*/ */
html { html {
box-sizing: border-box; box-sizing: border-box;
font-size: 62.5%; font-size: 62.5%;
@@ -14,10 +13,10 @@ html {
body { body {
color: #606c76; color: #606c76;
font-family: "Roboto", "Helvetica Neue", "Helvetica", "Arial", sans-serif; font-family: 'Roboto', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
font-size: 1.6em; font-size: 1.6em;
font-weight: 300; font-weight: 300;
letter-spacing: 0.01em; letter-spacing: .01em;
line-height: 1.6; line-height: 1.6;
} }
@@ -33,6 +32,7 @@ blockquote {
margin-right: 0; margin-right: 0;
padding: 1rem 1.5rem; padding: 1rem 1.5rem;
} }
blockquote *:last-child { blockquote *:last-child {
margin: 0; margin: 0;
} }
@@ -44,21 +44,22 @@ input[type='reset'],
input[type='submit'] { input[type='submit'] {
background-color: #9b4dca; background-color: #9b4dca;
border: 0.1rem solid #9b4dca; border: 0.1rem solid #9b4dca;
border-radius: 0.4rem; border-radius: .4rem;
color: #fff; color: #fff;
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
font-size: 1.1rem; font-size: 1.1rem;
font-weight: 700; font-weight: 700;
height: 3.8rem; height: 3.8rem;
letter-spacing: 0.1rem; letter-spacing: .1rem;
line-height: 3.8rem; line-height: 3.8rem;
padding: 0 3rem; padding: 0 3.0rem;
text-align: center; text-align: center;
text-decoration: none; text-decoration: none;
text-transform: uppercase; text-transform: uppercase;
white-space: nowrap; white-space: nowrap;
} }
.button:hover, .button:focus, .button:hover, .button:focus,
button:hover, button:hover,
button:focus, button:focus,
@@ -73,6 +74,7 @@ input[type='submit']:focus {
color: #fff; color: #fff;
outline: 0; outline: 0;
} }
.button.button-disabled, .button[disabled], .button.button-disabled, .button[disabled],
button.button-disabled, button.button-disabled,
button[disabled], button[disabled],
@@ -82,9 +84,10 @@ input[type='reset'].button-disabled,
input[type='reset'][disabled], input[type='reset'][disabled],
input[type='submit'].button-disabled, input[type='submit'].button-disabled,
input[type='submit'][disabled] { input[type='submit'][disabled] {
opacity: 0.5; opacity: .5;
cursor: default; cursor: default;
} }
.button.button-disabled:hover, .button.button-disabled:focus, .button[disabled]:hover, .button[disabled]:focus, .button.button-disabled:hover, .button.button-disabled:focus, .button[disabled]:hover, .button[disabled]:focus,
button.button-disabled:hover, button.button-disabled:hover,
button.button-disabled:focus, button.button-disabled:focus,
@@ -105,6 +108,7 @@ input[type='submit'][disabled]:focus {
background-color: #9b4dca; background-color: #9b4dca;
border-color: #9b4dca; border-color: #9b4dca;
} }
.button.button-outline, .button.button-outline,
button.button-outline, button.button-outline,
input[type='button'].button-outline, input[type='button'].button-outline,
@@ -113,6 +117,7 @@ input[type='submit'].button-outline {
color: #9b4dca; color: #9b4dca;
background-color: transparent; background-color: transparent;
} }
.button.button-outline:hover, .button.button-outline:focus, .button.button-outline:hover, .button.button-outline:focus,
button.button-outline:hover, button.button-outline:hover,
button.button-outline:focus, button.button-outline:focus,
@@ -126,6 +131,7 @@ input[type='submit'].button-outline:focus {
background-color: transparent; background-color: transparent;
border-color: #606c76; border-color: #606c76;
} }
.button.button-outline.button-disabled:hover, .button.button-outline.button-disabled:focus, .button.button-outline[disabled]:hover, .button.button-outline[disabled]:focus, .button.button-outline.button-disabled:hover, .button.button-outline.button-disabled:focus, .button.button-outline[disabled]:hover, .button.button-outline[disabled]:focus,
button.button-outline.button-disabled:hover, button.button-outline.button-disabled:hover,
button.button-outline.button-disabled:focus, button.button-outline.button-disabled:focus,
@@ -146,6 +152,7 @@ input[type='submit'].button-outline[disabled]:focus {
color: #9b4dca; color: #9b4dca;
border-color: inherit; border-color: inherit;
} }
.button.button-clear, .button.button-clear,
button.button-clear, button.button-clear,
input[type='button'].button-clear, input[type='button'].button-clear,
@@ -155,6 +162,7 @@ input[type='submit'].button-clear {
background-color: transparent; background-color: transparent;
border-color: transparent; border-color: transparent;
} }
.button.button-clear:hover, .button.button-clear:focus, .button.button-clear:hover, .button.button-clear:focus,
button.button-clear:hover, button.button-clear:hover,
button.button-clear:focus, button.button-clear:focus,
@@ -168,6 +176,7 @@ input[type='submit'].button-clear:focus {
background-color: transparent; background-color: transparent;
border-color: transparent; border-color: transparent;
} }
.button.button-clear.button-disabled:hover, .button.button-clear.button-disabled:focus, .button.button-clear[disabled]:hover, .button.button-clear[disabled]:focus, .button.button-clear.button-disabled:hover, .button.button-clear.button-disabled:focus, .button.button-clear[disabled]:hover, .button.button-clear[disabled]:focus,
button.button-clear.button-disabled:hover, button.button-clear.button-disabled:hover,
button.button-clear.button-disabled:focus, button.button-clear.button-disabled:focus,
@@ -190,18 +199,19 @@ input[type='submit'].button-clear[disabled]:focus {
code { code {
background: #f4f5f6; background: #f4f5f6;
border-radius: 0.4rem; border-radius: .4rem;
font-size: 86%; font-size: 86%;
padding: 0.2rem 0.5rem; padding: .2rem .5rem;
margin: 0 0.2rem; margin: 0 .2rem;
white-space: nowrap; white-space: nowrap;
} }
pre { pre {
background: #f4f5f6; background: #f4f5f6;
border-left: 0.3rem solid #9b4dca; border-left: 0.3rem solid #9b4dca;
font-family: "Menlo", "Consolas", "Bitstream Vera Sans Mono", "DejaVu Sans Mono", "Monaco", monospace; font-family: 'Menlo', 'Consolas', 'Bitstream Vera Sans Mono', 'DejaVu Sans Mono', 'Monaco', monospace;
} }
pre > code { pre > code {
background: transparent; background: transparent;
border-radius: 0; border-radius: 0;
@@ -214,7 +224,7 @@ hr {
border: 0; border: 0;
border-top: 0.1rem solid #f4f5f6; border-top: 0.1rem solid #f4f5f6;
margin-bottom: 3.5rem; margin-bottom: 3.5rem;
margin-top: 3rem; margin-top: 3.0rem;
} }
input[type='email'], input[type='email'],
@@ -231,12 +241,13 @@ select {
appearance: none; appearance: none;
background-color: transparent; background-color: transparent;
border: 0.1rem solid #d1d1d1; border: 0.1rem solid #d1d1d1;
border-radius: 0.4rem; border-radius: .4rem;
box-shadow: none; box-shadow: none;
height: 3.8rem; height: 3.8rem;
padding: 0.6rem 1rem; padding: .6rem 1.0rem;
width: 100%; width: 100%;
} }
input[type='email']:focus, input[type='email']:focus,
input[type='number']:focus, input[type='number']:focus,
input[type='password']:focus, input[type='password']:focus,
@@ -252,15 +263,16 @@ select:focus {
select { select {
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyAgIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIiAgIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIgICB4bWxuczpzdmc9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgICB4bWxuczpzb2RpcG9kaT0iaHR0cDovL3NvZGlwb2RpLnNvdXJjZWZvcmdlLm5ldC9EVEQvc29kaXBvZGktMC5kdGQiICAgeG1sbnM6aW5rc2NhcGU9Imh0dHA6Ly93d3cuaW5rc2NhcGUub3JnL25hbWVzcGFjZXMvaW5rc2NhcGUiICAgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMjkgMTQiICAgaGVpZ2h0PSIxNHB4IiAgIGlkPSJMYXllcl8xIiAgIHZlcnNpb249IjEuMSIgICB2aWV3Qm94PSIwIDAgMjkgMTQiICAgd2lkdGg9IjI5cHgiICAgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIgICBpbmtzY2FwZTp2ZXJzaW9uPSIwLjQ4LjQgcjk5MzkiICAgc29kaXBvZGk6ZG9jbmFtZT0iY2FyZXQtZ3JheS5zdmciPjxtZXRhZGF0YSAgICAgaWQ9Im1ldGFkYXRhMzAzOSI+PHJkZjpSREY+PGNjOldvcmsgICAgICAgICByZGY6YWJvdXQ9IiI+PGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+PGRjOnR5cGUgICAgICAgICAgIHJkZjpyZXNvdXJjZT0iaHR0cDovL3B1cmwub3JnL2RjL2RjbWl0eXBlL1N0aWxsSW1hZ2UiIC8+PC9jYzpXb3JrPjwvcmRmOlJERj48L21ldGFkYXRhPjxkZWZzICAgICBpZD0iZGVmczMwMzciIC8+PHNvZGlwb2RpOm5hbWVkdmlldyAgICAgcGFnZWNvbG9yPSIjZmZmZmZmIiAgICAgYm9yZGVyY29sb3I9IiM2NjY2NjYiICAgICBib3JkZXJvcGFjaXR5PSIxIiAgICAgb2JqZWN0dG9sZXJhbmNlPSIxMCIgICAgIGdyaWR0b2xlcmFuY2U9IjEwIiAgICAgZ3VpZGV0b2xlcmFuY2U9IjEwIiAgICAgaW5rc2NhcGU6cGFnZW9wYWNpdHk9IjAiICAgICBpbmtzY2FwZTpwYWdlc2hhZG93PSIyIiAgICAgaW5rc2NhcGU6d2luZG93LXdpZHRoPSI5MDMiICAgICBpbmtzY2FwZTp3aW5kb3ctaGVpZ2h0PSI1OTQiICAgICBpZD0ibmFtZWR2aWV3MzAzNSIgICAgIHNob3dncmlkPSJ0cnVlIiAgICAgaW5rc2NhcGU6em9vbT0iMTIuMTM3OTMxIiAgICAgaW5rc2NhcGU6Y3g9Ii00LjExOTMxODJlLTA4IiAgICAgaW5rc2NhcGU6Y3k9IjciICAgICBpbmtzY2FwZTp3aW5kb3cteD0iNTAyIiAgICAgaW5rc2NhcGU6d2luZG93LXk9IjMwMiIgICAgIGlua3NjYXBlOndpbmRvdy1tYXhpbWl6ZWQ9IjAiICAgICBpbmtzY2FwZTpjdXJyZW50LWxheWVyPSJMYXllcl8xIj48aW5rc2NhcGU6Z3JpZCAgICAgICB0eXBlPSJ4eWdyaWQiICAgICAgIGlkPSJncmlkMzA0MSIgLz48L3NvZGlwb2RpOm5hbWVkdmlldz48cG9seWdvbiAgICAgcG9pbnRzPSIwLjE1LDAgMTQuNSwxNC4zNSAyOC44NSwwICIgICAgIGlkPSJwb2x5Z29uMzAzMyIgICAgIHRyYW5zZm9ybT0ibWF0cml4KDAuMzU0MTEzODcsMCwwLDAuNDgzMjkxMSw5LjMyNDE1NDUsMy42MjQ5OTkyKSIgICAgIHN0eWxlPSJmaWxsOiNkMWQxZDE7ZmlsbC1vcGFjaXR5OjEiIC8+PC9zdmc+) center right no-repeat; background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyAgIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIiAgIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIgICB4bWxuczpzdmc9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgICB4bWxuczpzb2RpcG9kaT0iaHR0cDovL3NvZGlwb2RpLnNvdXJjZWZvcmdlLm5ldC9EVEQvc29kaXBvZGktMC5kdGQiICAgeG1sbnM6aW5rc2NhcGU9Imh0dHA6Ly93d3cuaW5rc2NhcGUub3JnL25hbWVzcGFjZXMvaW5rc2NhcGUiICAgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMjkgMTQiICAgaGVpZ2h0PSIxNHB4IiAgIGlkPSJMYXllcl8xIiAgIHZlcnNpb249IjEuMSIgICB2aWV3Qm94PSIwIDAgMjkgMTQiICAgd2lkdGg9IjI5cHgiICAgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIgICBpbmtzY2FwZTp2ZXJzaW9uPSIwLjQ4LjQgcjk5MzkiICAgc29kaXBvZGk6ZG9jbmFtZT0iY2FyZXQtZ3JheS5zdmciPjxtZXRhZGF0YSAgICAgaWQ9Im1ldGFkYXRhMzAzOSI+PHJkZjpSREY+PGNjOldvcmsgICAgICAgICByZGY6YWJvdXQ9IiI+PGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+PGRjOnR5cGUgICAgICAgICAgIHJkZjpyZXNvdXJjZT0iaHR0cDovL3B1cmwub3JnL2RjL2RjbWl0eXBlL1N0aWxsSW1hZ2UiIC8+PC9jYzpXb3JrPjwvcmRmOlJERj48L21ldGFkYXRhPjxkZWZzICAgICBpZD0iZGVmczMwMzciIC8+PHNvZGlwb2RpOm5hbWVkdmlldyAgICAgcGFnZWNvbG9yPSIjZmZmZmZmIiAgICAgYm9yZGVyY29sb3I9IiM2NjY2NjYiICAgICBib3JkZXJvcGFjaXR5PSIxIiAgICAgb2JqZWN0dG9sZXJhbmNlPSIxMCIgICAgIGdyaWR0b2xlcmFuY2U9IjEwIiAgICAgZ3VpZGV0b2xlcmFuY2U9IjEwIiAgICAgaW5rc2NhcGU6cGFnZW9wYWNpdHk9IjAiICAgICBpbmtzY2FwZTpwYWdlc2hhZG93PSIyIiAgICAgaW5rc2NhcGU6d2luZG93LXdpZHRoPSI5MDMiICAgICBpbmtzY2FwZTp3aW5kb3ctaGVpZ2h0PSI1OTQiICAgICBpZD0ibmFtZWR2aWV3MzAzNSIgICAgIHNob3dncmlkPSJ0cnVlIiAgICAgaW5rc2NhcGU6em9vbT0iMTIuMTM3OTMxIiAgICAgaW5rc2NhcGU6Y3g9Ii00LjExOTMxODJlLTA4IiAgICAgaW5rc2NhcGU6Y3k9IjciICAgICBpbmtzY2FwZTp3aW5kb3cteD0iNTAyIiAgICAgaW5rc2NhcGU6d2luZG93LXk9IjMwMiIgICAgIGlua3NjYXBlOndpbmRvdy1tYXhpbWl6ZWQ9IjAiICAgICBpbmtzY2FwZTpjdXJyZW50LWxheWVyPSJMYXllcl8xIj48aW5rc2NhcGU6Z3JpZCAgICAgICB0eXBlPSJ4eWdyaWQiICAgICAgIGlkPSJncmlkMzA0MSIgLz48L3NvZGlwb2RpOm5hbWVkdmlldz48cG9seWdvbiAgICAgcG9pbnRzPSIwLjE1LDAgMTQuNSwxNC4zNSAyOC44NSwwICIgICAgIGlkPSJwb2x5Z29uMzAzMyIgICAgIHRyYW5zZm9ybT0ibWF0cml4KDAuMzU0MTEzODcsMCwwLDAuNDgzMjkxMSw5LjMyNDE1NDUsMy42MjQ5OTkyKSIgICAgIHN0eWxlPSJmaWxsOiNkMWQxZDE7ZmlsbC1vcGFjaXR5OjEiIC8+PC9zdmc+) center right no-repeat;
padding-right: 3rem; padding-right: 3.0rem;
} }
select:focus { select:focus {
background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyAgIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIiAgIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIgICB4bWxuczpzdmc9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgICB4bWxuczpzb2RpcG9kaT0iaHR0cDovL3NvZGlwb2RpLnNvdXJjZWZvcmdlLm5ldC9EVEQvc29kaXBvZGktMC5kdGQiICAgeG1sbnM6aW5rc2NhcGU9Imh0dHA6Ly93d3cuaW5rc2NhcGUub3JnL25hbWVzcGFjZXMvaW5rc2NhcGUiICAgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMjkgMTQiICAgaGVpZ2h0PSIxNHB4IiAgIGlkPSJMYXllcl8xIiAgIHZlcnNpb249IjEuMSIgICB2aWV3Qm94PSIwIDAgMjkgMTQiICAgd2lkdGg9IjI5cHgiICAgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIgICBpbmtzY2FwZTp2ZXJzaW9uPSIwLjQ4LjQgcjk5MzkiICAgc29kaXBvZGk6ZG9jbmFtZT0iY2FyZXQuc3ZnIj48bWV0YWRhdGEgICAgIGlkPSJtZXRhZGF0YTMwMzkiPjxyZGY6UkRGPjxjYzpXb3JrICAgICAgICAgcmRmOmFib3V0PSIiPjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0PjxkYzp0eXBlICAgICAgICAgICByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIiAvPjwvY2M6V29yaz48L3JkZjpSREY+PC9tZXRhZGF0YT48ZGVmcyAgICAgaWQ9ImRlZnMzMDM3IiAvPjxzb2RpcG9kaTpuYW1lZHZpZXcgICAgIHBhZ2Vjb2xvcj0iI2ZmZmZmZiIgICAgIGJvcmRlcmNvbG9yPSIjNjY2NjY2IiAgICAgYm9yZGVyb3BhY2l0eT0iMSIgICAgIG9iamVjdHRvbGVyYW5jZT0iMTAiICAgICBncmlkdG9sZXJhbmNlPSIxMCIgICAgIGd1aWRldG9sZXJhbmNlPSIxMCIgICAgIGlua3NjYXBlOnBhZ2VvcGFjaXR5PSIwIiAgICAgaW5rc2NhcGU6cGFnZXNoYWRvdz0iMiIgICAgIGlua3NjYXBlOndpbmRvdy13aWR0aD0iOTAzIiAgICAgaW5rc2NhcGU6d2luZG93LWhlaWdodD0iNTk0IiAgICAgaWQ9Im5hbWVkdmlldzMwMzUiICAgICBzaG93Z3JpZD0idHJ1ZSIgICAgIGlua3NjYXBlOnpvb209IjEyLjEzNzkzMSIgICAgIGlua3NjYXBlOmN4PSItNC4xMTkzMTgyZS0wOCIgICAgIGlua3NjYXBlOmN5PSI3IiAgICAgaW5rc2NhcGU6d2luZG93LXg9IjUwMiIgICAgIGlua3NjYXBlOndpbmRvdy15PSIzMDIiICAgICBpbmtzY2FwZTp3aW5kb3ctbWF4aW1pemVkPSIwIiAgICAgaW5rc2NhcGU6Y3VycmVudC1sYXllcj0iTGF5ZXJfMSI+PGlua3NjYXBlOmdyaWQgICAgICAgdHlwZT0ieHlncmlkIiAgICAgICBpZD0iZ3JpZDMwNDEiIC8+PC9zb2RpcG9kaTpuYW1lZHZpZXc+PHBvbHlnb24gICAgIHBvaW50cz0iMjguODUsMCAwLjE1LDAgMTQuNSwxNC4zNSAiICAgICBpZD0icG9seWdvbjMwMzMiICAgICB0cmFuc2Zvcm09Im1hdHJpeCgwLjM1NDExMzg3LDAsMCwwLjQ4MzI5MTEsOS4zMjQxNTUzLDMuNjI1KSIgICAgIHN0eWxlPSJmaWxsOiM5YjRkY2Y7ZmlsbC1vcGFjaXR5OjEiIC8+PC9zdmc+); background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyAgIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIiAgIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIgICB4bWxuczpzdmc9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgICB4bWxuczpzb2RpcG9kaT0iaHR0cDovL3NvZGlwb2RpLnNvdXJjZWZvcmdlLm5ldC9EVEQvc29kaXBvZGktMC5kdGQiICAgeG1sbnM6aW5rc2NhcGU9Imh0dHA6Ly93d3cuaW5rc2NhcGUub3JnL25hbWVzcGFjZXMvaW5rc2NhcGUiICAgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMjkgMTQiICAgaGVpZ2h0PSIxNHB4IiAgIGlkPSJMYXllcl8xIiAgIHZlcnNpb249IjEuMSIgICB2aWV3Qm94PSIwIDAgMjkgMTQiICAgd2lkdGg9IjI5cHgiICAgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIgICBpbmtzY2FwZTp2ZXJzaW9uPSIwLjQ4LjQgcjk5MzkiICAgc29kaXBvZGk6ZG9jbmFtZT0iY2FyZXQuc3ZnIj48bWV0YWRhdGEgICAgIGlkPSJtZXRhZGF0YTMwMzkiPjxyZGY6UkRGPjxjYzpXb3JrICAgICAgICAgcmRmOmFib3V0PSIiPjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0PjxkYzp0eXBlICAgICAgICAgICByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIiAvPjwvY2M6V29yaz48L3JkZjpSREY+PC9tZXRhZGF0YT48ZGVmcyAgICAgaWQ9ImRlZnMzMDM3IiAvPjxzb2RpcG9kaTpuYW1lZHZpZXcgICAgIHBhZ2Vjb2xvcj0iI2ZmZmZmZiIgICAgIGJvcmRlcmNvbG9yPSIjNjY2NjY2IiAgICAgYm9yZGVyb3BhY2l0eT0iMSIgICAgIG9iamVjdHRvbGVyYW5jZT0iMTAiICAgICBncmlkdG9sZXJhbmNlPSIxMCIgICAgIGd1aWRldG9sZXJhbmNlPSIxMCIgICAgIGlua3NjYXBlOnBhZ2VvcGFjaXR5PSIwIiAgICAgaW5rc2NhcGU6cGFnZXNoYWRvdz0iMiIgICAgIGlua3NjYXBlOndpbmRvdy13aWR0aD0iOTAzIiAgICAgaW5rc2NhcGU6d2luZG93LWhlaWdodD0iNTk0IiAgICAgaWQ9Im5hbWVkdmlldzMwMzUiICAgICBzaG93Z3JpZD0idHJ1ZSIgICAgIGlua3NjYXBlOnpvb209IjEyLjEzNzkzMSIgICAgIGlua3NjYXBlOmN4PSItNC4xMTkzMTgyZS0wOCIgICAgIGlua3NjYXBlOmN5PSI3IiAgICAgaW5rc2NhcGU6d2luZG93LXg9IjUwMiIgICAgIGlua3NjYXBlOndpbmRvdy15PSIzMDIiICAgICBpbmtzY2FwZTp3aW5kb3ctbWF4aW1pemVkPSIwIiAgICAgaW5rc2NhcGU6Y3VycmVudC1sYXllcj0iTGF5ZXJfMSI+PGlua3NjYXBlOmdyaWQgICAgICAgdHlwZT0ieHlncmlkIiAgICAgICBpZD0iZ3JpZDMwNDEiIC8+PC9zb2RpcG9kaTpuYW1lZHZpZXc+PHBvbHlnb24gICAgIHBvaW50cz0iMjguODUsMCAwLjE1LDAgMTQuNSwxNC4zNSAiICAgICBpZD0icG9seWdvbjMwMzMiICAgICB0cmFuc2Zvcm09Im1hdHJpeCgwLjM1NDExMzg3LDAsMCwwLjQ4MzI5MTEsOS4zMjQxNTUzLDMuNjI1KSIgICAgIHN0eWxlPSJmaWxsOiM5YjRkY2Y7ZmlsbC1vcGFjaXR5OjEiIC8+PC9zdmc+);
} }
textarea { textarea {
padding-bottom: 0.6rem; padding-bottom: .6rem;
padding-top: 0.6rem; padding-top: .6rem;
min-height: 6.5rem; min-height: 6.5rem;
} }
@@ -269,7 +281,7 @@ legend {
font-size: 1.6rem; font-size: 1.6rem;
font-weight: 700; font-weight: 700;
display: block; display: block;
margin-bottom: 0.5rem; margin-bottom: .5rem;
} }
fieldset { fieldset {
@@ -285,13 +297,13 @@ input[type='radio'] {
.label-inline { .label-inline {
font-weight: normal; font-weight: normal;
display: inline-block; display: inline-block;
margin-left: 0.5rem; margin-left: .5rem;
} }
.container { .container {
margin: 0 auto; margin: 0 auto;
max-width: 112rem; max-width: 112.0rem;
padding: 0 2rem; padding: 0 2.0rem;
position: relative; position: relative;
width: 100%; width: 100%;
} }
@@ -302,30 +314,44 @@ input[type='radio'] {
padding: 0; padding: 0;
width: 100%; width: 100%;
} }
.row .row-wrap { .row .row-wrap {
flex-wrap: wrap; flex-wrap: wrap;
} }
.row .row-no-padding { .row .row-no-padding {
padding: 0; padding: 0;
} }
.row .row-no-padding > .column { .row .row-no-padding > .column {
padding: 0; padding: 0;
} }
.row .row-top { .row .row-top {
-ms-grid-row-align: flex-start;
align-items: flex-start; align-items: flex-start;
} }
.row .row-bottom { .row .row-bottom {
-ms-grid-row-align: flex-end;
align-items: flex-end; align-items: flex-end;
} }
.row .row-center { .row .row-center {
-ms-grid-row-align: center;
align-items: center; align-items: center;
} }
.row .row-stretch { .row .row-stretch {
-ms-grid-row-align: stretch;
align-items: stretch; align-items: stretch;
} }
.row .row-baseline { .row .row-baseline {
-ms-grid-row-align: baseline;
align-items: baseline; align-items: baseline;
} }
.row .column { .row .column {
display: block; display: block;
flex: 1; flex: 1;
@@ -333,82 +359,105 @@ input[type='radio'] {
max-width: 100%; max-width: 100%;
width: 100%; width: 100%;
} }
.row .column .col-top { .row .column .col-top {
align-self: flex-start; align-self: flex-start;
} }
.row .column .col-bottom { .row .column .col-bottom {
align-self: flex-end; align-self: flex-end;
} }
.row .column .col-center { .row .column .col-center {
align-self: center; align-self: center;
} }
.row .column.column-offset-10 { .row .column.column-offset-10 {
margin-left: 10%; margin-left: 10%;
} }
.row .column.column-offset-20 { .row .column.column-offset-20 {
margin-left: 20%; margin-left: 20%;
} }
.row .column.column-offset-25 { .row .column.column-offset-25 {
margin-left: 25%; margin-left: 25%;
} }
.row .column.column-offset-33, .row .column.column-offset-34 { .row .column.column-offset-33, .row .column.column-offset-34 {
margin-left: 33.3333%; margin-left: 33.3333%;
} }
.row .column.column-offset-50 { .row .column.column-offset-50 {
margin-left: 50%; margin-left: 50%;
} }
.row .column.column-offset-66, .row .column.column-offset-67 { .row .column.column-offset-66, .row .column.column-offset-67 {
margin-left: 66.6666%; margin-left: 66.6666%;
} }
.row .column.column-offset-75 { .row .column.column-offset-75 {
margin-left: 75%; margin-left: 75%;
} }
.row .column.column-offset-80 { .row .column.column-offset-80 {
margin-left: 80%; margin-left: 80%;
} }
.row .column.column-offset-90 { .row .column.column-offset-90 {
margin-left: 90%; margin-left: 90%;
} }
.row .column.column-10 { .row .column.column-10 {
flex: 0 0 10%; flex: 0 0 10%;
max-width: 10%; max-width: 10%;
} }
.row .column.column-20 { .row .column.column-20 {
flex: 0 0 20%; flex: 0 0 20%;
max-width: 20%; max-width: 20%;
} }
.row .column.column-25 { .row .column.column-25 {
flex: 0 0 25%; flex: 0 0 25%;
max-width: 25%; max-width: 25%;
} }
.row .column.column-33, .row .column.column-34 { .row .column.column-33, .row .column.column-34 {
flex: 0 0 33.3333%; flex: 0 0 33.3333%;
max-width: 33.3333%; max-width: 33.3333%;
} }
.row .column.column-40 { .row .column.column-40 {
flex: 0 0 40%; flex: 0 0 40%;
max-width: 40%; max-width: 40%;
} }
.row .column.column-50 { .row .column.column-50 {
flex: 0 0 50%; flex: 0 0 50%;
max-width: 50%; max-width: 50%;
} }
.row .column.column-60 { .row .column.column-60 {
flex: 0 0 60%; flex: 0 0 60%;
max-width: 60%; max-width: 60%;
} }
.row .column.column-66, .row .column.column-67 { .row .column.column-66, .row .column.column-67 {
flex: 0 0 66.6666%; flex: 0 0 66.6666%;
max-width: 66.6666%; max-width: 66.6666%;
} }
.row .column.column-75 { .row .column.column-75 {
flex: 0 0 75%; flex: 0 0 75%;
max-width: 75%; max-width: 75%;
} }
.row .column.column-80 { .row .column.column-80 {
flex: 0 0 80%; flex: 0 0 80%;
max-width: 80%; max-width: 80%;
} }
.row .column.column-90 { .row .column.column-90 {
flex: 0 0 90%; flex: 0 0 90%;
max-width: 90%; max-width: 90%;
@@ -417,18 +466,20 @@ input[type='radio'] {
@media (min-width: 40rem) { @media (min-width: 40rem) {
.row { .row {
flex-direction: row; flex-direction: row;
margin-left: -1rem; margin-left: -1.0rem;
width: calc(100% + 2.0rem); width: calc(100% + 2.0rem);
} }
.row .column { .row .column {
margin-bottom: inherit; margin-bottom: inherit;
padding: 0 1rem; padding: 0 1.0rem;
} }
} }
a { a {
color: #9b4dca; color: #9b4dca;
text-decoration: none; text-decoration: none;
} }
a:hover { a:hover {
color: #606c76; color: #606c76;
} }
@@ -439,6 +490,7 @@ ul {
margin-top: 0; margin-top: 0;
padding-left: 0; padding-left: 0;
} }
dl ul, dl ul,
dl ol, dl ol,
ol ul, ol ul,
@@ -446,7 +498,7 @@ ol ol,
ul ul, ul ul,
ul ol { ul ol {
font-size: 90%; font-size: 90%;
margin: 1.5rem 0 1.5rem 3rem; margin: 1.5rem 0 1.5rem 3.0rem;
} }
dl { dl {
@@ -464,12 +516,12 @@ ol {
dt, dt,
dd, dd,
li { li {
margin-bottom: 1rem; margin-bottom: 1.0rem;
} }
.button, .button,
button { button {
margin-bottom: 1rem; margin-bottom: 1.0rem;
} }
input, input,
@@ -497,14 +549,16 @@ table {
th, th,
td { td {
border-bottom: 0.1rem solid #e1e1e1; border-bottom: .1rem solid #e1e1e1;
padding: 1.2rem 1.5rem; padding: 1.2rem 1.5rem;
text-align: left; text-align: left;
} }
th:first-child, th:first-child,
td:first-child { td:first-child {
padding-left: 0; padding-left: 0;
} }
th:last-child, th:last-child,
td:last-child { td:last-child {
padding-right: 0; padding-right: 0;
@@ -521,37 +575,37 @@ h4,
h5, h5,
h6 { h6 {
font-weight: 300; font-weight: 300;
margin-bottom: 2rem; margin-bottom: 2.0rem;
margin-top: 0; margin-top: 0;
} }
h1 { h1 {
font-size: 4rem; font-size: 4.0rem;
letter-spacing: -0.1rem; letter-spacing: -.1rem;
line-height: 1.2; line-height: 1.2;
} }
h2 { h2 {
font-size: 3.6rem; font-size: 3.6rem;
letter-spacing: -0.1rem; letter-spacing: -.1rem;
line-height: 1.25; line-height: 1.25;
} }
h3 { h3 {
font-size: 3rem; font-size: 3.0rem;
letter-spacing: -0.1rem; letter-spacing: -.1rem;
line-height: 1.3; line-height: 1.3;
} }
h4 { h4 {
font-size: 2.4rem; font-size: 2.4rem;
letter-spacing: -0.08rem; letter-spacing: -.08rem;
line-height: 1.35; line-height: 1.35;
} }
h5 { h5 {
font-size: 1.8rem; font-size: 1.8rem;
letter-spacing: -0.05rem; letter-spacing: -.05rem;
line-height: 1.5; line-height: 1.5;
} }
@@ -563,29 +617,25 @@ h6 {
@media (min-width: 40rem) { @media (min-width: 40rem) {
h1 { h1 {
font-size: 5rem; font-size: 5.0rem;
} }
h2 { h2 {
font-size: 4.2rem; font-size: 4.2rem;
} }
h3 { h3 {
font-size: 3.6rem; font-size: 3.6rem;
} }
h4 { h4 {
font-size: 3rem; font-size: 3.0rem;
} }
h5 { h5 {
font-size: 2.4rem; font-size: 2.4rem;
} }
h6 { h6 {
font-size: 1.5rem; font-size: 1.5rem;
} }
} }
.float-right { .float-right {
float: right; float: right;
} }
@@ -597,10 +647,14 @@ h6 {
.clearfix { .clearfix {
*zoom: 1; *zoom: 1;
} }
.clearfix:after, .clearfix:before { .clearfix:after, .clearfix:before {
content: ""; content: '';
display: table; display: table;
} }
.clearfix:after { .clearfix:after {
clear: both; clear: both;
} }
/*# sourceMappingURL=milligram.css.map */
+1
View File
File diff suppressed because one or more lines are too long
+1 -2
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -7,7 +7,7 @@
<meta name="apple-mobile-web-app-status-bar-style" content="#f4f5f6"> <meta name="apple-mobile-web-app-status-bar-style" content="#f4f5f6">
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="author" content="http://milligram.github.io/"> <meta name="author" content="CJ Patoilo">
<meta name="description" content="Milligram provides a minimal setup of styles for a fast and clean starting point. Specially designed for better performance and higher productivity with fewer properties to reset resulting in cleaner code."> <meta name="description" content="Milligram provides a minimal setup of styles for a fast and clean starting point. Specially designed for better performance and higher productivity with fewer properties to reset resulting in cleaner code.">
<meta property="og:description" content="Milligram provides a minimal setup of styles for a fast and clean starting point. Specially designed for better performance and higher productivity with fewer properties to reset resulting in cleaner code."> <meta property="og:description" content="Milligram provides a minimal setup of styles for a fast and clean starting point. Specially designed for better performance and higher productivity with fewer properties to reset resulting in cleaner code.">
<meta property="og:image" content="http://milligram.github.io/img/thumbnail.jpg"> <meta property="og:image" content="http://milligram.github.io/img/thumbnail.jpg">
-147
View File
@@ -1,147 +0,0 @@
module.exports = function ( grunt ) {
'use strict';
// ================================================================
// CONFIG TASKS
// ================================================================
// Define the configuration
grunt.initConfig({
// Specifics of npm's package.json handling
pkg: grunt.file.readJSON( 'package.json' ),
// Banner
banner:
'/*!\n'+
' * Milligram v<%= pkg.version %>\n'+
' * <%= pkg.homepage %>\n'+
' *\n'+
' * Copyright (c) '+new Date().getFullYear()+' CJ Patoilo\n'+
' * Licensed under the <%= pkg.license %> license\n'+
'*/\n\n',
// DEFAULT TASK
// ================================================================
// Watch files and process the above tasks
watch: {
options: {
livereload: false
},
grunt: {
files: [
'gruntfile.js'
],
options: {
reload: true
}
},
sass: {
files: [
'src/**/*.sass'
],
tasks: [
'sass',
'autoprefixer'
]
}
},
// BUILD TASKS
// ================================================================
// Clear files and folders
clean: {
all: [ 'dist' ]
},
// Compile Sass files to CSS
sass: {
minify: {
options: {
banner: '<%= banner %>',
noCache: true,
sourcemap: 'none',
style: 'compressed'
},
files: {
'dist/milligram.min.css': [ 'src/**/*.sass', '!src/**/_*.sass' ]
}
},
default: {
options: {
banner: '<%= banner %>',
noCache: true,
sourcemap: 'none',
style: 'expanded'
},
files: {
'dist/milligram.css': [ 'src/**/*.sass', '!src/**/_*.sass' ]
}
}
},
// Parse CSS and add vendor-prefixed CSS properties using the Can I Use database.
autoprefixer: {
minify: {
options: {
browsers: [
'last 1 versions'
],
map: {
inline: false
}
},
files: {
'dist/milligram.min.css': 'dist/milligram.min.css'
}
},
default: {
options: {
browsers: [
'last 1 versions'
],
map: false
},
files: {
'dist/milligram.css': 'dist/milligram.css'
}
}
}
});
// ================================================================
// REGISTER TASKS
// ================================================================
// Default task
grunt.registerTask( 'default', [
'build',
'watch'
]);
// Build task
grunt.registerTask( 'build', [
'clean',
'sass',
'autoprefixer'
]);
// ================================================================
// LOAD TASKS
// ================================================================
// Automatically loading Grunt tasks
require( 'load-grunt-tasks' )( grunt );
// Display the elapsed execution time of Grunt tasks
require( 'time-grunt' )( grunt );
};
+13 -14
View File
@@ -37,7 +37,6 @@
"changelog.md", "changelog.md",
"component.json", "component.json",
"composer.json", "composer.json",
"gruntfile.js",
"package.js", "package.js",
"package.json", "package.json",
"src", "src",
@@ -47,22 +46,22 @@
"normalize.css": "latest" "normalize.css": "latest"
}, },
"devDependencies": { "devDependencies": {
"bower": "^1.6.8", "autoprefixer": "^6.3.6",
"grunt": "^0.4.5", "node-sass": "^3.7.0",
"grunt-autoprefixer": "^3.0.3", "npm-run-all": "^2.1.1",
"grunt-contrib-clean": "^0.7.0", "onchange": "^2.4.0",
"grunt-contrib-sass": "^0.8.1", "postcss-cli": "^2.5.2"
"grunt-contrib-watch": "^0.6.1",
"grunt-newer": "^1.1.1",
"grunt-notify": "^0.4.3",
"load-grunt-tasks": "^3.3.0",
"time-grunt": "^1.2.2"
}, },
"engines": { "engines": {
"node": ">=0.12.0" "node": "^6.0.0"
}, },
"scripts": { "scripts": {
"start": "grunt", "banner:expanded": "echo '/*!\n * Milligram v1.1.0\n * http://milligram.github.io\n *\n * Copyright (c) 2016 CJ Patoilo\n * Licensed under the MIT license\n*/\n' | cat - dist/milligram.css > temp && mv temp dist/milligram.css",
"test": "grunt build" "banner:compressed": "echo '/*!\n * Milligram v1.1.0\n * http://milligram.github.io\n *\n * Copyright (c) 2016 CJ Patoilo\n * Licensed under the MIT license\n*/\n' | cat - dist/milligram.min.css > temp && mv temp dist/milligram.min.css",
"sass:expanded": "node-sass --output-style expanded src/milligram.sass dist/milligram.css",
"sass:compressed": "node-sass --output-style compressed src/milligram.sass dist/milligram.min.css",
"autoprefixer": "postcss -u autoprefixer --no-map.inline --autoprefixer.browsers 'last 1 versions' -r dist/*.css",
"watch": "onchange src -- npm run build",
"build": "npm-run-all sass:expanded sass:compressed autoprefixer banner:expanded banner:compressed"
} }
} }
View File