bootswatch_rails 3.1.1.18 → 3.2.0.1

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.
Files changed (21) hide show
  1. checksums.yaml +4 -4
  2. data/generate.sh +12 -11
  3. data/lib/bootswatch_rails/version.rb +1 -1
  4. data/lib/generators/bootswatch_rails/bootsy/bootsy_generator.rb +1 -1
  5. data/vendor/assets/stylesheets/amelia.css +2753 -2362
  6. data/vendor/assets/stylesheets/cerulean.css +2763 -2363
  7. data/vendor/assets/stylesheets/cosmo.css +2745 -2343
  8. data/vendor/assets/stylesheets/custom.css +2768 -2377
  9. data/vendor/assets/stylesheets/cyborg.css +2690 -2299
  10. data/vendor/assets/stylesheets/darkly.css +2698 -2300
  11. data/vendor/assets/stylesheets/flatly.css +2698 -2299
  12. data/vendor/assets/stylesheets/journal.css +2751 -2360
  13. data/vendor/assets/stylesheets/lumen.css +2716 -2316
  14. data/vendor/assets/stylesheets/readable.css +2731 -2333
  15. data/vendor/assets/stylesheets/simplex.css +2763 -2362
  16. data/vendor/assets/stylesheets/slate.css +2717 -2298
  17. data/vendor/assets/stylesheets/spacelab.css +2769 -2361
  18. data/vendor/assets/stylesheets/superhero.css +2691 -2300
  19. data/vendor/assets/stylesheets/united.css +2752 -2361
  20. data/vendor/assets/stylesheets/yeti.css +2704 -2315
  21. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f3a9c23f41bdd82e2508421007ed2ff4c68e56c2
4
- data.tar.gz: 459bb3beb51df32b7bd60ce0a3a722e537f8a25c
3
+ metadata.gz: 93448b3e196612198f23628c02c57e2ec6d4493e
4
+ data.tar.gz: 98ebfb9ecaa08f5319be489650df6ba47b80e0b6
5
5
  SHA512:
6
- metadata.gz: 0ad3cf4e38f92147619b1c669dbed058426268282b07e57a66de3acbdbcb30385496a95510bc4e2e48bffc039d9ad55420bcc99e909979ce39833a7121dc842a
7
- data.tar.gz: f98b4e619d82c612724bd2556154c60e3f944d9f44d8ae0bd33c0ef7ab53902c304a2e1f4b7472c2df7edf6807f21f23e6795e45f171326ddc3034d7a27616e3
6
+ metadata.gz: fb9d2231741e7e42125714b8777dcd7a1c3909e273f8388e4de7a018945d84bd8854b5daef5744aceb201a5ee610bf7cb9d614ce5e95f1da7dc78974b4537425
7
+ data.tar.gz: 4967b2ad8cab2ecd77349a4305ebe69282759016dc6941fb9c71d439c869269d40e5c382d631a7404a12a7f02eafd66b8ddc32ece7774494993b62288b80830f
data/generate.sh CHANGED
@@ -7,10 +7,13 @@
7
7
  ######
8
8
  #################################################################################
9
9
 
10
- git submodule foreach git pull || exit 1
10
+ # Exit on error
11
+ set -e
12
+
13
+ git submodule foreach git pull
11
14
 
12
15
  _assets="vendor/assets"
13
- mkdir -p $_assets/stylesheets $_assets/fonts || exit 1
16
+ mkdir -p $_assets/stylesheets $_assets/fonts
14
17
 
15
18
  _themes_css=""
16
19
  _themes_raw=""
@@ -20,12 +23,12 @@ for _file in $(ls -1 bootswatch/*/bootstrap.css) ; do
20
23
  _src="bootswatch/$_file"
21
24
  _dst="$_assets/stylesheets/$_theme.css"
22
25
  rm -f /tmp/css.tmp
23
- sed -e 's#\.\./fonts/#/assets/#g' $_src >/tmp/css.tmp || exit 1
26
+ sed -e 's#\.\./fonts/#/assets/#g' $_src >/tmp/css.tmp
24
27
  if cmp -s /tmp/css.tmp $_dst ; then
25
28
  rm -f /tmp/css.tmp
26
29
  else
27
30
  echo "copy: $_theme.css"
28
- mv /tmp/css.tmp $_dst || exit 1
31
+ mv /tmp/css.tmp $_dst
29
32
  fi
30
33
  if [ -z "$_themes_css" ] ; then
31
34
  _themes_css="$_theme.css"
@@ -42,26 +45,24 @@ done
42
45
  _engine="lib/bootswatch_rails/engine.rb"
43
46
  if [ -s $_engine ] ; then
44
47
  rm -f /tmp/engine.tmp
45
- sed -e "/assets.precompile/s/=.*/= %w($_themes_css)/" \
46
- $_engine >/tmp/engine.tmp || exit 1
48
+ sed -e "/assets.precompile/s/=.*/= %w($_themes_css)/" $_engine >/tmp/engine.tmp
47
49
  if cmp -s /tmp/engine.tmp $_engine ; then
48
50
  rm -f /tmp/engine.tmp
49
51
  else
50
52
  echo "edit: $_engine"
51
- mv /tmp/engine.tmp $_engine || exit 1
53
+ mv /tmp/engine.tmp $_engine
52
54
  fi
53
55
  fi
54
56
 
55
57
  _version="lib/bootswatch_rails/version.rb"
56
58
  if [ -s $_version ] ; then
57
59
  rm -f /tmp/version.tmp
58
- sed -e "/THEMES/s/=.*/= [$_themes_raw]/" \
59
- $_version >/tmp/version.tmp || exit 1
60
+ sed -e "/THEMES/s/=.*/= [$_themes_raw]/" $_version >/tmp/version.tmp
60
61
  if cmp -s /tmp/version.tmp $_version ; then
61
62
  rm -f /tmp/version.tmp
62
63
  else
63
64
  echo "edit: $_version"
64
- mv /tmp/version.tmp $_version || exit 1
65
+ mv /tmp/version.tmp $_version
65
66
  fi
66
67
  fi
67
68
 
@@ -71,7 +72,7 @@ for _file in bootswatch/fonts/*.* ; do
71
72
  _dst="$_assets/fonts/$_file"
72
73
  if ! cmp -s $_src $_dst ; then
73
74
  echo "copy: $_file"
74
- cp $_src $_dst || exit 1
75
+ cp $_src $_dst
75
76
  fi
76
77
  done
77
78
 
data/lib/bootswatch_rails/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module BootswatchRails
2
- VERSION = "3.1.1.18"
2
+ VERSION = "3.2.0.1"
3
3
  THEMES = [:amelia, :cerulean, :cosmo, :custom, :cyborg, :darkly, :flatly, :journal, :lumen, :readable, :simplex, :slate, :spacelab, :superhero, :united, :yeti]
4
4
  DEFAULT = 1
5
5
  end
data/lib/generators/bootswatch_rails/bootsy/bootsy_generator.rb CHANGED
@@ -36,7 +36,7 @@ module BootswatchRails
36
36
  def add_to_view
37
37
  file = "app/views/#{table_name}/_form.html.erb"
38
38
  columns.each do |column|
39
- gsub_file file, /(input :#{column}) /, "\\1, as: :bootsy, rows: 12 "
39
+ gsub_file file, /(input :#{column}) /, "\\1, as: :bootsy, input_html: { rows: 10 } "
40
40
  end
41
41
  end
42
42