twitter-bootstrap-rails 2.1.7 → 2.2.8

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of twitter-bootstrap-rails might be problematic. Click here for more details.

Files changed (117) hide show
  1. data/README.md +428 -21
  2. data/Rakefile +15 -3
  3. data/app/assets/fonts/fontawesome-webfont.eot +0 -0
  4. data/app/assets/fonts/fontawesome-webfont.svg +399 -0
  5. data/app/assets/fonts/fontawesome-webfont.ttf +0 -0
  6. data/app/assets/fonts/fontawesome-webfont.woff +0 -0
  7. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-affix.js +12 -1
  8. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-alert.js +12 -1
  9. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-button.js +12 -1
  10. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-carousel.js +42 -11
  11. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-collapse.js +18 -7
  12. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-dropdown.js +32 -11
  13. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-modal.js +25 -12
  14. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-popover.js +17 -6
  15. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js +13 -2
  16. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-tab.js +12 -1
  17. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-tooltip.js +115 -30
  18. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-transition.js +1 -1
  19. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-typeahead.js +38 -13
  20. data/app/assets/stylesheets/twitter-bootstrap-static/bootstrap.css.erb +890 -0
  21. data/app/assets/stylesheets/twitter-bootstrap-static/fontawesome.css.erb +787 -0
  22. data/{vendor → app}/assets/stylesheets/twitter-bootstrap-static/sprites.css.erb +2 -2
  23. data/app/helpers/badge_label_helper.rb +16 -0
  24. data/app/helpers/bootstrap_flash_helper.rb +22 -16
  25. data/app/helpers/glyph_helper.rb +7 -2
  26. data/app/helpers/modal_helper.rb +29 -16
  27. data/app/helpers/navbar_helper.rb +194 -0
  28. data/app/helpers/twitter_breadcrumbs_helper.rb +7 -2
  29. data/app/views/twitter-bootstrap/_breadcrumbs.html.erb +2 -2
  30. data/lib/generators/bootstrap/install/install_generator.rb +19 -6
  31. data/lib/generators/bootstrap/install/templates/bootstrap.coffee +2 -3
  32. data/lib/generators/bootstrap/install/templates/bootstrap.js +2 -3
  33. data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less +8 -10
  34. data/lib/generators/bootstrap/install/templates/en.bootstrap.yml +18 -0
  35. data/lib/generators/bootstrap/layout/templates/layout.html.erb +10 -12
  36. data/lib/generators/bootstrap/layout/templates/layout.html.haml +8 -11
  37. data/lib/generators/bootstrap/layout/templates/layout.html.slim +10 -11
  38. data/lib/generators/bootstrap/themed/templates/edit.html.erb +1 -2
  39. data/lib/generators/bootstrap/themed/templates/edit.html.haml +1 -1
  40. data/lib/generators/bootstrap/themed/templates/edit.html.slim +1 -1
  41. data/lib/generators/bootstrap/themed/templates/index.html.erb +1 -1
  42. data/lib/generators/bootstrap/themed/templates/index.html.haml +1 -1
  43. data/lib/generators/bootstrap/themed/templates/index.html.slim +1 -1
  44. data/lib/generators/bootstrap/themed/templates/new.html.erb +1 -2
  45. data/lib/generators/bootstrap/themed/templates/new.html.haml +1 -1
  46. data/lib/generators/bootstrap/themed/templates/new.html.slim +1 -1
  47. data/lib/generators/bootstrap/themed/templates/show.html.erb +1 -1
  48. data/lib/generators/bootstrap/themed/templates/show.html.haml +1 -1
  49. data/lib/generators/bootstrap/themed/templates/show.html.slim +1 -1
  50. data/lib/generators/bootstrap/themed/themed_generator.rb +2 -2
  51. data/lib/twitter/bootstrap/rails/engine.rb +3 -0
  52. data/lib/twitter/bootstrap/rails/twitter-bootstrap-breadcrumbs.rb +14 -2
  53. data/lib/twitter/bootstrap/rails/version.rb +2 -2
  54. data/lib/twitter-bootstrap-rails.rb +4 -4
  55. data/spec/lib/twitter_bootstrap_rails/badge_label_helper_spec.rb +22 -0
  56. data/spec/lib/twitter_bootstrap_rails/modal_helper_spec.rb +62 -0
  57. data/spec/lib/twitter_bootstrap_rails/navbar_helper_spec.rb +362 -0
  58. data/spec/lib/twitter_bootstrap_rails/uri_state_spec.rb +47 -0
  59. data/spec/spec_helper.rb +11 -0
  60. data/test/lib/breadcrumbs_test.rb +75 -0
  61. data/test/test_helper.rb +11 -0
  62. data/vendor/assets/stylesheets/twitter-bootstrap-static/bootstrap.css.erb +316 -294
  63. data/vendor/static-source/fontawesome.less +8 -6
  64. data/vendor/static-source/sprites.less +3 -2
  65. data/vendor/toolkit/fontawesome/bootstrap.less +84 -0
  66. data/vendor/toolkit/fontawesome/core.less +129 -0
  67. data/vendor/toolkit/fontawesome/extras.less +93 -0
  68. data/vendor/toolkit/fontawesome/font-awesome-ie7.less +1953 -0
  69. data/vendor/toolkit/fontawesome/font-awesome.less +33 -0
  70. data/vendor/toolkit/fontawesome/icons.less +381 -0
  71. data/vendor/toolkit/fontawesome/mixins.less +48 -0
  72. data/vendor/toolkit/fontawesome/path.less +14 -0
  73. data/vendor/toolkit/fontawesome/variables.less +735 -0
  74. data/vendor/toolkit/twitter/bootstrap/alerts.less +14 -0
  75. data/vendor/toolkit/twitter/bootstrap/bootstrap.less +4 -4
  76. data/vendor/toolkit/twitter/bootstrap/breadcrumbs.less +6 -6
  77. data/vendor/toolkit/twitter/bootstrap/button-groups.less +31 -44
  78. data/vendor/toolkit/twitter/bootstrap/buttons.less +13 -17
  79. data/vendor/toolkit/twitter/bootstrap/carousel.less +48 -21
  80. data/vendor/toolkit/twitter/bootstrap/close.less +2 -1
  81. data/vendor/toolkit/twitter/bootstrap/code.less +3 -0
  82. data/vendor/toolkit/twitter/bootstrap/dropdowns.less +32 -21
  83. data/vendor/toolkit/twitter/bootstrap/forms.less +17 -10
  84. data/vendor/toolkit/twitter/bootstrap/labels-badges.less +12 -2
  85. data/vendor/toolkit/twitter/bootstrap/media.less +2 -2
  86. data/vendor/toolkit/twitter/bootstrap/mixins.less +25 -9
  87. data/vendor/toolkit/twitter/bootstrap/modals.less +4 -3
  88. data/vendor/toolkit/twitter/bootstrap/navbar.less +35 -13
  89. data/vendor/toolkit/twitter/bootstrap/navs.less +45 -21
  90. data/vendor/toolkit/twitter/bootstrap/pager.less +3 -1
  91. data/vendor/toolkit/twitter/bootstrap/pagination.less +3 -1
  92. data/vendor/toolkit/twitter/bootstrap/popovers.less +55 -39
  93. data/vendor/toolkit/twitter/bootstrap/reset.less +82 -4
  94. data/vendor/toolkit/twitter/bootstrap/responsive-767px-max.less +2 -2
  95. data/vendor/toolkit/twitter/bootstrap/responsive-navbar.less +6 -2
  96. data/vendor/toolkit/twitter/bootstrap/responsive-utilities.less +16 -0
  97. data/vendor/toolkit/twitter/bootstrap/responsive.less +1 -1
  98. data/vendor/toolkit/twitter/bootstrap/scaffolding.less +2 -1
  99. data/vendor/toolkit/twitter/bootstrap/sprites.less +9 -5
  100. data/vendor/toolkit/twitter/bootstrap/tables.less +54 -46
  101. data/vendor/toolkit/twitter/bootstrap/thumbnails.less +3 -2
  102. data/vendor/toolkit/twitter/bootstrap/tooltip.less +6 -6
  103. data/vendor/toolkit/twitter/bootstrap/type.less +44 -24
  104. data/vendor/toolkit/twitter/bootstrap/variables.less +3 -3
  105. metadata +130 -44
  106. data/lib/generators/bootstrap/partial/templates/_navbar.html.erb +0 -13
  107. data/vendor/assets/fonts/fontawesome-webfont.eot +0 -0
  108. data/vendor/assets/fonts/fontawesome-webfont.svg +0 -255
  109. data/vendor/assets/fonts/fontawesome-webfont.ttf +0 -0
  110. data/vendor/assets/fonts/fontawesome-webfont.woff +0 -0
  111. data/vendor/assets/stylesheets/twitter-bootstrap-static/fontawesome.css.erb +0 -218
  112. data/vendor/toolkit/font-awesome-ie7.less +0 -245
  113. data/vendor/toolkit/fontawesome.less +0 -327
  114. /data/{vendor → app}/assets/images/twitter/bootstrap/glyphicons-halflings-white.png +0 -0
  115. /data/{vendor → app}/assets/images/twitter/bootstrap/glyphicons-halflings.png +0 -0
  116. /data/{vendor → app}/assets/javascripts/twitter/bootstrap.js +0 -0
  117. /data/{vendor → app}/assets/javascripts/twitter/bootstrap_ujs.js +0 -0
@@ -1,7 +1,9 @@
1
- @fontAwesomeEotPath: "<%= asset_path 'fontawesome-webfont.eot' %>";
2
- @fontAwesomeEotPath_iefix: "<%= asset_path 'fontawesome-webfont.eot#iefix' %>";
3
- @fontAwesomeWoffPath: "<%= asset_path 'fontawesome-webfont.woff' %>";
4
- @fontAwesomeTtfPath: "<%= asset_path 'fontawesome-webfont.ttf' %>";
5
- @fontAwesomeSvgPath: "<%= asset_path 'fontawesome-webfont.svg' %>";
1
+ // The ERB code is not executed upon compilation. It's intended to be executed by the asset pipeline of the consumer app.
2
+ @fontAwesomeEotPath: url("<%= asset_path 'fontawesome-webfont.eot' %>");
3
+ @fontAwesomeEotPath_iefix: url("<%= asset_path 'fontawesome-webfont.eot#iefix' %>");
4
+ @fontAwesomeWoffPath: url("<%= asset_path 'fontawesome-webfont.woff' %>");
5
+ @fontAwesomeTtfPath: url("<%= asset_path 'fontawesome-webfont.ttf' %>");
6
+ @fontAwesomeSvgPath: url("<%= asset_path 'fontawesome-webfont.svg#fontawesomeregular' %>");
6
7
  // Font Awesome
7
- @import "fontawesome";
8
+ @import "fontawesome/font-awesome";
9
+ @import "fontawesome/font-awesome-ie7";
@@ -1,5 +1,6 @@
1
1
  @import "twitter/bootstrap/variables.less";
2
2
  @import "twitter/bootstrap/mixins.less";
3
- @iconSpritePath: "<%= asset_path 'twitter/bootstrap/glyphicons-halflings.png' %>";
4
- @iconWhiteSpritePath: "<%= asset_path 'twitter/bootstrap/glyphicons-halflings-white.png' %>";
3
+ // The ERB code is not executed upon compilation. It's intended to be executed by the asset pipeline of the consumer app.
4
+ @iconSpritePath: url("<%= asset_path 'twitter/bootstrap/glyphicons-halflings.png' %>");
5
+ @iconWhiteSpritePath: url("<%= asset_path 'twitter/bootstrap/glyphicons-halflings-white.png' %>");
5
6
  @import "twitter/bootstrap/sprites.less";
@@ -0,0 +1,84 @@
1
+ /* BOOTSTRAP SPECIFIC CLASSES
2
+ * -------------------------- */
3
+
4
+ /* Bootstrap 2.0 sprites.less reset */
5
+ [class^="icon-"],
6
+ [class*=" icon-"] {
7
+ display: inline;
8
+ width: auto;
9
+ height: auto;
10
+ line-height: normal;
11
+ vertical-align: baseline;
12
+ background-image: none;
13
+ background-position: 0% 0%;
14
+ background-repeat: repeat;
15
+ margin-top: 0;
16
+ }
17
+
18
+ /* more sprites.less reset */
19
+ .icon-white,
20
+ .nav-pills > .active > a > [class^="icon-"],
21
+ .nav-pills > .active > a > [class*=" icon-"],
22
+ .nav-list > .active > a > [class^="icon-"],
23
+ .nav-list > .active > a > [class*=" icon-"],
24
+ .navbar-inverse .nav > .active > a > [class^="icon-"],
25
+ .navbar-inverse .nav > .active > a > [class*=" icon-"],
26
+ .dropdown-menu > li > a:hover > [class^="icon-"],
27
+ .dropdown-menu > li > a:hover > [class*=" icon-"],
28
+ .dropdown-menu > .active > a > [class^="icon-"],
29
+ .dropdown-menu > .active > a > [class*=" icon-"],
30
+ .dropdown-submenu:hover > a > [class^="icon-"],
31
+ .dropdown-submenu:hover > a > [class*=" icon-"] {
32
+ background-image: none;
33
+ }
34
+
35
+
36
+ /* keeps Bootstrap styles with and without icons the same */
37
+ .btn, .nav {
38
+ [class^="icon-"],
39
+ [class*=" icon-"] {
40
+ // display: inline;
41
+ &.icon-large { line-height: .9em; }
42
+ &.icon-spin { display: inline-block; }
43
+ }
44
+ }
45
+ .nav-tabs, .nav-pills {
46
+ [class^="icon-"],
47
+ [class*=" icon-"] {
48
+ &, &.icon-large { line-height: .9em; }
49
+ }
50
+ }
51
+ .btn {
52
+ [class^="icon-"],
53
+ [class*=" icon-"] {
54
+ &.pull-left, &.pull-right {
55
+ &.icon-2x { margin-top: .18em; }
56
+ }
57
+ &.icon-spin.icon-large { line-height: .8em; }
58
+ }
59
+ }
60
+ .btn.btn-small {
61
+ [class^="icon-"],
62
+ [class*=" icon-"] {
63
+ &.pull-left, &.pull-right {
64
+ &.icon-2x { margin-top: .25em; }
65
+ }
66
+ }
67
+ }
68
+ .btn.btn-large {
69
+ [class^="icon-"],
70
+ [class*=" icon-"] {
71
+ margin-top: 0; // overrides bootstrap default
72
+ &.pull-left, &.pull-right {
73
+ &.icon-2x { margin-top: .05em; }
74
+ }
75
+ &.pull-left.icon-2x { margin-right: .2em; }
76
+ &.pull-right.icon-2x { margin-left: .2em; }
77
+ }
78
+ }
79
+
80
+ /* Fixes alignment in nav lists */
81
+ .nav-list [class^="icon-"],
82
+ .nav-list [class*=" icon-"] {
83
+ line-height: inherit;
84
+ }
@@ -0,0 +1,129 @@
1
+ /* FONT AWESOME CORE
2
+ * -------------------------- */
3
+
4
+ [class^="icon-"],
5
+ [class*=" icon-"] {
6
+ .icon-FontAwesome();
7
+ }
8
+
9
+ [class^="icon-"]:before,
10
+ [class*=" icon-"]:before {
11
+ text-decoration: inherit;
12
+ display: inline-block;
13
+ speak: none;
14
+ }
15
+
16
+ /* makes the font 33% larger relative to the icon container */
17
+ .icon-large:before {
18
+ vertical-align: -10%;
19
+ font-size: 4/3em;
20
+ }
21
+
22
+ /* makes sure icons active on rollover in links */
23
+ a {
24
+ [class^="icon-"],
25
+ [class*=" icon-"] {
26
+ display: inline;
27
+ }
28
+ }
29
+
30
+ /* increased font size for icon-large */
31
+ [class^="icon-"],
32
+ [class*=" icon-"] {
33
+ &.icon-fixed-width {
34
+ display: inline-block;
35
+ width: 16/14em;
36
+ text-align: right;
37
+ padding-right: 4/14em;
38
+ &.icon-large {
39
+ width: 20/14em;
40
+ }
41
+ }
42
+ }
43
+
44
+ .icons-ul {
45
+ margin-left: @icons-li-width;
46
+ list-style-type: none;
47
+
48
+ > li { position: relative; }
49
+
50
+ .icon-li {
51
+ position: absolute;
52
+ left: -@icons-li-width;
53
+ width: @icons-li-width;
54
+ text-align: center;
55
+ line-height: inherit;
56
+ }
57
+ }
58
+
59
+ // allows usage of the hide class directly on font awesome icons
60
+ [class^="icon-"],
61
+ [class*=" icon-"] {
62
+ &.hide {
63
+ display: none;
64
+ }
65
+ }
66
+
67
+ .icon-muted { color: @iconMuted; }
68
+ .icon-light { color: @iconLight; }
69
+ .icon-dark { color: @iconDark; }
70
+
71
+ // Icon Borders
72
+ // -------------------------
73
+
74
+ .icon-border {
75
+ border: solid 1px @borderColor;
76
+ padding: .2em .25em .15em;
77
+ .border-radius(3px);
78
+ }
79
+
80
+ // Icon Sizes
81
+ // -------------------------
82
+
83
+ .icon-2x {
84
+ font-size: 2em;
85
+ &.icon-border {
86
+ border-width: 2px;
87
+ .border-radius(4px);
88
+ }
89
+ }
90
+ .icon-3x {
91
+ font-size: 3em;
92
+ &.icon-border {
93
+ border-width: 3px;
94
+ .border-radius(5px);
95
+ }
96
+ }
97
+ .icon-4x {
98
+ font-size: 4em;
99
+ &.icon-border {
100
+ border-width: 4px;
101
+ .border-radius(6px);
102
+ }
103
+ }
104
+
105
+ .icon-5x {
106
+ font-size: 5em;
107
+ &.icon-border {
108
+ border-width: 5px;
109
+ .border-radius(7px);
110
+ }
111
+ }
112
+
113
+
114
+ // Floats & Margins
115
+ // -------------------------
116
+
117
+ // Quick floats
118
+ .pull-right { float: right; }
119
+ .pull-left { float: left; }
120
+
121
+ [class^="icon-"],
122
+ [class*=" icon-"] {
123
+ &.pull-left {
124
+ margin-right: .3em;
125
+ }
126
+ &.pull-right {
127
+ margin-left: .3em;
128
+ }
129
+ }
@@ -0,0 +1,93 @@
1
+ /* EXTRAS
2
+ * -------------------------- */
3
+
4
+ /* Stacked and layered icon */
5
+ .icon-stack();
6
+
7
+ /* Animated rotating icon */
8
+ .icon-spin {
9
+ display: inline-block;
10
+ -moz-animation: spin 2s infinite linear;
11
+ -o-animation: spin 2s infinite linear;
12
+ -webkit-animation: spin 2s infinite linear;
13
+ animation: spin 2s infinite linear;
14
+ }
15
+
16
+ /* Prevent stack and spinners from being taken inline when inside a link */
17
+ a .icon-stack,
18
+ a .icon-spin {
19
+ display: inline-block;
20
+ text-decoration: none;
21
+ }
22
+
23
+ @-moz-keyframes spin {
24
+ 0% { -moz-transform: rotate(0deg); }
25
+ 100% { -moz-transform: rotate(359deg); }
26
+ }
27
+ @-webkit-keyframes spin {
28
+ 0% { -webkit-transform: rotate(0deg); }
29
+ 100% { -webkit-transform: rotate(359deg); }
30
+ }
31
+ @-o-keyframes spin {
32
+ 0% { -o-transform: rotate(0deg); }
33
+ 100% { -o-transform: rotate(359deg); }
34
+ }
35
+ @-ms-keyframes spin {
36
+ 0% { -ms-transform: rotate(0deg); }
37
+ 100% { -ms-transform: rotate(359deg); }
38
+ }
39
+ @keyframes spin {
40
+ 0% { transform: rotate(0deg); }
41
+ 100% { transform: rotate(359deg); }
42
+ }
43
+
44
+ /* Icon rotations and mirroring */
45
+ .icon-rotate-90:before {
46
+ -webkit-transform: rotate(90deg);
47
+ -moz-transform: rotate(90deg);
48
+ -ms-transform: rotate(90deg);
49
+ -o-transform: rotate(90deg);
50
+ transform: rotate(90deg);
51
+ filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
52
+ }
53
+
54
+ .icon-rotate-180:before {
55
+ -webkit-transform: rotate(180deg);
56
+ -moz-transform: rotate(180deg);
57
+ -ms-transform: rotate(180deg);
58
+ -o-transform: rotate(180deg);
59
+ transform: rotate(180deg);
60
+ filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
61
+ }
62
+
63
+ .icon-rotate-270:before {
64
+ -webkit-transform: rotate(270deg);
65
+ -moz-transform: rotate(270deg);
66
+ -ms-transform: rotate(270deg);
67
+ -o-transform: rotate(270deg);
68
+ transform: rotate(270deg);
69
+ filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
70
+ }
71
+
72
+ .icon-flip-horizontal:before {
73
+ -webkit-transform: scale(-1, 1);
74
+ -moz-transform: scale(-1, 1);
75
+ -ms-transform: scale(-1, 1);
76
+ -o-transform: scale(-1, 1);
77
+ transform: scale(-1, 1);
78
+ }
79
+
80
+ .icon-flip-vertical:before {
81
+ -webkit-transform: scale(1, -1);
82
+ -moz-transform: scale(1, -1);
83
+ -ms-transform: scale(1, -1);
84
+ -o-transform: scale(1, -1);
85
+ transform: scale(1, -1);
86
+ }
87
+
88
+ /* ensure rotation occurs inside anchor tags */
89
+ a {
90
+ .icon-rotate-90, .icon-rotate-180, .icon-rotate-270, .icon-flip-horizontal, .icon-flip-vertical {
91
+ &:before { display: inline-block; }
92
+ }
93
+ }