Skip to content

Commit 15f16f7

Browse files
author
Jeff Harrell
committed
2.0.1 fixes to improve namespace
1 parent b4fc93d commit 15f16f7

14 files changed

Lines changed: 64 additions & 68 deletions

File tree

‎Gruntfile.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,10 @@
33

44
module.exports = function (grunt) {
55

6-
7-
// load all grunt tasks matching the `grunt-*` pattern
86
require('load-grunt-config')(grunt, {
97
configPath: require('path').resolve('tasks')
108
});
119

12-
13-
// Aliases for ease of use.
1410
grunt.registerTask('lint', ['jshint', 'eslint']);
1511
grunt.registerTask('coverage', ['mocha_istanbul']);
1612
grunt.registerTask('mocha', ['mocha_istanbul']);
@@ -19,7 +15,6 @@ module.exports = function (grunt) {
1915
grunt.registerTask('develop', ['browserify', 'themify']);
2016
grunt.registerTask('build', ['browserify', 'themify', 'uglify', 'usebanner']);
2117

22-
2318
};
2419

2520

‎dist/all.js‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎dist/button.js‎

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "paypaljsbuttons",
3-
"description": "JavaScript integration for PayPal's payment buttons",
4-
"version": "2.0.0",
3+
"description": "JavaScript integration for PayPal's buttons",
4+
"version": "2.0.1",
55
"author": {
66
"name": "Jeff Harrell",
77
"url": "https://github.com/jeffharrell/"
@@ -21,12 +21,13 @@
2121
"keywords": [
2222
"paypal",
2323
"paypal button",
24+
"button",
2425
"credit card",
2526
"payment",
2627
"payments",
27-
"ecommerce",
28-
"javascriptbuttons",
29-
"jsbuttons"
28+
"buy now",
29+
"subscriptions",
30+
"ecommerce"
3031
],
3132
"homepage": "http://paypal.github.io/JavaScriptButtons",
3233
"issues": "http://github.com/paypal/JavaScriptButtons/issues",

‎src/theme/button.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<button class="paypal-button <%= style %> <%= size %>" type="submit">
1+
<button class="paypal-button paypal-style-<%= style %> paypal-size-<%= size %>" type="submit">
22
<span class="paypal-button-logo">
33
<img src="<%= logo %>" />
44
</span><span class="paypal-button-content"><%- label %></span>

‎src/theme/css/index.css‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
}
2323

2424
.paypal-button-content {
25-
padding: 4px 8px 4px;
26-
border: 1px solid transparent;
25+
padding: 4px 8px 4px;
26+
border: 1px solid transparent;
2727
border-radius: 0 3px 3px 0;
2828
min-width: 57px !important;
2929
}
@@ -62,26 +62,26 @@
6262

6363
/* Medium */
6464

65-
.paypal-button.medium .paypal-button-logo {
65+
.paypal-button.paypal-size-medium .paypal-button-logo {
6666
width: 30px;
6767
height: 30px;
6868
}
6969

70-
.paypal-button.medium .paypal-button-logo img {
70+
.paypal-button.paypal-size-medium .paypal-button-logo img {
7171
width: 22px;
7272
height: 22px;
7373
margin: 4px 0 0 0px;
7474
}
7575

76-
.paypal-button.medium .paypal-button-content {
76+
.paypal-button.paypal-size-medium .paypal-button-content {
7777
height: 19px;
7878
font-size: 10px !important;
7979
line-height: 19px !important;
8080
padding: 5px 8px 6px;
8181
min-width: 71px !important;
8282
}
8383

84-
.paypal-button.medium .paypal-button-content img {
84+
.paypal-button.paypal-size-medium .paypal-button-content img {
8585
width: 71px;
8686
height: 19px;
8787
margin: 2px 0 0 1px;
@@ -90,26 +90,26 @@
9090

9191
/* Large */
9292

93-
.paypal-button.large .paypal-button-logo {
93+
.paypal-button.paypal-size-large .paypal-button-logo {
9494
width: 42px;
9595
height: 42px;
9696
}
9797

98-
.paypal-button.large .paypal-button-logo img {
98+
.paypal-button.paypal-size-large .paypal-button-logo img {
9999
width: 30px;
100100
height: 30px;
101101
margin: 6px 0 0 -1px;
102102
}
103103

104-
.paypal-button.large .paypal-button-content {
104+
.paypal-button.paypal-size-large .paypal-button-content {
105105
height: 25px;
106106
font-size: 13px !important;
107107
line-height: 25px !important;
108108
padding: 8px 13px 9px;
109109
min-width: 109px !important;
110110
}
111111

112-
.paypal-button.large .paypal-button-content img {
112+
.paypal-button.paypal-size-large .paypal-button-content img {
113113
width: 93px;
114114
height: 25px;
115115
margin: 2px 0 0 2px;
@@ -118,7 +118,7 @@
118118

119119
/* Primary */
120120

121-
.paypal-button.primary .paypal-button-content {
121+
.paypal-button.paypal-style-primary .paypal-button-content {
122122
background: #009cde;
123123
border-color: #009cde;
124124
color: #fff;
@@ -127,12 +127,12 @@
127127

128128
/* Secondary */
129129

130-
.paypal-button.secondary .paypal-button-logo {
130+
.paypal-button.paypal-style-secondary .paypal-button-logo {
131131
border: 1px solid #cfcfcf;
132132
border-right: 0;
133133
}
134134

135-
.paypal-button.secondary .paypal-button-content {
135+
.paypal-button.paypal-style-secondary .paypal-button-content {
136136
background: #eee;
137137
border-color: #cfcfcf;
138138
color: #333;

‎tasks/browserify.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = function browserify(grunt) {
66
return {
77
all: {
88
files: {
9-
'dist/all.js': ['src/**/*.js']
9+
'dist/button.js': ['src/**/*.js']
1010
}
1111
}
1212
};

‎tasks/content.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
module.exports = function content(grunt) {
55

6-
var src = 'dist/all.js';
6+
var src = 'dist/button.js';
77

88
function processContent(str) {
99
var bundles = grunt.file.expand('locales/**/*.properties'),

‎tasks/css.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function trim(str) {
88

99
module.exports = function css(grunt) {
1010

11-
var src = 'dist/all.js';
11+
var src = 'dist/button.js';
1212

1313
function processCss(str) {
1414
var styles = trim(grunt.file.read('src/theme/css/index.css'));

‎tasks/images.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function base64(str) {
88

99
module.exports = function images(grunt) {
1010

11-
var src = 'dist/all.js';
11+
var src = 'dist/button.js';
1212

1313
function processImages(str) {
1414
var files = grunt.file.expand('src/theme/images/*.*'),

0 commit comments

Comments
 (0)