Skip to content

Commit

Permalink
master
Browse files Browse the repository at this point in the history
  • Loading branch information
Rob Levin committed Nov 13, 2014
1 parent 74cccb4 commit 750a2ec
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 8 deletions.
3 changes: 2 additions & 1 deletion css/buttons.css
Original file line number Diff line number Diff line change
Expand Up @@ -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

This comment has been minimized.

Copy link
@EdgarsMojo

EdgarsMojo Jun 9, 2015

Thank you

*
* 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,
Expand Down
3 changes: 2 additions & 1 deletion css/buttons.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions js/buttons.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) {
Expand Down
6 changes: 5 additions & 1 deletion scss/buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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';

Expand All @@ -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';
Expand All @@ -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';
Expand Down
3 changes: 2 additions & 1 deletion showcase/css/buttons.css
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions showcase/includes/transition-guide.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ <h3 class="docs-title"><i class="fa fa-wrench"></i> Transition Guide 1.0 -> 2.0<

<div class="docs-content">
<ol class="docs-list">
<li>Compass has been replaced with <a href="https://github.com/postcss/autoprefixer">autoprefixer</a>. Compass is not recommended but it is still supported.</li>
<li>Compass has been replaced with [autoprefixer](https://github.com/postcss/autoprefixer). Compass is not recommended but it is still supported.</li>
<li>Button colors are now complete independent (ex. button-primary) we no longer have classes like <code>button-flat-primary</code> to achieve this you now simply add <code>button-flat button-primary</code></li>
<li>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)</li>
</ol>
</section>
</section>
3 changes: 1 addition & 2 deletions showcase/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -590,12 +590,11 @@ <h3 class="docs-title"><i class="fa fa-wrench"></i> Transition Guide 1.0 -> 2.0<

<div class="docs-content">
<ol class="docs-list">
<li>Compass has been replaced with <a href="https://github.com/postcss/autoprefixer">autoprefixer</a>. Compass is not recommended but it is still supported.</li>
<li>Compass has been replaced with [autoprefixer](https://github.com/postcss/autoprefixer). Compass is not recommended but it is still supported.</li>
<li>Button colors are now complete independent (ex. button-primary) we no longer have classes like <code>button-flat-primary</code> to achieve this you now simply add <code>button-flat button-primary</code></li>
<li>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)</li>
</ol>
</section>

<!-- FORM BUTTONS -->
<section id="buttons-setup" class="docs background-inverse">
<header>
Expand Down
1 change: 1 addition & 0 deletions showcase/js/buttons.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) {
Expand Down

0 comments on commit 750a2ec

Please sign in to comment.