bootstrapped-rails 2.0.7.8 → 2.0.7.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. data/lib/bootstrapped-rails/version.rb +1 -1
  2. data/vendor/assets/javascripts/bootstrapped_subnavigation.js +1 -0
  3. data/vendor/assets/stylesheets/bootstrapped-sass/_badges.scss +30 -41
  4. data/vendor/assets/stylesheets/bootstrapped-sass/_modals.scss +21 -14
  5. data/vendor/assets/stylesheets/bootstrapped-sass/_progress-bars.scss +23 -8
  6. data/vendor/assets/stylesheets/bootstrapped-sass/_wells.scss +10 -3
  7. metadata +7 -7
data/lib/bootstrapped-rails/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bootstrapped
2
2
  module Rails
3
- VERSION = "2.0.7.8"
3
+ VERSION = "2.0.7.9"
4
4
  end
5
5
  end
data/vendor/assets/javascripts/bootstrapped_subnavigation.js CHANGED
@@ -1,6 +1,7 @@
1
1
  //= require_self
2
2
  $(function() {
3
3
  $("body").attr("data-spy", "scroll").attr("data-target", ".subnav").attr('data-offset', "50");
4
+
4
5
  $(document).scroll(function(){
5
6
  // If has not activated (has no attribute "data-top"
6
7
  if (!$('.subnav').attr('data-top')) {
data/vendor/assets/stylesheets/bootstrapped-sass/_badges.scss CHANGED
@@ -1,43 +1,32 @@
1
1
  .badge {
2
- background-color: #999999;
3
- border-radius: 9px 9px 9px 9px;
4
- color: #FFFFFF;
5
- font-size: 12.025px;
6
- font-weight: bold;
7
- padding: 1px 9px 2px;
8
- }
2
+ padding: 1px 9px 2px;
3
+ font-size: $baseFontSize * .925;
4
+ font-weight: bold;
5
+ white-space: nowrap;
6
+ color: $white;
7
+ background-color: $grayLight;
8
+ @include border-radius(9px);
9
+ }
10
+
11
+ // Hover state
9
12
  .badge:hover {
10
- color: #FFFFFF;
11
- cursor: pointer;
12
- text-decoration: none;
13
- }
14
- .badge-error {
15
- background-color: #B94A48;
16
- }
17
- .badge-error:hover {
18
- background-color: #953B39;
19
- }
20
- .badge-warning {
21
- background-color: #F89406;
22
- }
23
- .badge-warning:hover {
24
- background-color: #C67605;
25
- }
26
- .badge-success {
27
- background-color: #468847;
28
- }
29
- .badge-success:hover {
30
- background-color: #356635;
31
- }
32
- .badge-info {
33
- background-color: #3A87AD;
34
- }
35
- .badge-info:hover {
36
- background-color: #2D6987;
37
- }
38
- .badge-inverse {
39
- background-color: #333333;
40
- }
41
- .badge-inverse:hover {
42
- background-color: #1A1A1A;
43
- }
13
+ color: $white;
14
+ text-decoration: none;
15
+ cursor: pointer;
16
+ }
17
+
18
+ // Colors
19
+ .badge-error { background-color: $errorText; }
20
+ .badge-error:hover { background-color: darken($errorText, 10%); }
21
+
22
+ .badge-warning { background-color: $orange; }
23
+ .badge-warning:hover { background-color: darken($orange, 10%); }
24
+
25
+ .badge-success { background-color: $successText; }
26
+ .badge-success:hover { background-color: darken($successText, 10%); }
27
+
28
+ .badge-info { background-color: $infoText; }
29
+ .badge-info:hover { background-color: darken($infoText, 10%); }
30
+
31
+ .badge-inverse { background-color: $grayDark; }
32
+ .badge-inverse:hover { background-color: darken($grayDark, 10%); }
data/vendor/assets/stylesheets/bootstrapped-sass/_modals.scss CHANGED
@@ -3,10 +3,10 @@
3
3
 
4
4
  // Recalculate z-index where appropriate
5
5
  .modal-open {
6
- .dropdown-menu { z-index: $zindexDropdown + $zindexModal; }
6
+ .dropdown-menu { z-index: $zindexDropdown + $zindexModal; }
7
7
  .dropdown.open { *z-index: $zindexDropdown + $zindexModal; }
8
- .popover { z-index: $zindexPopover + $zindexModal; }
9
- .tooltip { z-index: $zindexTooltip + $zindexModal; }
8
+ .popover { z-index: $zindexPopover + $zindexModal; }
9
+ .tooltip { z-index: $zindexTooltip + $zindexModal; }
10
10
  }
11
11
 
12
12
  // Background
@@ -22,8 +22,9 @@
22
22
  &.fade { opacity: 0; }
23
23
  }
24
24
 
25
- .modal-backdrop, .modal-backdrop.fade.in {
26
- @include opacity(0.8);
25
+ .modal-backdrop,
26
+ .modal-backdrop.fade.in {
27
+ @include opacity(80);
27
28
  }
28
29
 
29
30
  // Base modal
@@ -32,7 +33,6 @@
32
33
  top: 50%;
33
34
  left: 50%;
34
35
  z-index: $zindexModal;
35
- max-height: 500px;
36
36
  overflow: auto;
37
37
  width: 560px;
38
38
  margin: -250px 0 0 -280px;
@@ -44,8 +44,7 @@
44
44
  @include box-shadow(0 3px 7px rgba(0,0,0,0.3));
45
45
  @include background-clip(padding-box);
46
46
  &.fade {
47
- $transition: opacity .3s linear, top .3s ease-out;
48
- @include transition($transition);
47
+ @include transition(e('opacity .3s linear, top .3s ease-out'));
49
48
  top: -25%;
50
49
  }
51
50
  &.fade.in { top: 50%; }
@@ -57,12 +56,14 @@
57
56
  .close { margin-top: 2px; }
58
57
  }
59
58
 
60
- // Body (where all modal content resides)
59
+ // Body (where all modal content resises)
61
60
  .modal-body {
61
+ overflow-y: auto;
62
+ max-height: 400px;
62
63
  padding: 15px;
63
64
  }
64
65
  // Remove bottom margin if need be
65
- .modal-body .modal-form {
66
+ .modal-form {
66
67
  margin-bottom: 0;
67
68
  }
68
69
 
@@ -70,14 +71,20 @@
70
71
  .modal-footer {
71
72
  padding: 14px 15px 15px;
72
73
  margin-bottom: 0;
74
+ text-align: right;
73
75
  background-color: #f5f5f5;
74
76
  border-top: 1px solid #ddd;
75
77
  @include border-radius(0 0 6px 6px);
76
78
  @include box-shadow(inset 0 1px 0 $white);
77
- @include clearfix();
78
- .btn {
79
- float: right;
79
+ @include clearfix(); // clear it in case folks use .pull-* classes on buttons
80
+
81
+ // Properly space out buttons
82
+ .btn + .btn {
80
83
  margin-left: 5px;
81
84
  margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs
82
85
  }
83
- }
86
+ // but override tht for button groups
87
+ .btn-group .btn + .btn {
88
+ margin-left: -1px;
89
+ }
90
+ }
data/vendor/assets/stylesheets/bootstrapped-sass/_progress-bars.scss CHANGED
@@ -7,20 +7,26 @@
7
7
 
8
8
  // Webkit
9
9
  @-webkit-keyframes progress-bar-stripes {
10
- from { background-position: 0 0; }
11
- to { background-position: 40px 0; }
10
+ from { background-position: 0 0; }
11
+ to { background-position: 40px 0; }
12
12
  }
13
13
 
14
14
  // Firefox
15
15
  @-moz-keyframes progress-bar-stripes {
16
- from { background-position: 0 0; }
17
- to { background-position: 40px 0; }
16
+ from { background-position: 0 0; }
17
+ to { background-position: 40px 0; }
18
+ }
19
+
20
+ // IE9
21
+ @-ms-keyframes progress-bar-stripes {
22
+ from { background-position: 0 0; }
23
+ to { background-position: 40px 0; }
18
24
  }
19
25
 
20
26
  // Spec
21
27
  @keyframes progress-bar-stripes {
22
- from { background-position: 0 0; }
23
- to { background-position: 40px 0; }
28
+ from { background-position: 0 0; }
29
+ to { background-position: 40px 0; }
24
30
  }
25
31
 
26
32
 
@@ -54,7 +60,7 @@
54
60
 
55
61
  // Striped bars
56
62
  .progress-striped .bar {
57
- @include gradient-striped(#62c462);
63
+ @include gradient-striped(#149bdf);
58
64
  @include background-size(40px 40px);
59
65
  }
60
66
 
@@ -92,4 +98,13 @@
92
98
  }
93
99
  .progress-info.progress-striped .bar {
94
100
  @include gradient-striped(#5bc0de);
95
- }
101
+ }
102
+
103
+ // Warning (orange)
104
+ .progress-warning .bar {
105
+ @include gradient-vertical(lighten($orange, 15%), $orange);
106
+ }
107
+ .progress-warning.progress-striped .bar {
108
+ @include gradient-striped(lighten($orange, 15%));
109
+ }
110
+
data/vendor/assets/stylesheets/bootstrapped-sass/_wells.scss CHANGED
@@ -1,6 +1,3 @@
1
- // WELLS
2
- // -----
3
-
4
1
  .well {
5
2
  min-height: 20px;
6
3
  padding: 19px;
@@ -14,4 +11,14 @@
14
11
  border-color: #ddd;
15
12
  border-color: rgba(0,0,0,.15);
16
13
  }
14
+ }
15
+
16
+ // Sizes
17
+ .well-large {
18
+ padding: 24px;
19
+ @include border-radius(6px);
20
+ }
21
+ .well-small {
22
+ padding: 9px;
23
+ @include border-radius(3px);
17
24
  }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bootstrapped-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.7.8
4
+ version: 2.0.7.9
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-03-15 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sass
16
- requirement: &70194771292220 !ruby/object:Gem::Requirement
16
+ requirement: &70134966649480 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.1.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70194771292220
24
+ version_requirements: *70134966649480
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: bundler
27
- requirement: &70194771291680 !ruby/object:Gem::Requirement
27
+ requirement: &70134966612500 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.0.0
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *70194771291680
35
+ version_requirements: *70134966612500
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rails
38
- requirement: &70194771291200 !ruby/object:Gem::Requirement
38
+ requirement: &70134966592840 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,7 +43,7 @@ dependencies:
43
43
  version: '3.1'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70194771291200
46
+ version_requirements: *70134966592840
47
47
  description: ! ' This is a hacked-together version of the gem ''bootstrap-sass'',
48
48
  with the generators from ''twitter-bootstrap-rails'', has also replaced the Glyphicons
49
49
  icons with [Font Awesome](http://fortawesome.github.com/Font-Awesome/), since svg