Merge pull request #121 from aldryn/develop

Release 3.4.1

.editorconfig

@@ -9,6 +9,9 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+max_line_length = 80
+
+[*.{html,js}]
 max_line_length = 120
 
 [*.yml]

.jshintrc

@@ -1,5 +1,6 @@
 {
     "browser": true,
+    "devel": true,
     "esnext": true,
     "expr": true,
     "bitwise": true,
@@ -16,5 +17,6 @@
     "quotmark": "single",
     "strict": true,
     "unused": true,
-    "trailing": true
+    "trailing": true,
+    "undef": true
 }

.travis.yml

@@ -1,7 +1,15 @@
 language: node_js
 
 node_js:
-  - "0.10"
+  - 0.10
+
+sudo: false
+
+env:
+  global:
+    - secure: ghtK6PdDy13ruL+HGT4doVcUkl8pyzukY1gkHbkIAL8BrOc0eQdGBnAxKpPGZJv/8upWyul69DgXKg26cbS633Gfp0NjM/YPUh6wEgTg46Zjirw1ejX7xmqsQUGukZXOXNsll7/Syql+KEn8ao+JOAh+gjkFfNY2mxD6Oxs56Sc=
+    - secure: LJw6Cd29/2EdavwQyALzgteQM5+tasvJu0FpS9HJnJPw77HAEl+u8HhRzV2V+/4n2ZMOG9lvDjS1ON+crAolXvo8FO607QNxKFfaMRU2ESynr7+A+itLD/4x3ljPXh72Mypw4Sh0geeVYyZ613jfjzXwKK6lazE/ZhzfcyD4hYk=
+    - secure: Nwqm4GQfjZ52MvcQZ/mP068RapB6Jg3sMVmitqsYwUmZsC9xDdmjkJlv3ViWmtZYcvYvQKT7+/iZ4+NjVvYcw7n2OY2vs9F/Vf+XuXuiQEQ9Ouy5im8vWM+1xxzfzPe0tVIWDIApx2j94G+CnKMebwCUeaPeRS1H8BXClPMVkeo=
 
 before_install:
   - gem install scss-lint
@@ -16,9 +24,3 @@ after_script:
 
 script:
   - gulp tests
-
-env:
-  global:
-    - secure: ghtK6PdDy13ruL+HGT4doVcUkl8pyzukY1gkHbkIAL8BrOc0eQdGBnAxKpPGZJv/8upWyul69DgXKg26cbS633Gfp0NjM/YPUh6wEgTg46Zjirw1ejX7xmqsQUGukZXOXNsll7/Syql+KEn8ao+JOAh+gjkFfNY2mxD6Oxs56Sc=
-    - secure: LJw6Cd29/2EdavwQyALzgteQM5+tasvJu0FpS9HJnJPw77HAEl+u8HhRzV2V+/4n2ZMOG9lvDjS1ON+crAolXvo8FO607QNxKFfaMRU2ESynr7+A+itLD/4x3ljPXh72Mypw4Sh0geeVYyZ613jfjzXwKK6lazE/ZhzfcyD4hYk=
-    - secure: Nwqm4GQfjZ52MvcQZ/mP068RapB6Jg3sMVmitqsYwUmZsC9xDdmjkJlv3ViWmtZYcvYvQKT7+/iZ4+NjVvYcw7n2OY2vs9F/Vf+XuXuiQEQ9Ouy5im8vWM+1xxzfzPe0tVIWDIApx2j94G+CnKMebwCUeaPeRS1H8BXClPMVkeo=

CHANGELOG.rst

@@ -3,6 +3,15 @@ Aldryn Boilerplate Bootstrap 3
 ##############################
 
 
+3.4.1
+=====
+- added ``button-variant-outline``mixin
+- added ``.spacer-sm`` an ``spacer-md``
+- changed line length rule for JS & HTML
+- changed ``.jshintrc`` settings slightly
+- improved ``.travis.yml`` structure
+
+
 3.4.0
 =====
 - major update to testing infrastructure

boilerplate.json

@@ -1,7 +1,7 @@
 {
     "identifier": "bootstrap3",
     "package-name": "aldryn-bootstrap3-boilerplate",
-    "version": "3.4.0",
+    "version": "3.4.1",
     "templates": [
         ["fullwidth.html", "full width"],
         ["sidebar_left.html", "sidebar left"],

docs/contribution/index.rst

@@ -60,6 +60,8 @@ Before starting to work on issues or features, please mind the branching model:
 Everything that is merged to *develop* will be released within the next proper release (1.x.x). Major releases (x.x.x)
 will have their own branches but are always merged agains *develop*.
 
+A pull request needs the consent of two developers familiar with this repository to be merged.
+
 
 ********
 Releases

package.json

@@ -3,7 +3,7 @@
     "private": true,
     "devDependencies": {
         "browser-sync": "2.7.12",
-        "browserslist-saucelabs": "0.1.2",
+        "browserslist-saucelabs": "^0.1.4",
         "gulp": "3.9.0",
         "gulp-cached": "1.1.0",
         "gulp-imagemin": "2.3.0",

private/sass/layout/_buttons.scss

@@ -13,58 +13,23 @@
 .btn-outline {
     border: 1px solid transparent;
     background: transparent;
+
     &.btn-default {
-        @include button-variant($btn-default-color, transparent, $btn-default-border);
-        &:hover,
-        &:active,
-        &:focus {
-            color: #fff;
-            background-color: $btn-default-border;
-        }
+        @include button-variant-outline($btn-default-color, $btn-default-border);
     }
     &.btn-primary {
-        @include button-variant($btn-primary-bg, transparent, $btn-primary-border);
-        &:hover,
-        &:active,
-        &:focus {
-            color: #fff;
-            background-color: $btn-primary-border;
-        }
+        @include button-variant-outline($btn-primary-bg, $btn-primary-border);
     }
     &.btn-success {
-        @include button-variant($btn-success-bg, transparent, $btn-success-border);
-        &:hover,
-        &:active,
-        &:focus {
-            color: #fff;
-            background-color: $btn-success-border;
-        }
+        @include button-variant-outline($btn-success-bg, $btn-success-border);
     }
     &.btn-info {
-        @include button-variant($btn-info-bg, transparent, $btn-info-border);
-        &:hover,
-        &:active,
-        &:focus {
-            color: #fff;
-            background-color: $btn-info-border;
-        }
+        @include button-variant-outline($btn-info-bg, $btn-info-border);
     }
     &.btn-warning {
-        @include button-variant($btn-warning-bg, transparent, $btn-warning-border);
-        &:hover,
-        &:active,
-        &:focus {
-            color: #fff;
-            background-color: $btn-warning-border;
-        }
+        @include button-variant-outline($btn-warning-bg, $btn-warning-border);
     }
     &.btn-danger {
-        @include button-variant($btn-danger-bg, transparent, $btn-danger-border);
-        &:hover,
-        &:active,
-        &:focus {
-            color: #fff;
-            background-color: $btn-danger-border;
-        }
+        @include button-variant-outline($btn-danger-bg, $btn-danger-border);
     }
 }

private/sass/mixins/_other.scss

@@ -17,3 +17,16 @@
     overflow: hidden;
     text-align: left;
 }
+
+// outline button mixin which extends bootstrap button-variant
+@mixin button-variant-outline($color, $border, $color-hover: #fff) {
+    @include button-variant($color, transparent, $border);
+    &:hover,
+    &:active,
+    &.active,
+    &:focus,
+    .open > &.dropdown-toggle {
+        color: $color-hover;
+        background-color: $border;
+    }
+}

private/sass/sites/_custom.scss

@@ -14,6 +14,13 @@
     margin-top: $line-height-computed / 2;
     margin-bottom: $line-height-computed / 2;
 }
+.spacer-sm {
+    margin-top: $line-height-computed / 1.5;
+    margin-bottom: $line-height-computed / 1.5;
+}
+.spacer-md {
+    @extend .spacer;
+}
 .spacer-lg {
     margin-top: $line-height-computed * 2;
     margin-bottom: $line-height-computed * 2;
@@ -23,6 +30,8 @@
 }
 .spacer:after,
 .spacer-xs:after,
+.spacer-sm:after,
+.spacer-md:after,
 .spacer-lg:after,
 .spacer-zero:after {
     content: "";

static/js/addons/ckeditor.wysiwyg.js

@@ -11,6 +11,7 @@
  *
  * @module CKEDITOR
  */
+/* global CKEDITOR */
 
 CKEDITOR.allElements = ['p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'div'];
 CKEDITOR.stylesSet.add('default', [

templates/404.html

@@ -6,6 +6,8 @@
 {% block title %}{% trans "404 - Page not found" %}{% endblock %}
 
 {% block content %}
-<h1>{% trans "404 - Page not found" %}</h1>
-<p>{% trans "We're sorry, but the requested page could not be found." %}</p>
+    <div class="text-center">
+        <h1>{% trans "404 - Page not found" %}</h1>
+        <p>{% trans "We're sorry, but the requested page could not be found." %}</p>
+    </div>
 {% endblock content %}