2.0.3

mblode · Apr 6, 2016 · 1192e1b · 1192e1b
1 parent 21a3fc5
commit 1192e1b
Show file tree

Hide file tree

Showing 12 changed files with 125 additions and 83 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,5 +5,6 @@ _site
 _sass
 public
 _posts
-.sass_cache
-components
+.sass-cache
+components
+build
diff --git a/README.md b/README.md
@@ -37,16 +37,15 @@ if you have cloned the repo or downloaded from .zip, there are a few steps you m
 1. Change directory: `cd marx`.
 2. Install node modules: `npm install`.
 3. Install scss-lint Ruby gem: `gem install scss-lint`.
-4. To run gulp server: `gulp`.
-5. To run build process: `gulp build`.
+4. To run gulp: `gulp`.
 
 ## Running Github Pages
 The gh-pages branch is built using Jekyll and must therefore be install with `gem install jekyll`.
 
 1. Checkout in to gh-pages: `git checkout gh-pages`.
 2. Install marx dependency: `bower install`.
-3. Run jekyll: `jekyll serve`.
-4. Open in browser: `localhost:4000/marx/`.
+3. Run middleman: `middleman serve`.
+4. Open in browser: `localhost:4567`.
 
 ## What's Included
 These are the files that are generated from `bower install marx`

diff --git a/bower.json b/bower.json
@@ -0,0 +1,48 @@
+{
+  "name": "marx",
+  "version": "2.0.3",
+  "homepage": "https://github.com/mblode/marx",
+  "authors": [
+    "mblode <m.blode@gmail.com>"
+  ],
+  "description": "The classless CSS reset (perfect for Communists).",
+  "main": [
+    "css/*.css",
+    "scss/*.scss"
+  ],
+  "keywords": [
+    "marx",
+    "karl",
+    "mblode",
+    "matthew blode",
+    "matt",
+    "blode",
+    "layout",
+    "framework",
+    "css",
+    "sass",
+    "scss",
+    "web",
+    "frontend",
+    "bootstrap",
+    "pure",
+    "markdown",
+    "format",
+    "classless"
+  ],
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests",
+    "gulpfile.js",
+    "_site",
+    "_sass",
+    "_posts",
+    "index.html",
+    "components"
+  ],
+  "dependencies": {}
+}
diff --git a/css/marx.css b/css/marx.css
@@ -234,9 +234,6 @@ textarea {
   color: #ffffff;
   text-shadow: none; }
 
-body {
-  color: rgba(0, 0, 0, 0.87); }
-
 main,
 header,
 footer,
@@ -262,8 +259,6 @@ footer {
   max-width: 100%;
   padding: 16px 0;
   text-align: center; }
-  footer p {
-    margin-bottom: 0; }
 
 hr {
   border-top: 1px solid rgba(0, 0, 0, 0.12);
@@ -287,19 +282,22 @@ img {
     margin-right: 16px; } }
 
 body {
+  color: rgba(0, 0, 0, 0.8);
   font-family: "Helvetica Neue", Helvetica, "Lucida Grande", sans-serif;
   font-size: 16px;
   line-height: 1.4; }
 
 p {
-  margin: 0 0 16px; }
+  margin: 0;
+  margin-bottom: 16px; }
 
 h1,
 h2,
 h3,
 h4,
 h5,
 h6 {
+  color: inherit;
   font-family: inherit;
   line-height: inherit; }
 
@@ -340,18 +338,17 @@ small {
   vertical-align: bottom; }
 
 pre {
-  background: rgba(0, 0, 0, 0.12);
-  color: rgba(0, 0, 0, 0.87);
+  background: #efefef;
+  color: rgba(0, 0, 0, 0.8);
   display: block;
   font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
   font-size: 16px;
   margin: 16px 0;
   padding: 16px;
-  word-break: break-all;
-  word-wrap: break-word; }
+  white-space: pre-wrap; }
 
 code {
-  color: rgba(0, 0, 0, 0.87);
+  color: rgba(0, 0, 0, 0.8);
   font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
   font-size: 16px;
   line-height: inherit;
@@ -423,7 +420,7 @@ select {
   background: #fff;
   border: 1px solid rgba(0, 0, 0, 0.12);
   border-radius: 4px;
-  color: rgba(0, 0, 0, 0.87);
+  color: rgba(0, 0, 0, 0.8);
   display: inline-block;
   padding: 4px;
   vertical-align: middle; }
@@ -530,7 +527,7 @@ fieldset {
 
 legend {
   border-bottom: 1px solid rgba(0, 0, 0, 0.12);
-  color: rgba(0, 0, 0, 0.87);
+  color: rgba(0, 0, 0, 0.8);
   display: block;
   margin-bottom: 8px;
   padding: 8px 0;
@@ -549,10 +546,10 @@ textarea {
 input[type=submit],
 input[type=reset],
 button {
-  background: rgba(0, 0, 0, 0.12);
+  background: #2196f3;
   border: 1px solid rgba(0, 0, 0, 0.12);
   border-radius: 4px;
-  color: inherit;
+  color: #fff;
   cursor: pointer;
   display: inline-block;
   margin: 0;
@@ -569,21 +566,21 @@ button::-moz-focus-inner {
 input[type=submit]:hover,
 input[type=reset]:hover,
 button:hover {
-  background: linear-gradient(rgba(0, 0, 0, 0.12), rgba(0, 0, 0, 0.2));
+  background: #0c7cd5;
   border-color: 1px solid rgba(0, 0, 0, 0.54); }
 
 input[type=submit]:active,
 input[type=reset]:active,
 button:active {
-  background: linear-gradient(rgba(0, 0, 0, 0.12), rgba(0, 0, 0, 0.2));
+  background: #0c7cd5;
   border-color: 1px solid rgba(0, 0, 0, 0.54);
   box-shadow: inset 0 0 4px 0 rgba(0, 0, 0, 0.2);
   outline-offset: -2px; }
 
 input[type=submit]:focus,
 input[type=reset]:focus,
 button:focus {
-  background: linear-gradient(rgba(0, 0, 0, 0.12), rgba(0, 0, 0, 0.2));
+  background: #0c7cd5;
   border-color: 1px solid rgba(0, 0, 0, 0.54);
   box-shadow: inset 0 0 4px 0 rgba(0, 0, 0, 0.2);
   outline: 0; }
@@ -595,13 +592,14 @@ button:disabled {
   cursor: not-allowed; }
 
 table {
-  border: 0;
+  border-top: 1px solid rgba(0, 0, 0, 0.12);
   margin-bottom: 16px; }
 
 caption {
   padding: 8px 0; }
 
 thead th {
+  border: 0;
   border-bottom: 2px solid rgba(0, 0, 0, 0.12);
   text-align: left; }
 
@@ -611,7 +609,7 @@ tr {
 th,
 td {
   border-bottom: 1px solid rgba(0, 0, 0, 0.12);
-  padding: 8px 16px;
+  padding: 16px;
   vertical-align: inherit; }
 
 tfoot tr {

diff --git a/css/marx.min.css b/css/marx.min.css
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "marx-css",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "The classless CSS reset (perfect for Communists).",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

diff --git a/scss/_base.scss b/scss/_base.scss
@@ -1,7 +1,3 @@
-body {
-  color: $light-text;
-}
-
 main,
 header,
 footer,
@@ -22,21 +18,17 @@ main {
 }
 
 footer {
-  border-top: $light-border;
+  border-top: $border;
   clear: both;
   display: inline-block;
   float: left;
   max-width: 100%;
   padding: $md-pad 0;
   text-align: center;
-
-  p {
-    margin-bottom: 0;
-  }
 }
 
 hr {
-  border-top: $light-border;
+  border-top: $border;
   display: block;
   margin-bottom: $md-pad;
   width: 100%;

diff --git a/scss/_buttons.scss b/scss/_buttons.scss
@@ -1,10 +1,10 @@
 input[type=submit],
 input[type=reset],
 button {
-  background: $light-dividers;
-  border: $light-border;
+  background: $primary;
+  border: $border;
   border-radius: $br;
-  color: inherit;
+  color: $white;
   cursor: pointer;
   display: inline-block;
   margin: 0;
@@ -23,31 +23,31 @@ button::-moz-focus-inner {
 input[type=submit]:hover,
 input[type=reset]:hover,
 button:hover {
-  background: linear-gradient($light-dividers, rgba(0, 0, 0, .2));
-  border-color: 1px solid $light-secondary;
+  background: darken($primary, 10);
+  border-color: 1px solid $secondary;
 }
 
 input[type=submit]:active,
 input[type=reset]:active,
 button:active {
-  background: linear-gradient($light-dividers, rgba(0, 0, 0, .2));
-  border-color: 1px solid $light-secondary;
+  background: darken($primary, 10);
+  border-color: 1px solid $secondary;
   box-shadow: inset 0 0 4px 0 rgba(0, 0, 0, .2);
   outline-offset: -2px;
 }
 
 input[type=submit]:focus,
 input[type=reset]:focus,
 button:focus {
-  background: linear-gradient($light-dividers, rgba(0, 0, 0, .2));
-  border-color: 1px solid $light-secondary;
+  background: darken($primary, 10);
+  border-color: 1px solid $secondary;
   box-shadow: inset 0 0 4px 0 rgba(0, 0, 0, .2);
   outline: 0;
 }
 
 input[type=submit]:disabled,
 button:disabled {
-  background: $light-dividers;
-  color: $light-disabled;
+  background: $dividers;
+  color: $disabled;
   cursor: not-allowed;
 }