anjlab-bootstrap-rails 3.0.0.rc1 → 3.0.0.rc2
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.
- checksums.yaml +4 -4
- data/README.md +4 -12
- data/Rakefile +3 -2
- data/app/assets/javascripts/twitter/bootstrap.js +2 -1
- data/app/assets/javascripts/twitter/bootstrap/button.js +4 -2
- data/app/assets/javascripts/twitter/bootstrap/carousel.js +6 -2
- data/app/assets/javascripts/twitter/bootstrap/collapse.js +2 -2
- data/app/assets/javascripts/twitter/bootstrap/modal.js +19 -16
- data/app/assets/javascripts/twitter/bootstrap/popover.js +7 -5
- data/app/assets/javascripts/twitter/bootstrap/tooltip.js +39 -21
- data/app/assets/javascripts/twitter/bootstrap/transition.js +2 -2
- data/app/assets/stylesheets/twitter/bootstrap/_alerts.scss +21 -19
- data/app/assets/stylesheets/twitter/bootstrap/_badges.scss +5 -5
- data/app/assets/stylesheets/twitter/bootstrap/_bootstrap.scss +1 -1
- data/app/assets/stylesheets/twitter/bootstrap/_button-groups.scss +96 -23
- data/app/assets/stylesheets/twitter/bootstrap/_buttons.scss +24 -18
- data/app/assets/stylesheets/twitter/bootstrap/_carousel.scss +10 -11
- data/app/assets/stylesheets/twitter/bootstrap/_close.scss +1 -1
- data/app/assets/stylesheets/twitter/bootstrap/_code.scss +4 -3
- data/app/assets/stylesheets/twitter/bootstrap/_dropdowns.scss +23 -18
- data/app/assets/stylesheets/twitter/bootstrap/_forms.scss +65 -160
- data/app/assets/stylesheets/twitter/bootstrap/_grid.scss +244 -59
- data/app/assets/stylesheets/twitter/bootstrap/_input-groups.scss +127 -0
- data/app/assets/stylesheets/twitter/bootstrap/_labels.scss +12 -4
- data/app/assets/stylesheets/twitter/bootstrap/_list-group.scss +36 -36
- data/app/assets/stylesheets/twitter/bootstrap/_mixins.scss +227 -52
- data/app/assets/stylesheets/twitter/bootstrap/_modals.scss +6 -9
- data/app/assets/stylesheets/twitter/bootstrap/_navbar.scss +268 -82
- data/app/assets/stylesheets/twitter/bootstrap/_navs.scss +10 -18
- data/app/assets/stylesheets/twitter/bootstrap/_pagination.scss +5 -41
- data/app/assets/stylesheets/twitter/bootstrap/_panels.scss +83 -57
- data/app/assets/stylesheets/twitter/bootstrap/_popovers.scss +0 -2
- data/app/assets/stylesheets/twitter/bootstrap/_progress-bars.scss +2 -8
- data/app/assets/stylesheets/twitter/bootstrap/_responsive-utilities.scss +76 -21
- data/app/assets/stylesheets/twitter/bootstrap/_scaffolding.scss +18 -2
- data/app/assets/stylesheets/twitter/bootstrap/_tables.scss +1 -1
- data/app/assets/stylesheets/twitter/bootstrap/_thumbnails.scss +2 -2
- data/app/assets/stylesheets/twitter/bootstrap/_tooltip.scss +1 -1
- data/app/assets/stylesheets/twitter/bootstrap/_type.scss +19 -13
- data/app/assets/stylesheets/twitter/bootstrap/_utilities.scss +3 -2
- data/app/assets/stylesheets/twitter/bootstrap/_variables.scss +86 -46
- data/app/assets/stylesheets/twitter/bootstrap/_wells.scss +2 -2
- data/lib/bootstrap-rails/version.rb +1 -1
- data/vendor/assets/javascripts/holder.js +419 -0
- metadata +4 -3
- data/app/assets/stylesheets/twitter/bootstrap/_accordion.scss +0 -31
@@ -39,11 +39,6 @@
|
|
39
39
|
cursor: not-allowed;
|
40
40
|
}
|
41
41
|
}
|
42
|
-
|
43
|
-
// Space the headers out when they follow another list item (link)
|
44
|
-
+ .nav-header {
|
45
|
-
margin-top: 9px;
|
46
|
-
}
|
47
42
|
}
|
48
43
|
|
49
44
|
// Open dropdowns
|
@@ -61,18 +56,15 @@
|
|
61
56
|
}
|
62
57
|
}
|
63
58
|
|
64
|
-
// Redeclare pull classes because of specificity
|
65
|
-
// Todo: consider making these utilities !important to avoid this bullshit
|
66
|
-
> .pull-right {
|
67
|
-
float: right;
|
68
|
-
}
|
69
|
-
|
70
59
|
// Dividers (basically an hr) within the dropdown
|
71
60
|
.nav-divider {
|
72
61
|
@include nav-divider();
|
73
62
|
}
|
74
63
|
}
|
75
64
|
|
65
|
+
// Nav variations
|
66
|
+
// --------------------------------------------------
|
67
|
+
|
76
68
|
// Justified nav links
|
77
69
|
// -------------------------
|
78
70
|
|
@@ -101,12 +93,14 @@
|
|
101
93
|
border-bottom-color: $nav-tabs-justified-active-link-border-color;
|
102
94
|
}
|
103
95
|
|
96
|
+
// Prevent IE8 from misplacing imgs
|
97
|
+
// See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
|
98
|
+
> li > a > img {
|
99
|
+
max-width: none;
|
100
|
+
}
|
104
101
|
}
|
105
102
|
|
106
103
|
|
107
|
-
// Nav variations
|
108
|
-
// --------------------------------------------------
|
109
|
-
|
110
104
|
// Tabs
|
111
105
|
// -------------------------
|
112
106
|
|
@@ -182,10 +176,8 @@
|
|
182
176
|
> li {
|
183
177
|
float: none;
|
184
178
|
+ li {
|
185
|
-
|
186
|
-
|
187
|
-
margin-left: 0; // no need for this gap between nav items
|
188
|
-
}
|
179
|
+
margin-top: 2px;
|
180
|
+
margin-left: 0; // no need for this gap between nav items
|
189
181
|
}
|
190
182
|
}
|
191
183
|
}
|
@@ -12,7 +12,7 @@
|
|
12
12
|
> a,
|
13
13
|
> span {
|
14
14
|
float: left; // Collapse white-space
|
15
|
-
padding:
|
15
|
+
padding: $padding-base-vertical $padding-base-horizontal;
|
16
16
|
line-height: $line-height-base;
|
17
17
|
text-decoration: none;
|
18
18
|
background-color: $pagination-bg;
|
@@ -62,47 +62,11 @@
|
|
62
62
|
// --------------------------------------------------
|
63
63
|
|
64
64
|
// Large
|
65
|
-
.pagination-
|
66
|
-
|
67
|
-
> a,
|
68
|
-
> span {
|
69
|
-
padding: $padding-large-vertical $padding-large-horizontal;
|
70
|
-
font-size: $font-size-large;
|
71
|
-
}
|
72
|
-
&:first-child {
|
73
|
-
> a,
|
74
|
-
> span {
|
75
|
-
@include border-left-radius($border-radius-large);
|
76
|
-
}
|
77
|
-
}
|
78
|
-
&:last-child {
|
79
|
-
> a,
|
80
|
-
> span {
|
81
|
-
@include border-right-radius($border-radius-large);
|
82
|
-
}
|
83
|
-
}
|
84
|
-
}
|
65
|
+
.pagination-lg {
|
66
|
+
@include pagination-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $border-radius-large);
|
85
67
|
}
|
86
68
|
|
87
69
|
// Small
|
88
|
-
.pagination-
|
89
|
-
|
90
|
-
> a,
|
91
|
-
> span {
|
92
|
-
padding: $padding-small-vertical $padding-small-horizontal;
|
93
|
-
font-size: $font-size-small;
|
94
|
-
}
|
95
|
-
&:first-child {
|
96
|
-
> a,
|
97
|
-
> span {
|
98
|
-
@include border-left-radius($border-radius-small);
|
99
|
-
}
|
100
|
-
}
|
101
|
-
&:last-child {
|
102
|
-
> a,
|
103
|
-
> span {
|
104
|
-
@include border-right-radius($border-radius-small);
|
105
|
-
}
|
106
|
-
}
|
107
|
-
}
|
70
|
+
.pagination-sm {
|
71
|
+
@include pagination-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $border-radius-small);
|
108
72
|
}
|
@@ -5,22 +5,54 @@
|
|
5
5
|
|
6
6
|
// Base class
|
7
7
|
.panel {
|
8
|
-
|
9
|
-
margin-bottom: 20px;
|
8
|
+
margin-bottom: $line-height-computed;
|
10
9
|
background-color: $panel-bg;
|
11
10
|
border: 1px solid $panel-border;
|
12
11
|
border-radius: $panel-border-radius;
|
13
12
|
@include box-shadow(0 1px 1px rgba(0,0,0,.05));
|
14
13
|
}
|
15
14
|
|
15
|
+
// Panel contents
|
16
|
+
.panel-body {
|
17
|
+
padding: 15px;
|
18
|
+
}
|
19
|
+
|
20
|
+
// List groups in panels
|
21
|
+
//
|
22
|
+
// By default, space out list group content from panel headings to account for
|
23
|
+
// any kind of custom content between the two.
|
24
|
+
|
25
|
+
.panel {
|
26
|
+
.list-group {
|
27
|
+
margin-bottom: 0;
|
28
|
+
|
29
|
+
.list-group-item {
|
30
|
+
border-width: 1px 0;
|
31
|
+
|
32
|
+
// Remove border radius for top one
|
33
|
+
&:first-child {
|
34
|
+
@include border-top-radius(0);
|
35
|
+
}
|
36
|
+
// But keep it for the last one
|
37
|
+
&:last-child {
|
38
|
+
border-bottom: 0;
|
39
|
+
}
|
40
|
+
}
|
41
|
+
}
|
42
|
+
}
|
43
|
+
// Collapse space between when there's no additional content.
|
44
|
+
.panel-heading + .list-group {
|
45
|
+
.list-group-item:first-child {
|
46
|
+
border-top-width: 0;
|
47
|
+
}
|
48
|
+
}
|
49
|
+
|
16
50
|
// Optional heading
|
17
51
|
.panel-heading {
|
18
|
-
margin: -15px -15px 15px;
|
19
52
|
padding: 10px 15px;
|
20
53
|
background-color: $panel-heading-bg;
|
21
54
|
border-bottom: 1px solid $panel-border;
|
22
|
-
border-top-
|
23
|
-
border-top-right-radius: ($panel-border-radius - 1);
|
55
|
+
@include border-top-radius($panel-border-radius - 1);
|
24
56
|
}
|
25
57
|
|
26
58
|
// Within heading, strip any `h*` tag of it's default margins for spacing.
|
@@ -28,75 +60,69 @@
|
|
28
60
|
margin-top: 0;
|
29
61
|
margin-bottom: 0;
|
30
62
|
font-size: ($font-size-base * 1.25);
|
31
|
-
|
63
|
+
> a {
|
64
|
+
color: inherit;
|
65
|
+
}
|
32
66
|
}
|
33
67
|
|
34
68
|
// Optional footer (stays gray in every modifier class)
|
35
69
|
.panel-footer {
|
36
|
-
margin: 15px -15px -15px;
|
37
70
|
padding: 10px 15px;
|
38
71
|
background-color: $panel-footer-bg;
|
39
72
|
border-top: 1px solid $panel-border;
|
40
|
-
border-bottom-
|
41
|
-
border-bottom-right-radius: ($panel-border-radius - 1);
|
73
|
+
@include border-bottom-radius($panel-border-radius - 1);
|
42
74
|
}
|
43
75
|
|
44
|
-
|
45
|
-
|
46
|
-
|
76
|
+
|
77
|
+
// Collapsable panels (aka, accordion)
|
78
|
+
//
|
79
|
+
// Wrap a series of panels in `.panel-group` to turn them into an accordion with
|
80
|
+
// the help of our collapse JavaScript plugin.
|
81
|
+
|
82
|
+
.panel-group {
|
83
|
+
// Tighten up margin so it's only between panels
|
84
|
+
.panel {
|
85
|
+
margin-bottom: 0;
|
86
|
+
border-radius: $panel-border-radius;
|
87
|
+
overflow: hidden; // crop contents when collapsed
|
88
|
+
+ .panel {
|
89
|
+
margin-top: 5px;
|
90
|
+
}
|
91
|
+
}
|
92
|
+
|
47
93
|
.panel-heading {
|
48
|
-
|
49
|
-
|
50
|
-
|
94
|
+
border-bottom: 0;
|
95
|
+
+ .panel-collapse .panel-body {
|
96
|
+
border-top: 1px solid $panel-border;
|
97
|
+
}
|
98
|
+
}
|
99
|
+
.panel-footer {
|
100
|
+
border-top: 0;
|
101
|
+
+ .panel-collapse .panel-body {
|
102
|
+
border-bottom: 1px solid $panel-border;
|
103
|
+
}
|
104
|
+
}
|
105
|
+
|
106
|
+
// New subcomponent for wrapping collapsable content for proper animations
|
107
|
+
.panel-collapse {
|
108
|
+
|
51
109
|
}
|
52
110
|
}
|
111
|
+
|
112
|
+
|
113
|
+
// Contextual variations
|
114
|
+
.panel-primary {
|
115
|
+
@include panel-variant($panel-primary-border, $panel-primary-text, $panel-primary-heading-bg, $panel-primary-border);
|
116
|
+
}
|
53
117
|
.panel-success {
|
54
|
-
border-
|
55
|
-
.panel-heading {
|
56
|
-
color: $panel-success-text;
|
57
|
-
background-color: $panel-success-heading-bg;
|
58
|
-
border-color: $panel-success-border;
|
59
|
-
}
|
118
|
+
@include panel-variant($panel-success-border, $panel-success-text, $panel-success-heading-bg, $panel-success-border);
|
60
119
|
}
|
61
120
|
.panel-warning {
|
62
|
-
border-
|
63
|
-
.panel-heading {
|
64
|
-
color: $panel-warning-text;
|
65
|
-
background-color: $panel-warning-heading-bg;
|
66
|
-
border-color: $panel-warning-border;
|
67
|
-
}
|
121
|
+
@include panel-variant($panel-warning-border, $panel-warning-text, $panel-warning-heading-bg, $panel-warning-border);
|
68
122
|
}
|
69
123
|
.panel-danger {
|
70
|
-
border-
|
71
|
-
.panel-heading {
|
72
|
-
color: $panel-danger-text;
|
73
|
-
background-color: $panel-danger-heading-bg;
|
74
|
-
border-color: $panel-danger-border;
|
75
|
-
}
|
124
|
+
@include panel-variant($panel-danger-border, $panel-danger-text, $panel-danger-heading-bg, $panel-danger-border);
|
76
125
|
}
|
77
126
|
.panel-info {
|
78
|
-
border-
|
79
|
-
.panel-heading {
|
80
|
-
color: $panel-info-text;
|
81
|
-
background-color: $panel-info-heading-bg;
|
82
|
-
border-color: $panel-info-border;
|
83
|
-
}
|
84
|
-
}
|
85
|
-
|
86
|
-
// List groups in panels
|
87
|
-
.list-group-flush {
|
88
|
-
margin: 15px -15px -15px;
|
89
|
-
|
90
|
-
.list-group-item {
|
91
|
-
border-width: 1px 0;
|
92
|
-
|
93
|
-
// Remove border radius for top one
|
94
|
-
&:first-child {
|
95
|
-
@include border-top-radius(0);
|
96
|
-
}
|
97
|
-
// But keep it for the last one
|
98
|
-
&:last-child {
|
99
|
-
border-bottom: 0;
|
100
|
-
}
|
101
|
-
}
|
127
|
+
@include panel-variant($panel-info-border, $panel-info-text, $panel-info-heading-bg, $panel-info-border);
|
102
128
|
}
|
@@ -13,8 +13,6 @@
|
|
13
13
|
padding: 1px;
|
14
14
|
text-align: left; // Reset given new insertion method
|
15
15
|
background-color: $popover-bg;
|
16
|
-
-webkit-bg-clip: padding-box;
|
17
|
-
-moz-bg-clip: padding;
|
18
16
|
background-clip: padding-box;
|
19
17
|
border: 1px solid $popover-fallback-border-color;
|
20
18
|
border: 1px solid $popover-border-color;
|
@@ -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; }
|
@@ -67,7 +61,7 @@
|
|
67
61
|
// Striped bars
|
68
62
|
.progress-striped .progress-bar {
|
69
63
|
@include gradient-striped($progress-bar-bg);
|
70
|
-
|
64
|
+
background-size: 40px 40px;
|
71
65
|
}
|
72
66
|
|
73
67
|
// Call animation for the active one
|
@@ -35,43 +35,98 @@
|
|
35
35
|
|
36
36
|
// Visibility utilities
|
37
37
|
|
38
|
-
|
39
|
-
@
|
40
|
-
@include responsive-invisibility(".visible-
|
41
|
-
|
42
|
-
|
43
|
-
@include responsive-invisibility(".
|
44
|
-
|
45
|
-
@
|
46
|
-
|
38
|
+
@include responsive-visibility(".visible-xs");
|
39
|
+
@media (min-width: $screen-tablet) and (max-width: $screen-tablet-max) {
|
40
|
+
@include responsive-invisibility(".visible-xs");
|
41
|
+
}
|
42
|
+
@media (min-width: $screen-desktop) and (max-width: $screen-desktop-max) {
|
43
|
+
@include responsive-invisibility(".visible-xs");
|
44
|
+
}
|
45
|
+
@media (min-width: $screen-large-desktop) {
|
46
|
+
@include responsive-invisibility(".visible-xs");
|
47
|
+
}
|
47
48
|
|
48
|
-
|
49
|
+
@include responsive-invisibility(".visible-sm");
|
49
50
|
@media (min-width: $screen-tablet) and (max-width: $screen-tablet-max) {
|
51
|
+
@include responsive-visibility(".visible-sm");
|
52
|
+
}
|
53
|
+
@media (min-width: $screen-desktop) and (max-width: $screen-desktop-max) {
|
50
54
|
@include responsive-invisibility(".visible-sm");
|
51
|
-
@include responsive-visibility(".visible-md");
|
52
|
-
@include responsive-invisibility(".visible-lg");
|
53
|
-
|
54
|
-
@include responsive-visibility(".hidden-sm");
|
55
|
-
@include responsive-invisibility(".hidden-md");
|
56
|
-
@include responsive-visibility(".hidden-lg");
|
57
55
|
}
|
58
|
-
|
59
|
-
// For desktops
|
60
|
-
@media (min-width: $screen-desktop) {
|
56
|
+
@media (min-width: $screen-large-desktop) {
|
61
57
|
@include responsive-invisibility(".visible-sm");
|
58
|
+
}
|
59
|
+
|
60
|
+
@include responsive-invisibility(".visible-md");
|
61
|
+
@media (min-width: $screen-tablet) and (max-width: $screen-tablet-max) {
|
62
62
|
@include responsive-invisibility(".visible-md");
|
63
|
+
}
|
64
|
+
@media (min-width: $screen-desktop) and (max-width: $screen-desktop-max) {
|
65
|
+
@include responsive-visibility(".visible-md");
|
66
|
+
}
|
67
|
+
@media (min-width: $screen-large-desktop) {
|
68
|
+
@include responsive-invisibility(".visible-md");
|
69
|
+
}
|
70
|
+
|
71
|
+
@include responsive-invisibility(".visible-lg");
|
72
|
+
@media (min-width: $screen-tablet) and (max-width: $screen-tablet-max) {
|
73
|
+
@include responsive-invisibility(".visible-lg");
|
74
|
+
}
|
75
|
+
@media (min-width: $screen-desktop) and (max-width: $screen-desktop-max) {
|
76
|
+
@include responsive-invisibility(".visible-lg");
|
77
|
+
}
|
78
|
+
@media (min-width: $screen-large-desktop) {
|
63
79
|
@include responsive-visibility(".visible-lg");
|
80
|
+
}
|
64
81
|
|
82
|
+
@include responsive-invisibility(".hidden-xs");
|
83
|
+
@media (min-width: $screen-tablet) and (max-width: $screen-tablet-max) {
|
84
|
+
@include responsive-visibility(".hidden-xs");
|
85
|
+
}
|
86
|
+
@media (min-width: $screen-desktop) and (max-width: $screen-desktop-max) {
|
87
|
+
@include responsive-visibility(".hidden-xs");
|
88
|
+
}
|
89
|
+
@media (min-width: $screen-large-desktop) {
|
90
|
+
@include responsive-visibility(".hidden-xs");
|
91
|
+
}
|
92
|
+
|
93
|
+
@include responsive-visibility(".hidden-sm");
|
94
|
+
@media (min-width: $screen-tablet) and (max-width: $screen-tablet-max) {
|
95
|
+
@include responsive-invisibility(".hidden-sm");
|
96
|
+
}
|
97
|
+
@media (min-width: $screen-desktop) and (max-width: $screen-desktop-max) {
|
65
98
|
@include responsive-visibility(".hidden-sm");
|
99
|
+
}
|
100
|
+
@media (min-width: $screen-large-desktop) {
|
101
|
+
@include responsive-visibility(".hidden-sm");
|
102
|
+
}
|
103
|
+
|
104
|
+
@include responsive-visibility(".hidden-md");
|
105
|
+
@media (min-width: $screen-tablet) and (max-width: $screen-tablet-max) {
|
106
|
+
@include responsive-visibility(".hidden-md");
|
107
|
+
}
|
108
|
+
@media (min-width: $screen-desktop) and (max-width: $screen-desktop-max) {
|
109
|
+
@include responsive-invisibility(".hidden-md");
|
110
|
+
}
|
111
|
+
@media (min-width: $screen-large-desktop) {
|
66
112
|
@include responsive-visibility(".hidden-md");
|
113
|
+
}
|
114
|
+
|
115
|
+
@include responsive-visibility(".hidden-lg");
|
116
|
+
@media (min-width: $screen-tablet) and (max-width: $screen-tablet-max) {
|
117
|
+
@include responsive-visibility(".hidden-lg");
|
118
|
+
}
|
119
|
+
@media (min-width: $screen-desktop) and (max-width: $screen-desktop-max) {
|
120
|
+
@include responsive-visibility(".hidden-lg");
|
121
|
+
}
|
122
|
+
@media (min-width: $screen-large-desktop) {
|
67
123
|
@include responsive-invisibility(".hidden-lg");
|
68
124
|
}
|
69
125
|
|
70
126
|
// Print utilities
|
71
127
|
@include responsive-invisibility(".visible-print");
|
72
|
-
.hidden-print { }
|
73
128
|
|
74
129
|
@media print {
|
75
130
|
@include responsive-visibility(".visible-print");
|
76
131
|
@include responsive-invisibility(".hidden-print");
|
77
|
-
}
|
132
|
+
}
|