bootstrap-sass 2.3.1.3 → 3.0.0.0

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

Potentially problematic release.


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

Files changed (147) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +15 -0
  3. data/.travis.yml +12 -0
  4. data/CHANGELOG.md +104 -0
  5. data/CONTRIBUTING.md +79 -0
  6. data/Gemfile +3 -0
  7. data/README.md +114 -78
  8. data/Rakefile +48 -0
  9. data/bootstrap-sass.gemspec +28 -0
  10. data/lib/bootstrap-sass/engine.rb +4 -2
  11. data/lib/bootstrap-sass/version.rb +4 -0
  12. data/lib/bootstrap-sass.rb +10 -5
  13. data/tasks/converter.rb +829 -0
  14. data/templates/project/_variables.scss.erb +3 -0
  15. data/templates/project/manifest.rb +10 -13
  16. data/templates/project/styles.scss +1 -6
  17. data/test/compass_test.rb +8 -0
  18. data/test/compilation_test.rb +13 -0
  19. data/test/dummy/README.rdoc +3 -0
  20. data/test/dummy/Rakefile +6 -0
  21. data/test/dummy/app/assets/images/.keep +0 -0
  22. data/test/dummy/app/assets/javascripts/application.js +2 -0
  23. data/test/dummy/app/assets/stylesheets/application.css.sass +1 -0
  24. data/test/dummy/app/controllers/application_controller.rb +5 -0
  25. data/test/dummy/app/controllers/pages_controller.rb +4 -0
  26. data/test/dummy/app/helpers/application_helper.rb +2 -0
  27. data/test/dummy/app/views/layouts/application.html.erb +14 -0
  28. data/test/dummy/app/views/pages/root.html.slim +11 -0
  29. data/test/dummy/bin/bundle +3 -0
  30. data/test/dummy/bin/rails +4 -0
  31. data/test/dummy/bin/rake +4 -0
  32. data/test/dummy/config/application.rb +17 -0
  33. data/test/dummy/config/boot.rb +5 -0
  34. data/test/dummy/config/environment.rb +5 -0
  35. data/test/dummy/config/environments/development.rb +26 -0
  36. data/test/dummy/config/environments/production.rb +76 -0
  37. data/test/dummy/config/environments/test.rb +30 -0
  38. data/test/dummy/config/initializers/backtrace_silencers.rb +7 -0
  39. data/test/dummy/config/initializers/filter_parameter_logging.rb +4 -0
  40. data/test/dummy/config/initializers/inflections.rb +16 -0
  41. data/test/dummy/config/initializers/mime_types.rb +5 -0
  42. data/test/dummy/config/initializers/secret_token.rb +18 -0
  43. data/test/dummy/config/initializers/session_store.rb +3 -0
  44. data/test/dummy/config/initializers/wrap_parameters.rb +14 -0
  45. data/test/dummy/config/locales/en.yml +3 -0
  46. data/test/dummy/config/locales/es.yml +3 -0
  47. data/test/dummy/config/routes.rb +3 -0
  48. data/test/dummy/config.ru +4 -0
  49. data/test/dummy/db/test.sqlite3 +0 -0
  50. data/test/dummy/lib/assets/.keep +0 -0
  51. data/test/dummy/log/.keep +0 -0
  52. data/test/dummy/log/development.log +0 -0
  53. data/test/dummy/public/404.html +58 -0
  54. data/test/dummy/public/422.html +58 -0
  55. data/test/dummy/public/500.html +57 -0
  56. data/test/dummy/public/favicon.ico +0 -0
  57. data/test/gemfiles/sass_3_2.gemfile +5 -0
  58. data/test/gemfiles/sass_head.gemfile +6 -0
  59. data/test/pages_test.rb +14 -0
  60. data/test/support/integration_test.rb +29 -0
  61. data/test/test_helper.rb +32 -0
  62. data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.eot +0 -0
  63. data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.svg +228 -0
  64. data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf +0 -0
  65. data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.woff +0 -0
  66. data/vendor/assets/javascripts/bootstrap/affix.js +126 -0
  67. data/vendor/assets/javascripts/bootstrap/alert.js +98 -0
  68. data/vendor/assets/javascripts/bootstrap/button.js +109 -0
  69. data/vendor/assets/javascripts/bootstrap/carousel.js +217 -0
  70. data/vendor/assets/javascripts/bootstrap/collapse.js +179 -0
  71. data/vendor/assets/javascripts/bootstrap/dropdown.js +154 -0
  72. data/vendor/assets/javascripts/bootstrap/modal.js +246 -0
  73. data/vendor/assets/javascripts/bootstrap/popover.js +117 -0
  74. data/vendor/assets/javascripts/bootstrap/scrollspy.js +158 -0
  75. data/vendor/assets/javascripts/bootstrap/tab.js +135 -0
  76. data/vendor/assets/javascripts/bootstrap/tooltip.js +386 -0
  77. data/vendor/assets/javascripts/bootstrap/transition.js +56 -0
  78. data/vendor/assets/javascripts/bootstrap.js +12 -13
  79. data/vendor/assets/stylesheets/bootstrap/_alerts.scss +46 -58
  80. data/vendor/assets/stylesheets/bootstrap/_badges.scss +51 -0
  81. data/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss +8 -9
  82. data/vendor/assets/stylesheets/bootstrap/_button-groups.scss +173 -154
  83. data/vendor/assets/stylesheets/bootstrap/_buttons.scss +97 -165
  84. data/vendor/assets/stylesheets/bootstrap/_carousel.scss +116 -65
  85. data/vendor/assets/stylesheets/bootstrap/_close.scss +11 -8
  86. data/vendor/assets/stylesheets/bootstrap/_code.scss +16 -21
  87. data/vendor/assets/stylesheets/bootstrap/_component-animations.scss +10 -3
  88. data/vendor/assets/stylesheets/bootstrap/_dropdowns.scss +103 -146
  89. data/vendor/assets/stylesheets/bootstrap/_forms.scss +222 -559
  90. data/vendor/assets/stylesheets/bootstrap/_glyphicons.scss +232 -0
  91. data/vendor/assets/stylesheets/bootstrap/_grid.scss +336 -11
  92. data/vendor/assets/stylesheets/bootstrap/_input-groups.scss +127 -0
  93. data/vendor/assets/stylesheets/bootstrap/_jumbotron.scss +40 -0
  94. data/vendor/assets/stylesheets/bootstrap/_labels.scss +58 -0
  95. data/vendor/assets/stylesheets/bootstrap/_list-group.scss +90 -0
  96. data/vendor/assets/stylesheets/bootstrap/_media.scss +8 -7
  97. data/vendor/assets/stylesheets/bootstrap/_mixins.scss +470 -430
  98. data/vendor/assets/stylesheets/bootstrap/_modals.scss +103 -52
  99. data/vendor/assets/stylesheets/bootstrap/_navbar.scss +511 -383
  100. data/vendor/assets/stylesheets/bootstrap/_navs.scss +169 -349
  101. data/vendor/assets/stylesheets/bootstrap/_normalize.scss +396 -0
  102. data/vendor/assets/stylesheets/bootstrap/_pager.scss +45 -33
  103. data/vendor/assets/stylesheets/bootstrap/_pagination.scss +65 -105
  104. data/vendor/assets/stylesheets/bootstrap/_panels.scss +148 -0
  105. data/vendor/assets/stylesheets/bootstrap/_popovers.scss +51 -51
  106. data/vendor/assets/stylesheets/bootstrap/_print.scss +100 -0
  107. data/vendor/assets/stylesheets/bootstrap/_progress-bars.scss +28 -55
  108. data/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss +180 -45
  109. data/vendor/assets/stylesheets/bootstrap/_scaffolding.scss +101 -24
  110. data/vendor/assets/stylesheets/bootstrap/_tables.scss +169 -168
  111. data/vendor/assets/stylesheets/bootstrap/_theme.scss +232 -0
  112. data/vendor/assets/stylesheets/bootstrap/_thumbnails.scss +11 -33
  113. data/vendor/assets/stylesheets/bootstrap/_tooltip.scss +45 -20
  114. data/vendor/assets/stylesheets/bootstrap/_type.scss +101 -110
  115. data/vendor/assets/stylesheets/bootstrap/_utilities.scss +19 -22
  116. data/vendor/assets/stylesheets/bootstrap/_variables.scss +498 -179
  117. data/vendor/assets/stylesheets/bootstrap/_wells.scss +7 -7
  118. data/vendor/assets/stylesheets/bootstrap/bootstrap.scss +29 -33
  119. metadata +226 -44
  120. data/templates/project/_variables.scss +0 -301
  121. data/vendor/assets/images/glyphicons-halflings-white.png +0 -0
  122. data/vendor/assets/images/glyphicons-halflings.png +0 -0
  123. data/vendor/assets/javascripts/bootstrap-affix.js +0 -117
  124. data/vendor/assets/javascripts/bootstrap-alert.js +0 -99
  125. data/vendor/assets/javascripts/bootstrap-button.js +0 -105
  126. data/vendor/assets/javascripts/bootstrap-carousel.js +0 -207
  127. data/vendor/assets/javascripts/bootstrap-collapse.js +0 -167
  128. data/vendor/assets/javascripts/bootstrap-dropdown.js +0 -165
  129. data/vendor/assets/javascripts/bootstrap-modal.js +0 -247
  130. data/vendor/assets/javascripts/bootstrap-popover.js +0 -114
  131. data/vendor/assets/javascripts/bootstrap-scrollspy.js +0 -162
  132. data/vendor/assets/javascripts/bootstrap-tab.js +0 -144
  133. data/vendor/assets/javascripts/bootstrap-tooltip.js +0 -361
  134. data/vendor/assets/javascripts/bootstrap-transition.js +0 -60
  135. data/vendor/assets/javascripts/bootstrap-typeahead.js +0 -335
  136. data/vendor/assets/stylesheets/bootstrap/_accordion.scss +0 -34
  137. data/vendor/assets/stylesheets/bootstrap/_hero-unit.scss +0 -25
  138. data/vendor/assets/stylesheets/bootstrap/_labels-badges.scss +0 -83
  139. data/vendor/assets/stylesheets/bootstrap/_layouts.scss +0 -16
  140. data/vendor/assets/stylesheets/bootstrap/_reset.scss +0 -216
  141. data/vendor/assets/stylesheets/bootstrap/_responsive-1200px-min.scss +0 -28
  142. data/vendor/assets/stylesheets/bootstrap/_responsive-767px-max.scss +0 -193
  143. data/vendor/assets/stylesheets/bootstrap/_responsive-768px-979px.scss +0 -19
  144. data/vendor/assets/stylesheets/bootstrap/_responsive-navbar.scss +0 -189
  145. data/vendor/assets/stylesheets/bootstrap/_sprites.scss +0 -197
  146. data/vendor/assets/stylesheets/bootstrap/responsive.scss +0 -48
  147. data/vendor/assets/stylesheets/bootstrap-responsive.scss +0 -1
@@ -0,0 +1,148 @@
1
+ //
2
+ // Panels
3
+ // --------------------------------------------------
4
+
5
+
6
+ // Base class
7
+ .panel {
8
+ margin-bottom: $line-height-computed;
9
+ background-color: $panel-bg;
10
+ border: 1px solid transparent;
11
+ border-radius: $panel-border-radius;
12
+ @include box-shadow(0 1px 1px rgba(0,0,0,.05));
13
+ }
14
+
15
+ // Panel contents
16
+ .panel-body {
17
+ padding: 15px;
18
+ @include clearfix();
19
+ }
20
+
21
+
22
+ // List groups in panels
23
+ //
24
+ // By default, space out list group content from panel headings to account for
25
+ // any kind of custom content between the two.
26
+
27
+ .panel {
28
+ > .list-group {
29
+ margin-bottom: 0;
30
+
31
+ .list-group-item {
32
+ border-width: 1px 0;
33
+
34
+ // Remove border radius for top one
35
+ &:first-child {
36
+ @include border-top-radius(0);
37
+ }
38
+ // But keep it for the last one
39
+ &:last-child {
40
+ border-bottom: 0;
41
+ }
42
+ }
43
+ }
44
+ }
45
+ // Collapse space between when there's no additional content.
46
+ .panel-heading + .list-group {
47
+ .list-group-item:first-child {
48
+ border-top-width: 0;
49
+ }
50
+ }
51
+
52
+
53
+ // Tables in panels
54
+ //
55
+ // Place a non-bordered `.table` within a panel (not within a `.panel-body`) and
56
+ // watch it go full width.
57
+
58
+ .panel {
59
+ > .table {
60
+ margin-bottom: 0;
61
+ }
62
+ > .panel-body + .table {
63
+ border-top: 1px solid $table-border-color;
64
+ }
65
+ }
66
+
67
+
68
+ // Optional heading
69
+ .panel-heading {
70
+ padding: 10px 15px;
71
+ border-bottom: 1px solid transparent;
72
+ @include border-top-radius($panel-border-radius - 1);
73
+ }
74
+
75
+ // Within heading, strip any `h*` tag of it's default margins for spacing.
76
+ .panel-title {
77
+ margin-top: 0;
78
+ margin-bottom: 0;
79
+ font-size: ceil(($font-size-base * 1.125));
80
+ > a {
81
+ color: inherit;
82
+ }
83
+ }
84
+
85
+ // Optional footer (stays gray in every modifier class)
86
+ .panel-footer {
87
+ padding: 10px 15px;
88
+ background-color: $panel-footer-bg;
89
+ border-top: 1px solid $panel-inner-border;
90
+ @include border-bottom-radius($panel-border-radius - 1);
91
+ }
92
+
93
+
94
+ // Collapsable panels (aka, accordion)
95
+ //
96
+ // Wrap a series of panels in `.panel-group` to turn them into an accordion with
97
+ // the help of our collapse JavaScript plugin.
98
+
99
+ .panel-group {
100
+ // Tighten up margin so it's only between panels
101
+ .panel {
102
+ margin-bottom: 0;
103
+ border-radius: $panel-border-radius;
104
+ overflow: hidden; // crop contents when collapsed
105
+ + .panel {
106
+ margin-top: 5px;
107
+ }
108
+ }
109
+
110
+ .panel-heading {
111
+ border-bottom: 0;
112
+ + .panel-collapse .panel-body {
113
+ border-top: 1px solid $panel-inner-border;
114
+ }
115
+ }
116
+ .panel-footer {
117
+ border-top: 0;
118
+ + .panel-collapse .panel-body {
119
+ border-bottom: 1px solid $panel-inner-border;
120
+ }
121
+ }
122
+
123
+ // New subcomponent for wrapping collapsable content for proper animations
124
+ .panel-collapse {
125
+
126
+ }
127
+ }
128
+
129
+
130
+ // Contextual variations
131
+ .panel-default {
132
+ @include panel-variant($panel-default-border, $panel-default-text, $panel-default-heading-bg, $panel-default-border);
133
+ }
134
+ .panel-primary {
135
+ @include panel-variant($panel-primary-border, $panel-primary-text, $panel-primary-heading-bg, $panel-primary-border);
136
+ }
137
+ .panel-success {
138
+ @include panel-variant($panel-success-border, $panel-success-text, $panel-success-heading-bg, $panel-success-border);
139
+ }
140
+ .panel-warning {
141
+ @include panel-variant($panel-warning-border, $panel-warning-text, $panel-warning-heading-bg, $panel-warning-border);
142
+ }
143
+ .panel-danger {
144
+ @include panel-variant($panel-danger-border, $panel-danger-text, $panel-danger-heading-bg, $panel-danger-border);
145
+ }
146
+ .panel-info {
147
+ @include panel-variant($panel-info-border, $panel-info-text, $panel-info-heading-bg, $panel-info-border);
148
+ }
@@ -7,18 +7,16 @@
7
7
  position: absolute;
8
8
  top: 0;
9
9
  left: 0;
10
- z-index: $zindexPopover;
10
+ z-index: $zindex-popover;
11
11
  display: none;
12
- max-width: 276px;
12
+ max-width: $popover-max-width;
13
13
  padding: 1px;
14
14
  text-align: left; // Reset given new insertion method
15
- background-color: $popoverBackground;
16
- -webkit-background-clip: padding-box;
17
- -moz-background-clip: padding;
18
- background-clip: padding-box;
19
- border: 1px solid #ccc;
20
- border: 1px solid rgba(0,0,0,.2);
21
- @include border-radius(6px);
15
+ background-color: $popover-bg;
16
+ background-clip: padding-box;
17
+ border: 1px solid $popover-fallback-border-color;
18
+ border: 1px solid $popover-border-color;
19
+ border-radius: $border-radius-large;
22
20
  @include box-shadow(0 5px 10px rgba(0,0,0,.2));
23
21
 
24
22
  // Overrides for proper insertion
@@ -34,16 +32,12 @@
34
32
  .popover-title {
35
33
  margin: 0; // reset heading margin
36
34
  padding: 8px 14px;
37
- font-size: 14px;
35
+ font-size: $font-size-base;
38
36
  font-weight: normal;
39
37
  line-height: 18px;
40
- background-color: $popoverTitleBackground;
41
- border-bottom: 1px solid darken($popoverTitleBackground, 5%);
42
- @include border-radius(5px 5px 0 0);
43
-
44
- &:empty {
45
- display: none;
46
- }
38
+ background-color: $popover-title-bg;
39
+ border-bottom: 1px solid darken($popover-title-bg, 5%);
40
+ border-radius: 5px 5px 0 0;
47
41
  }
48
42
 
49
43
  .popover-content {
@@ -54,79 +48,85 @@
54
48
  //
55
49
  // .arrow is outer, .arrow:after is inner
56
50
 
57
- .popover .arrow,
58
- .popover .arrow:after {
59
- position: absolute;
60
- display: block;
61
- width: 0;
62
- height: 0;
63
- border-color: transparent;
64
- border-style: solid;
51
+ .popover .arrow {
52
+ &,
53
+ &:after {
54
+ position: absolute;
55
+ display: block;
56
+ width: 0;
57
+ height: 0;
58
+ border-color: transparent;
59
+ border-style: solid;
60
+ }
65
61
  }
66
62
  .popover .arrow {
67
- border-width: $popoverArrowOuterWidth;
63
+ border-width: $popover-arrow-outer-width;
68
64
  }
69
65
  .popover .arrow:after {
70
- border-width: $popoverArrowWidth;
66
+ border-width: $popover-arrow-width;
71
67
  content: "";
72
68
  }
73
69
 
74
70
  .popover {
75
71
  &.top .arrow {
76
72
  left: 50%;
77
- margin-left: -$popoverArrowOuterWidth;
73
+ margin-left: -$popover-arrow-outer-width;
78
74
  border-bottom-width: 0;
79
- border-top-color: #999; // IE8 fallback
80
- border-top-color: $popoverArrowOuterColor;
81
- bottom: -$popoverArrowOuterWidth;
75
+ border-top-color: $popover-arrow-outer-fallback-color; // IE8 fallback
76
+ border-top-color: $popover-arrow-outer-color;
77
+ bottom: -$popover-arrow-outer-width;
82
78
  &:after {
79
+ content: " ";
83
80
  bottom: 1px;
84
- margin-left: -$popoverArrowWidth;
81
+ margin-left: -$popover-arrow-width;
85
82
  border-bottom-width: 0;
86
- border-top-color: $popoverArrowColor;
83
+ border-top-color: $popover-arrow-color;
87
84
  }
88
85
  }
89
86
  &.right .arrow {
90
87
  top: 50%;
91
- left: -$popoverArrowOuterWidth;
92
- margin-top: -$popoverArrowOuterWidth;
88
+ left: -$popover-arrow-outer-width;
89
+ margin-top: -$popover-arrow-outer-width;
93
90
  border-left-width: 0;
94
- border-right-color: #999; // IE8 fallback
95
- border-right-color: $popoverArrowOuterColor;
91
+ border-right-color: $popover-arrow-outer-fallback-color; // IE8 fallback
92
+ border-right-color: $popover-arrow-outer-color;
96
93
  &:after {
94
+ content: " ";
97
95
  left: 1px;
98
- bottom: -$popoverArrowWidth;
96
+ bottom: -$popover-arrow-width;
99
97
  border-left-width: 0;
100
- border-right-color: $popoverArrowColor;
98
+ border-right-color: $popover-arrow-color;
101
99
  }
102
100
  }
103
101
  &.bottom .arrow {
104
102
  left: 50%;
105
- margin-left: -$popoverArrowOuterWidth;
103
+ margin-left: -$popover-arrow-outer-width;
106
104
  border-top-width: 0;
107
- border-bottom-color: #999; // IE8 fallback
108
- border-bottom-color: $popoverArrowOuterColor;
109
- top: -$popoverArrowOuterWidth;
105
+ border-bottom-color: $popover-arrow-outer-fallback-color; // IE8 fallback
106
+ border-bottom-color: $popover-arrow-outer-color;
107
+ top: -$popover-arrow-outer-width;
110
108
  &:after {
109
+ content: " ";
111
110
  top: 1px;
112
- margin-left: -$popoverArrowWidth;
111
+ margin-left: -$popover-arrow-width;
113
112
  border-top-width: 0;
114
- border-bottom-color: $popoverArrowColor;
113
+ border-bottom-color: $popover-arrow-color;
115
114
  }
116
115
  }
117
116
 
118
117
  &.left .arrow {
119
118
  top: 50%;
120
- right: -$popoverArrowOuterWidth;
121
- margin-top: -$popoverArrowOuterWidth;
119
+ right: -$popover-arrow-outer-width;
120
+ margin-top: -$popover-arrow-outer-width;
122
121
  border-right-width: 0;
123
- border-left-color: #999; // IE8 fallback
124
- border-left-color: $popoverArrowOuterColor;
122
+ border-left-color: $popover-arrow-outer-fallback-color; // IE8 fallback
123
+ border-left-color: $popover-arrow-outer-color;
125
124
  &:after {
125
+ content: " ";
126
126
  right: 1px;
127
127
  border-right-width: 0;
128
- border-left-color: $popoverArrowColor;
129
- bottom: -$popoverArrowWidth;
128
+ border-left-color: $popover-arrow-color;
129
+ bottom: -$popover-arrow-width;
130
130
  }
131
131
  }
132
132
 
@@ -0,0 +1,100 @@
1
+ //
2
+ // Basic print styles
3
+ // --------------------------------------------------
4
+ // Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css
5
+
6
+ @media print {
7
+
8
+ * {
9
+ text-shadow: none !important;
10
+ color: #000 !important; // Black prints faster: h5bp.com/s
11
+ background: transparent !important;
12
+ box-shadow: none !important;
13
+ }
14
+
15
+ a,
16
+ a:visited {
17
+ text-decoration: underline;
18
+ }
19
+
20
+ a[href]:after {
21
+ content: " (" attr(href) ")";
22
+ }
23
+
24
+ abbr[title]:after {
25
+ content: " (" attr(title) ")";
26
+ }
27
+
28
+ // Don't show links for images, or javascript/internal links
29
+ .ir a:after,
30
+ a[href^="javascript:"]:after,
31
+ a[href^="#"]:after {
32
+ content: "";
33
+ }
34
+
35
+ pre,
36
+ blockquote {
37
+ border: 1px solid #999;
38
+ page-break-inside: avoid;
39
+ }
40
+
41
+ thead {
42
+ display: table-header-group; // h5bp.com/t
43
+ }
44
+
45
+ tr,
46
+ img {
47
+ page-break-inside: avoid;
48
+ }
49
+
50
+ img {
51
+ max-width: 100% !important;
52
+ }
53
+
54
+ @page {
55
+ margin: 2cm .5cm;
56
+ }
57
+
58
+ p,
59
+ h2,
60
+ h3 {
61
+ orphans: 3;
62
+ widows: 3;
63
+ }
64
+
65
+ h2,
66
+ h3 {
67
+ page-break-after: avoid;
68
+ }
69
+
70
+ // Bootstrap components
71
+ .navbar {
72
+ display: none;
73
+ }
74
+ .table {
75
+ td,
76
+ th {
77
+ background-color: #fff !important;
78
+ }
79
+ }
80
+ .btn,
81
+ .dropup > .btn {
82
+ > .caret {
83
+ border-top-color: #000 !important;
84
+ }
85
+ }
86
+ .label {
87
+ border: 1px solid #000;
88
+ }
89
+
90
+ .table {
91
+ border-collapse: collapse !important;
92
+ }
93
+ .table-bordered {
94
+ th,
95
+ td {
96
+ border: 1px solid #ddd !important;
97
+ }
98
+ }
99
+
100
+ }
@@ -3,8 +3,8 @@
3
3
  // --------------------------------------------------
4
4
 
5
5
 
6
- // ANIMATIONS
7
- // ----------
6
+ // Bar animations
7
+ // -------------------------
8
8
 
9
9
  // Webkit
10
10
  @-webkit-keyframes progress-bar-stripes {
@@ -18,19 +18,13 @@
18
18
  to { background-position: 0 0; }
19
19
  }
20
20
 
21
- // IE9
22
- @-ms-keyframes progress-bar-stripes {
23
- from { background-position: 40px 0; }
24
- to { background-position: 0 0; }
25
- }
26
-
27
21
  // Opera
28
22
  @-o-keyframes progress-bar-stripes {
29
23
  from { background-position: 0 0; }
30
24
  to { background-position: 40px 0; }
31
25
  }
32
26
 
33
- // Spec
27
+ // Spec and IE10+
34
28
  @keyframes progress-bar-stripes {
35
29
  from { background-position: 40px 0; }
36
30
  to { background-position: 0 0; }
@@ -38,45 +32,40 @@
38
32
 
39
33
 
40
34
 
41
- // THE BARS
42
- // --------
35
+ // Bar itself
36
+ // -------------------------
43
37
 
44
38
  // Outer container
45
39
  .progress {
46
40
  overflow: hidden;
47
- height: $baseLineHeight;
48
- margin-bottom: $baseLineHeight;
49
- @include gradient-vertical(#f5f5f5, #f9f9f9);
41
+ height: $line-height-computed;
42
+ margin-bottom: $line-height-computed;
43
+ background-color: $progress-bg;
44
+ border-radius: $border-radius-base;
50
45
  @include box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
51
- @include border-radius($baseBorderRadius);
52
46
  }
53
47
 
54
48
  // Bar of progress
55
- .progress .bar {
49
+ .progress-bar {
50
+ float: left;
56
51
  width: 0%;
57
52
  height: 100%;
58
- color: $white;
59
- float: left;
60
- font-size: 12px;
53
+ font-size: $font-size-small;
54
+ color: $progress-bar-color;
61
55
  text-align: center;
62
- text-shadow: 0 -1px 0 rgba(0,0,0,.25);
63
- @include gradient-vertical(#149bdf, #0480be);
56
+ background-color: $progress-bar-bg;
64
57
  @include box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
65
- @include box-sizing(border-box);
66
58
  @include transition(width .6s ease);
67
59
  }
68
- .progress .bar + .bar {
69
- @include box-shadow(inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15));
70
- }
71
60
 
72
61
  // Striped bars
73
- .progress-striped .bar {
74
- @include gradient-striped(#149bdf);
75
- @include background-size(40px 40px);
62
+ .progress-striped .progress-bar {
63
+ @include gradient-striped($progress-bar-bg);
64
+ background-size: 40px 40px;
76
65
  }
77
66
 
78
67
  // Call animation for the active one
79
- .progress.active .bar {
68
+ .progress.active .progress-bar {
80
69
  -webkit-animation: progress-bar-stripes 2s linear infinite;
81
70
  -moz-animation: progress-bar-stripes 2s linear infinite;
82
71
  -ms-animation: progress-bar-stripes 2s linear infinite;
@@ -86,37 +75,21 @@
86
75
 
87
76
 
88
77
 
89
- // COLORS
90
- // ------
78
+ // Variations
79
+ // -------------------------
91
80
 
92
- // Danger (red)
93
- .progress-danger .bar, .progress .bar-danger {
94
- @include gradient-vertical(#ee5f5b, #c43c35);
95
- }
96
- .progress-danger.progress-striped .bar, .progress-striped .bar-danger {
97
- @include gradient-striped(#ee5f5b);
81
+ .progress-bar-success {
82
+ @include progress-bar-variant($progress-bar-success-bg);
98
83
  }
99
84
 
100
- // Success (green)
101
- .progress-success .bar, .progress .bar-success {
102
- @include gradient-vertical(#62c462, #57a957);
103
- }
104
- .progress-success.progress-striped .bar, .progress-striped .bar-success {
105
- @include gradient-striped(#62c462);
85
+ .progress-bar-info {
86
+ @include progress-bar-variant($progress-bar-info-bg);
106
87
  }
107
88
 
108
- // Info (teal)
109
- .progress-info .bar, .progress .bar-info {
110
- @include gradient-vertical(#5bc0de, #339bb9);
111
- }
112
- .progress-info.progress-striped .bar, .progress-striped .bar-info {
113
- @include gradient-striped(#5bc0de);
89
+ .progress-bar-warning {
90
+ @include progress-bar-variant($progress-bar-warning-bg);
114
91
  }
115
92
 
116
- // Warning (orange)
117
- .progress-warning .bar, .progress .bar-warning {
118
- @include gradient-vertical(lighten($orange, 15%), $orange);
119
- }
120
- .progress-warning.progress-striped .bar, .progress-striped .bar-warning {
121
- @include gradient-striped(lighten($orange, 15%));
93
+ .progress-bar-danger {
94
+ @include progress-bar-variant($progress-bar-danger-bg);
122
95
  }