From 750a2ec9fccf888e7f543a0ec9a94a8a0c4bb857 Mon Sep 17 00:00:00 2001 From: Rob Levin Date: Thu, 13 Nov 2014 09:11:04 -0800 Subject: [PATCH] master --- css/buttons.css | 3 ++- css/buttons.min.css | 3 ++- js/buttons.js | 1 + scss/buttons.scss | 6 +++++- showcase/css/buttons.css | 3 ++- showcase/includes/transition-guide.html | 4 ++-- showcase/index.html | 3 +-- showcase/js/buttons.js | 1 + 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/css/buttons.css b/css/buttons.css index 0ac025d..41ca462 100644 --- a/css/buttons.css +++ b/css/buttons.css @@ -6,7 +6,8 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 +* +* http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/css/buttons.min.css b/css/buttons.min.css index 3297568..4e128e0 100644 --- a/css/buttons.min.css +++ b/css/buttons.min.css @@ -7,7 +7,8 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 +* +* http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/js/buttons.js b/js/buttons.js index 5444c4d..1cf2591 100644 --- a/js/buttons.js +++ b/js/buttons.js @@ -5,6 +5,7 @@ * License: Apache License v2.0 */ + // the semi-colon before function invocation is a safety net against concatenated // scripts and/or other plugins which may not be closed properly. ;(function ( $, window, document, undefined ) { diff --git a/scss/buttons.scss b/scss/buttons.scss index 8504f6a..8e0d3ec 100644 --- a/scss/buttons.scss +++ b/scss/buttons.scss @@ -6,7 +6,8 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 +* +* http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -24,6 +25,7 @@ * simply change $ubtn-use-compass to true and uncomment the * @import 'compass' code below to use Compass. */ + $ubtn-use-compass: false; // @import 'compass'; @@ -34,6 +36,7 @@ $ubtn-use-compass: false; * These files include the variables and options * and base css styles that are required to generate buttons. */ + @import 'options'; @import 'mixins'; @import 'base'; @@ -48,6 +51,7 @@ $ubtn-use-compass: false; * are required. Simple remove the uneeded type below and * the button type will be excluded from the final build */ + @import 'types/shapes'; @import 'types/border'; @import 'types/borderless'; diff --git a/showcase/css/buttons.css b/showcase/css/buttons.css index 0ac025d..41ca462 100644 --- a/showcase/css/buttons.css +++ b/showcase/css/buttons.css @@ -6,7 +6,8 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 +* +* http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/showcase/includes/transition-guide.html b/showcase/includes/transition-guide.html index 27296bb..c7699f0 100644 --- a/showcase/includes/transition-guide.html +++ b/showcase/includes/transition-guide.html @@ -8,8 +8,8 @@

Transition Guide 1.0 -> 2.0<
    -
  1. Compass has been replaced with autoprefixer. Compass is not recommended but it is still supported.
    2. +
  2. Compass has been replaced with [autoprefixer](https://github.com/postcss/autoprefixer). Compass is not recommended but it is still supported.
  3. Button colors are now complete independent (ex. button-primary) we no longer have classes like button-flat-primary to achieve this you now simply add button-flat button-primary
  4. Buttons styles are now independent (ex. button-flat, button-3d, etc.). You can apply these styles and they will automatically pick up the color attached to the button (ex. button-primary button-3d)
- + \ No newline at end of file diff --git a/showcase/index.html b/showcase/index.html index 66be5af..ed3d92e 100644 --- a/showcase/index.html +++ b/showcase/index.html @@ -590,12 +590,11 @@

Transition Guide 1.0 -> 2.0<
    -
  1. Compass has been replaced with autoprefixer. Compass is not recommended but it is still supported.
    2. +
  2. Compass has been replaced with [autoprefixer](https://github.com/postcss/autoprefixer). Compass is not recommended but it is still supported.
  3. Button colors are now complete independent (ex. button-primary) we no longer have classes like button-flat-primary to achieve this you now simply add button-flat button-primary
  4. Buttons styles are now independent (ex. button-flat, button-3d, etc.). You can apply these styles and they will automatically pick up the color attached to the button (ex. button-primary button-3d)
-
diff --git a/showcase/js/buttons.js b/showcase/js/buttons.js index 5444c4d..1cf2591 100644 --- a/showcase/js/buttons.js +++ b/showcase/js/buttons.js @@ -5,6 +5,7 @@ * License: Apache License v2.0 */ + // the semi-colon before function invocation is a safety net against concatenated // scripts and/or other plugins which may not be closed properly. ;(function ( $, window, document, undefined ) {