bootstrap-wysihtml5-rails 0.3.1.1 → 0.3.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/Rakefile
CHANGED
|
@@ -7,6 +7,7 @@ task 'update' do
|
|
|
7
7
|
system("git clone git://github.com/jhollingworth/bootstrap-wysihtml5.git")
|
|
8
8
|
system("cp bootstrap-wysihtml5/src/bootstrap-wysihtml5.css vendor/assets/stylesheets/bootstrap-wysihtml5.css")
|
|
9
9
|
system("cp bootstrap-wysihtml5/src/bootstrap-wysihtml5.js vendor/assets/javascripts/bootstrap-wysihtml5.js")
|
|
10
|
+
system("cp bootstrap-wysihtml5/lib/css/wysiwyg-color.css vendor/assets/stylesheets/wysiwyg-color.css")
|
|
10
11
|
system("cp bootstrap-wysihtml5/lib/js/wysihtml5-0.3.0.js vendor/assets/javascripts/wysihtml5.js")
|
|
11
12
|
system("git status")
|
|
12
13
|
end
|
|
@@ -314,16 +314,16 @@
|
|
|
314
314
|
shallowExtend: function (options) {
|
|
315
315
|
var settings = $.extend({}, $.fn.wysihtml5.defaultOptions, options || {});
|
|
316
316
|
var that = this;
|
|
317
|
-
methods.bypassDefaults.apply(that, [settings]);
|
|
317
|
+
return methods.bypassDefaults.apply(that, [settings]);
|
|
318
318
|
},
|
|
319
319
|
deepExtend: function(options) {
|
|
320
320
|
var settings = $.extend(true, {}, $.fn.wysihtml5.defaultOptions, options || {});
|
|
321
321
|
var that = this;
|
|
322
|
-
methods.bypassDefaults.apply(that, [settings]);
|
|
322
|
+
return methods.bypassDefaults.apply(that, [settings]);
|
|
323
323
|
},
|
|
324
324
|
init: function(options) {
|
|
325
325
|
var that = this;
|
|
326
|
-
methods.shallowExtend.apply(that, [options]);
|
|
326
|
+
return methods.shallowExtend.apply(that, [options]);
|
|
327
327
|
}
|
|
328
328
|
};
|
|
329
329
|
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
.wysiwyg-color-black {
|
|
2
|
+
color: black;
|
|
3
|
+
}
|
|
4
|
+
|
|
5
|
+
.wysiwyg-color-silver {
|
|
6
|
+
color: silver;
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
.wysiwyg-color-gray {
|
|
10
|
+
color: gray;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
.wysiwyg-color-white {
|
|
14
|
+
color: white;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
.wysiwyg-color-maroon {
|
|
18
|
+
color: maroon;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
.wysiwyg-color-red {
|
|
22
|
+
color: red;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
.wysiwyg-color-purple {
|
|
26
|
+
color: purple;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
.wysiwyg-color-fuchsia {
|
|
30
|
+
color: fuchsia;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
.wysiwyg-color-green {
|
|
34
|
+
color: green;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
.wysiwyg-color-lime {
|
|
38
|
+
color: lime;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
.wysiwyg-color-olive {
|
|
42
|
+
color: olive;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
.wysiwyg-color-yellow {
|
|
46
|
+
color: yellow;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
.wysiwyg-color-navy {
|
|
50
|
+
color: navy;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
.wysiwyg-color-blue {
|
|
54
|
+
color: blue;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
.wysiwyg-color-teal {
|
|
58
|
+
color: teal;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
.wysiwyg-color-aqua {
|
|
62
|
+
color: aqua;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
.wysiwyg-color-orange {
|
|
66
|
+
color: orange;
|
|
67
|
+
}
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: bootstrap-wysihtml5-rails
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.3.1.
|
|
4
|
+
version: 0.3.1.2
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2012-
|
|
12
|
+
date: 2012-10-08 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: railties
|
|
@@ -80,6 +80,7 @@ files:
|
|
|
80
80
|
- vendor/assets/javascripts/bootstrap-wysihtml5.js
|
|
81
81
|
- vendor/assets/javascripts/wysihtml5.js
|
|
82
82
|
- vendor/assets/stylesheets/bootstrap-wysihtml5.css
|
|
83
|
+
- vendor/assets/stylesheets/wysiwyg-color.css
|
|
83
84
|
homepage: https://github.com/Nerian/bootstrap-wysihtml5-rails
|
|
84
85
|
licenses: []
|
|
85
86
|
post_install_message:
|
|
@@ -94,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
94
95
|
version: '0'
|
|
95
96
|
segments:
|
|
96
97
|
- 0
|
|
97
|
-
hash:
|
|
98
|
+
hash: 174517633425918391
|
|
98
99
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
99
100
|
none: false
|
|
100
101
|
requirements:
|
|
@@ -103,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
103
104
|
version: '0'
|
|
104
105
|
segments:
|
|
105
106
|
- 0
|
|
106
|
-
hash:
|
|
107
|
+
hash: 174517633425918391
|
|
107
108
|
requirements: []
|
|
108
109
|
rubyforge_project:
|
|
109
110
|
rubygems_version: 1.8.24
|