Fix merge conflicts

Author: keenanpayne

.gitignore

@@ -9,3 +9,7 @@ __MACOSX/
 
 # Sass cache
 /.sass-cache
+
+# Log files
+*.log
+*.log.*

README.md

@@ -8,11 +8,13 @@ Concise is a lightweight, front-end framework that provides a number of great fe
 
 It's easy to get started with Concise:
 
-- [Download the latest release](https://github.com/ConciseCSS/concise.css/archive/v3.0.0.zip)
+- [Download the latest release (SASS Included)](https://github.com/ConciseCSS/concise.css/releases/download/v3.1.1/concise-v3.1.1-source.zip)
 - Clone the repo: `git clone https://github.com/ConciseCSS/concise.css.git`
 - Install with [Bower](http://bower.io/): `bower install concise`
 - Install with [NPM](https://www.npmjs.com/): `npm install concise.css`
 
+**Note:** If you just want the CSS files, please refer to the downloads section for each release: [https://github.com/ConciseCSS/concise.css/releases](https://github.com/ConciseCSS/concise.css/releases)
+
 After you download or install the package, [check out our documentation](http://concisecss.com/documentation) to get up and running.
 
 ### Building the project

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "concise",
   "description": "A front-end framework written in SASS that's lightweight, and easy-to-use.",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "ignore": [
     ".gitignore",
     ".editorconfig",

composer.json

@@ -15,7 +15,12 @@
   "authors": [
     {
       "name": "Keenan Payne",
-      "email": "contact@keenanpayne.com"
+      "email": "contact@keenanpayne.com",
+      "homepage": "http://keenanpayne.com"
+    },
+    {
+      "name": "James Kolce",
+      "homepage": "http://jameskolce.com"
     }
   ],
   "support": {

dist/concise.css

@@ -86,6 +86,20 @@ select,
 textarea {
   cursor: initial; }
 
+*[dir="rl;"] {
+  direction: rtl;
+  unicode-bidi: embed; }
+
+bdo[dir="ltr"],
+bdo[dir="rtl"] {
+  unicode-bidi: bidi-override; }
+
+bdo[dir="ltr"] {
+  direction: ltr; }
+
+bdo[dir="rtl"] {
+  direction: rtl; }
+
 hr {
   border: 0;
   border-top: 1px solid #e0e0e0;
@@ -244,7 +258,7 @@ button, input[type="submit"],
   form [row] {
     margin-bottom: 24px; } }
 
-input,
+input:not([type="submit"]),
 select,
 textarea {
   border: 1px solid #e0e0e0;
@@ -254,29 +268,25 @@ textarea {
   padding: 0 .75em;
   transition: 150ms;
   width: 100%; }
-  input:focus,
+  input:not([type="submit"]):focus,
   select:focus,
   textarea:focus {
     border-color: #74cbe8;
     box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(69, 145, 170, 0.5);
     outline: none; }
-  input[disabled],
+  input:not([type="submit"])[disabled],
   select[disabled],
   textarea[disabled] {
     background-color: #f5f5f5;
     cursor: not-allowed; }
 
-input {
+input:not([type="submit"]) {
   line-height: normal;
   min-height: 24px; }
-  input[type="checkbox"]:focus, input[type="radio"]:focus, input[type="range"]:focus, input[type="file"]:focus, input[type="color"]:focus, input[type="submit"]:focus {
+  input:not([type="submit"])[type="checkbox"]:focus, input:not([type="submit"])[type="radio"]:focus, input:not([type="submit"])[type="range"]:focus, input:not([type="submit"])[type="file"]:focus, input:not([type="submit"])[type="color"]:focus, input:not([type="submit"])[type="submit"]:focus {
     border-color: transparent;
     box-shadow: none;
     outline: none; }
-  input[type="submit"] {
-    line-height: normal; }
-    input[type="submit"].button {
-      border-radius: 0; }
 
 label {
   display: block;
@@ -1653,6 +1663,16 @@ ol.dropdown-content {
   .modal-close:hover, .modal-close:focus {
     text-decoration: none; }
 
+.modal:target .modal-close--background {
+  display: block;
+  height: 100%;
+  pointer-events: all;
+  position: absolute;
+  width: 100%; }
+  .modal:target .modal-close--background:hover {
+    border-bottom: none;
+    text-decoration: none; }
+
 @media (min-width: 48em) {
   .modal--small .modal-container {
     width: 360px; } }

dist/concise.min.css

@@ -1,6 +1,6 @@
 {
   "name": "concise.css",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "description": "A lightweight front-end framework that provides functionality without the bloat.",
   "license": "MIT",
   "keywords": [
@@ -21,13 +21,13 @@
     "url": "https://github.com/ConciseCSS/concise.css"
   },
   "engines": {
-    "node": "<=4.2.1"
+    "node": "<=4.2.3"
   },
   "devDependencies": {
-    "autoprefixer": "^6.0.3",
+    "autoprefixer": "^6.1.2",
     "cssmin": "^0.4.3",
-    "node-sass": "^3.3.3",
-    "postcss-cli": "^2.2.0",
+    "node-sass": "^3.4.2",
+    "postcss-cli": "^2.3.2",
     "stylestats": "^6.0.0",
     "watch": "^0.16.0"
   },

package.json

@@ -77,6 +77,19 @@
   &:focus { text-decoration: none; }
 }
 
+.modal:target .modal-close--background {
+  display: block;
+  height: 100%;
+  pointer-events: all;
+  position: absolute;
+  width: 100%;
+
+  &:hover {
+    border-bottom: none;
+    text-decoration: none;
+  }
+}
+
 
 //
 // Modifiers

src/addons/concise-ui/components/_modals.scss

@@ -105,6 +105,19 @@ input,
 select,
 textarea { cursor: initial; }
 
+// RTL and LTR language support
+*[dir="rl;"] {
+  direction: rtl;
+  unicode-bidi: embed;
+}
+
+bdo[dir="ltr"],
+bdo[dir="rtl"] { unicode-bidi: bidi-override; }
+
+bdo[dir="ltr"] { direction: ltr; }
+
+bdo[dir="rtl"] { direction: rtl; }
+
 // Horizontal rule
 hr {
   border: 0;

src/core/layout/_base.scss

@@ -9,7 +9,7 @@ form [row] {
   }
 }
 
-input,
+input:not([type="submit"]),
 select,
 textarea {
   border: 1px solid getColor(base, lines);
@@ -33,7 +33,7 @@ textarea {
   }
 }
 
-input {
+input:not([type="submit"]) {
   line-height: normal;
   min-height: unitSize(3);
 
@@ -50,14 +50,10 @@ input {
       outline: none;
     }
   }
+}
 
-  &[type="submit"] {
-    @extend button;
-
-    line-height: normal;
-
-    &.button { border-radius: 0; }
-  }
+input[type="submit"] {
+  @extend button;
 }
 
 label {