anjlab-bootstrap-rails 2.1.1.1 → 2.2.0.0
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.
- data/lib/bootstrap-rails/version.rb +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/affix.js +4 -2
- data/vendor/assets/javascripts/twitter/bootstrap/alert.js +2 -4
- data/vendor/assets/javascripts/twitter/bootstrap/button.js +5 -7
- data/vendor/assets/javascripts/twitter/bootstrap/carousel.js +12 -12
- data/vendor/assets/javascripts/twitter/bootstrap/collapse.js +9 -11
- data/vendor/assets/javascripts/twitter/bootstrap/dropdown.js +9 -11
- data/vendor/assets/javascripts/twitter/bootstrap/modal.js +20 -25
- data/vendor/assets/javascripts/twitter/bootstrap/popover.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/scrollspy.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/tab.js +5 -7
- data/vendor/assets/javascripts/twitter/bootstrap/tooltip.js +12 -11
- data/vendor/assets/javascripts/twitter/bootstrap/transition.js +5 -5
- data/vendor/assets/javascripts/twitter/bootstrap/typeahead.js +19 -9
- data/vendor/frameworks/twitter/bootstrap/accordion.scss +1 -1
- data/vendor/frameworks/twitter/bootstrap/alerts.scss +1 -1
- data/vendor/frameworks/twitter/bootstrap/bootstrap.scss +2 -1
- data/vendor/frameworks/twitter/bootstrap/breadcrumbs.scss +1 -1
- data/vendor/frameworks/twitter/bootstrap/button-groups.scss +3 -6
- data/vendor/frameworks/twitter/bootstrap/buttons.scss +15 -14
- data/vendor/frameworks/twitter/bootstrap/code.scss +1 -1
- data/vendor/frameworks/twitter/bootstrap/dropdowns.scss +32 -5
- data/vendor/frameworks/twitter/bootstrap/forms.scss +46 -13
- data/vendor/frameworks/twitter/bootstrap/hero-unit.scss +6 -5
- data/vendor/frameworks/twitter/bootstrap/labels-badges.scss +4 -2
- data/vendor/frameworks/twitter/bootstrap/media.scss +55 -0
- data/vendor/frameworks/twitter/bootstrap/mixins.scss +9 -3
- data/vendor/frameworks/twitter/bootstrap/modals.scss +7 -11
- data/vendor/frameworks/twitter/bootstrap/navbar.scss +4 -4
- data/vendor/frameworks/twitter/bootstrap/navs.scss +3 -2
- data/vendor/frameworks/twitter/bootstrap/pager.scss +10 -9
- data/vendor/frameworks/twitter/bootstrap/pagination.scss +69 -12
- data/vendor/frameworks/twitter/bootstrap/popovers.scss +2 -2
- data/vendor/frameworks/twitter/bootstrap/progress-bars.scss +1 -1
- data/vendor/frameworks/twitter/bootstrap/reset.scss +5 -4
- data/vendor/frameworks/twitter/bootstrap/responsive-767px-max.scss +20 -1
- data/vendor/frameworks/twitter/bootstrap/responsive-navbar.scss +11 -3
- data/vendor/frameworks/twitter/bootstrap/responsive.scss +1 -1
- data/vendor/frameworks/twitter/bootstrap/sprites.scss +3 -3
- data/vendor/frameworks/twitter/bootstrap/tables.scss +10 -8
- data/vendor/frameworks/twitter/bootstrap/thumbnails.scss +1 -1
- data/vendor/frameworks/twitter/bootstrap/tooltip.scss +1 -1
- data/vendor/frameworks/twitter/bootstrap/type.scss +30 -24
- data/vendor/frameworks/twitter/bootstrap/variables.scss +25 -3
- data/vendor/frameworks/twitter/bootstrap/wells.scss +3 -3
- metadata +5 -4
@@ -75,7 +75,7 @@
|
|
75
75
|
.nav-collapse .btn {
|
76
76
|
padding: 4px 10px 4px;
|
77
77
|
font-weight: normal;
|
78
|
-
@include border-radius(
|
78
|
+
@include border-radius($baseBorderRadius);
|
79
79
|
}
|
80
80
|
.nav-collapse .dropdown-menu li + li a {
|
81
81
|
margin-bottom: 2px;
|
@@ -84,6 +84,10 @@
|
|
84
84
|
.nav-collapse .dropdown-menu a:hover {
|
85
85
|
background-color: $navbarBackground;
|
86
86
|
}
|
87
|
+
.navbar-inverse .nav-collapse .nav > li > a,
|
88
|
+
.navbar-inverse .nav-collapse .dropdown-menu a {
|
89
|
+
color: $navbarInverseLinkColor;
|
90
|
+
}
|
87
91
|
.navbar-inverse .nav-collapse .nav > li > a:hover,
|
88
92
|
.navbar-inverse .nav-collapse .dropdown-menu a:hover {
|
89
93
|
background-color: $navbarInverseBackground;
|
@@ -99,7 +103,7 @@
|
|
99
103
|
top: auto;
|
100
104
|
left: auto;
|
101
105
|
float: none;
|
102
|
-
display:
|
106
|
+
display: none;
|
103
107
|
max-width: none;
|
104
108
|
margin: 0 15px;
|
105
109
|
padding: 0;
|
@@ -108,6 +112,10 @@
|
|
108
112
|
@include border-radius(0);
|
109
113
|
@include box-shadow(none);
|
110
114
|
}
|
115
|
+
.nav-collapse .open > .dropdown-menu {
|
116
|
+
display: block;
|
117
|
+
}
|
118
|
+
|
111
119
|
.nav-collapse .dropdown-menu:before,
|
112
120
|
.nav-collapse .dropdown-menu:after {
|
113
121
|
display: none;
|
@@ -166,7 +174,7 @@
|
|
166
174
|
// DEFAULT DESKTOP
|
167
175
|
// ---------------
|
168
176
|
|
169
|
-
@media (min-width:
|
177
|
+
@media (min-width: $navbarCollapseDesktopWidth) {
|
170
178
|
|
171
179
|
// Required to make the collapsing navbar work on regular desktops
|
172
180
|
.nav-collapse.collapse {
|
@@ -30,8 +30,6 @@
|
|
30
30
|
|
31
31
|
/* White icons with optional class, or on hover/active states of certain elements */
|
32
32
|
.icon-white,
|
33
|
-
.nav-tabs > .active > a > [class^="icon-"],
|
34
|
-
.nav-tabs > .active > a > [class*=" icon-"],
|
35
33
|
.nav-pills > .active > a > [class^="icon-"],
|
36
34
|
.nav-pills > .active > a > [class*=" icon-"],
|
37
35
|
.nav-list > .active > a > [class^="icon-"],
|
@@ -41,7 +39,9 @@
|
|
41
39
|
.dropdown-menu > li > a:hover > [class^="icon-"],
|
42
40
|
.dropdown-menu > li > a:hover > [class*=" icon-"],
|
43
41
|
.dropdown-menu > .active > a > [class^="icon-"],
|
44
|
-
.dropdown-menu > .active > a > [class*=" icon-"]
|
42
|
+
.dropdown-menu > .active > a > [class*=" icon-"],
|
43
|
+
.dropdown-submenu:hover > a > [class^="icon-"],
|
44
|
+
.dropdown-submenu:hover > a > [class*=" icon-"] {
|
45
45
|
background-image: url($iconWhiteSpritePath);
|
46
46
|
}
|
47
47
|
|
@@ -71,7 +71,7 @@ table {
|
|
71
71
|
border-collapse: separate; // Done so we can round those corners!
|
72
72
|
*border-collapse: collapse; // IE7 can't round corners anyway
|
73
73
|
border-left: 0;
|
74
|
-
@include border-radius(
|
74
|
+
@include border-radius($baseBorderRadius);
|
75
75
|
th,
|
76
76
|
td {
|
77
77
|
border-left: 1px solid $tableBorder;
|
@@ -133,7 +133,7 @@ table {
|
|
133
133
|
colgroup + tbody tr:first-child td:last-child {
|
134
134
|
-webkit-border-top-right-radius: 4px;
|
135
135
|
border-top-right-radius: 4px;
|
136
|
-
|
136
|
+
-moz-border-radius-topright: 4px;
|
137
137
|
}
|
138
138
|
|
139
139
|
}
|
@@ -172,18 +172,20 @@ table {
|
|
172
172
|
// -----------------
|
173
173
|
|
174
174
|
// Reset default grid behavior
|
175
|
-
table [class*=span],
|
176
|
-
|
175
|
+
table td[class*="span"],
|
176
|
+
table th[class*="span"],
|
177
|
+
.row-fluid table td[class*="span"],
|
178
|
+
.row-fluid table th[class*="span"] {
|
177
179
|
display: table-cell;
|
178
180
|
float: none; // undo default grid column styles
|
179
181
|
margin-left: 0; // undo default grid column styles
|
180
182
|
}
|
181
183
|
|
182
184
|
// Change the column widths to account for td/th padding
|
183
|
-
|
184
|
-
table {
|
185
|
-
@for $i from 1 through
|
186
|
-
|
185
|
+
.table td,
|
186
|
+
.table th {
|
187
|
+
@for $i from 1 through 12 {
|
188
|
+
&.span#{$i} { @include table-columns($i); }
|
187
189
|
}
|
188
190
|
}
|
189
191
|
|
@@ -37,18 +37,17 @@ cite {
|
|
37
37
|
.muted {
|
38
38
|
color: $grayLight;
|
39
39
|
}
|
40
|
-
.text-warning {
|
41
|
-
|
42
|
-
|
43
|
-
.text-error {
|
44
|
-
|
45
|
-
|
46
|
-
.text-info {
|
47
|
-
|
48
|
-
|
49
|
-
.text-success {
|
50
|
-
|
51
|
-
}
|
40
|
+
.text-warning { color: $warningText; }
|
41
|
+
a.text-warning:hover { color: darken($warningText, 10%); }
|
42
|
+
|
43
|
+
.text-error { color: $errorText; }
|
44
|
+
a.text-error:hover { color: darken($errorText, 10%); }
|
45
|
+
|
46
|
+
.text-info { color: $infoText; }
|
47
|
+
a.text-info:hover { color: darken($infoText, 10%); }
|
48
|
+
|
49
|
+
.text-success { color: $successText; }
|
50
|
+
a.text-success:hover { color: darken($successText, 10%); }
|
52
51
|
|
53
52
|
|
54
53
|
// Headings
|
@@ -58,7 +57,7 @@ h1, h2, h3, h4, h5, h6 {
|
|
58
57
|
margin: ($baseLineHeight / 2) 0;
|
59
58
|
font-family: $headingsFontFamily;
|
60
59
|
font-weight: $headingsFontWeight;
|
61
|
-
line-height:
|
60
|
+
line-height: $baseLineHeight;
|
62
61
|
color: $headingsColor;
|
63
62
|
text-rendering: optimizelegibility; // Fix the character spacing for headings
|
64
63
|
small {
|
@@ -67,17 +66,22 @@ h1, h2, h3, h4, h5, h6 {
|
|
67
66
|
color: $grayLight;
|
68
67
|
}
|
69
68
|
}
|
70
|
-
h1 { font-size: 36px; line-height: 40px; }
|
71
|
-
h2 { font-size: 30px; line-height: 40px; }
|
72
|
-
h3 { font-size: 24px; line-height: 40px; }
|
73
|
-
h4 { font-size: 18px; line-height: 20px; }
|
74
|
-
h5 { font-size: 14px; line-height: 20px; }
|
75
|
-
h6 { font-size: 12px; line-height: 20px; }
|
76
69
|
|
77
|
-
h1
|
78
|
-
h2
|
79
|
-
h3
|
80
|
-
|
70
|
+
h1,
|
71
|
+
h2,
|
72
|
+
h3 { line-height: $baseLineHeight * 2; }
|
73
|
+
|
74
|
+
h1 { font-size: $baseFontSize * 2.75; } // ~38px
|
75
|
+
h2 { font-size: $baseFontSize * 2.25; } // ~32px
|
76
|
+
h3 { font-size: $baseFontSize * 1.75; } // ~24px
|
77
|
+
h4 { font-size: $baseFontSize * 1.25; } // ~18px
|
78
|
+
h5 { font-size: $baseFontSize; }
|
79
|
+
h6 { font-size: $baseFontSize * 0.85; } // ~12px
|
80
|
+
|
81
|
+
h1 small { font-size: $baseFontSize * 1.75; } // ~24px
|
82
|
+
h2 small { font-size: $baseFontSize * 1.25; } // ~18px
|
83
|
+
h3 small { font-size: $baseFontSize; }
|
84
|
+
h4 small { font-size: $baseFontSize; }
|
81
85
|
|
82
86
|
// Page header
|
83
87
|
// -------------------------
|
@@ -154,7 +158,9 @@ hr {
|
|
154
158
|
}
|
155
159
|
|
156
160
|
// Abbreviations and acronyms
|
157
|
-
abbr[title]
|
161
|
+
abbr[title],
|
162
|
+
// Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257
|
163
|
+
abbr[data-original-title] {
|
158
164
|
cursor: help;
|
159
165
|
border-bottom: 1px dotted $grayLight;
|
160
166
|
}
|
@@ -57,6 +57,24 @@ $headingsFontFamily: inherit !default; // empty to use BS default, $baseFontF
|
|
57
57
|
$headingsFontWeight: bold !default; // instead of browser default, bold
|
58
58
|
$headingsColor: inherit !default; // empty to use BS default, $textColor
|
59
59
|
|
60
|
+
|
61
|
+
// Component sizing
|
62
|
+
// -------------------------
|
63
|
+
// Based on 14px font-size and 20px line-height
|
64
|
+
|
65
|
+
$fontSizeLarge: $baseFontSize * 1.25 !default; // ~18px
|
66
|
+
$fontSizeSmall: $baseFontSize * 0.85 !default; // ~12px
|
67
|
+
$fontSizeMini: $baseFontSize * 0.75 !default; // ~11px
|
68
|
+
|
69
|
+
$paddingLarge: 11px 19px !default; // 44px
|
70
|
+
$paddingSmall: 2px 10px !default; // 26px
|
71
|
+
$paddingMini: 1px 6px !default; // 24px
|
72
|
+
|
73
|
+
$baseBorderRadius: 4px !default;
|
74
|
+
$borderRadiusLarge: 6px !default;
|
75
|
+
$borderRadiusSmall: 3px !default;
|
76
|
+
|
77
|
+
|
60
78
|
// Tables
|
61
79
|
// -------------------------
|
62
80
|
$tableBackground: transparent !default; // overall background-color
|
@@ -92,10 +110,12 @@ $btnInverseBackgroundHighlight: $grayDarker !default;
|
|
92
110
|
// Forms
|
93
111
|
// -------------------------
|
94
112
|
$inputBackground: $white !default;
|
95
|
-
$inputBorder: #ccc
|
96
|
-
$inputBorderRadius:
|
113
|
+
$inputBorder: #ccc;
|
114
|
+
$inputBorderRadius: $baseBorderRadius !default;
|
97
115
|
$inputDisabledBackground: $grayLighter !default;
|
98
|
-
$formActionsBackground: #f5f5f5
|
116
|
+
$formActionsBackground: #f5f5f5 !default;
|
117
|
+
$inputHeight: $baseLineHeight + 10px !default; // base line-height + 8px vertical padding + 2px top/bottom border
|
118
|
+
|
99
119
|
|
100
120
|
// Dropdowns
|
101
121
|
// -------------------------
|
@@ -116,6 +136,7 @@ $dropdownLinkBackgroundHover: $dropdownLinkBackgroundActive !default;
|
|
116
136
|
// COMPONENT VARIABLES
|
117
137
|
// --------------------------------------------------
|
118
138
|
|
139
|
+
|
119
140
|
// Z-index master list
|
120
141
|
// -------------------------
|
121
142
|
// Used for a bird's eye view of components dependent on the z-axis
|
@@ -151,6 +172,7 @@ $wellBackground: #f5f5f5 !default;
|
|
151
172
|
// Navbar
|
152
173
|
// -------------------------
|
153
174
|
$navbarCollapseWidth: 979px !default;
|
175
|
+
$navbarCollapseDesktopWidth: $navbarCollapseWidth + 1 !default;
|
154
176
|
|
155
177
|
$navbarHeight: 40px !default;
|
156
178
|
$navbarBackgroundHighlight: #ffffff !default;
|
@@ -10,7 +10,7 @@
|
|
10
10
|
margin-bottom: 20px;
|
11
11
|
background-color: $wellBackground;
|
12
12
|
border: 1px solid darken($wellBackground, 7%);
|
13
|
-
@include border-radius(
|
13
|
+
@include border-radius($baseBorderRadius);
|
14
14
|
@include box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
|
15
15
|
blockquote {
|
16
16
|
border-color: #ddd;
|
@@ -21,9 +21,9 @@
|
|
21
21
|
// Sizes
|
22
22
|
.well-large {
|
23
23
|
padding: 24px;
|
24
|
-
@include border-radius(
|
24
|
+
@include border-radius($borderRadiusLarge);
|
25
25
|
}
|
26
26
|
.well-small {
|
27
27
|
padding: 9px;
|
28
|
-
@include border-radius(
|
28
|
+
@include border-radius($borderRadiusSmall);
|
29
29
|
}
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: anjlab-bootstrap-rails
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.
|
4
|
+
version: 2.2.0.0
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-
|
12
|
+
date: 2012-10-30 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: railties
|
@@ -130,6 +130,7 @@ files:
|
|
130
130
|
- vendor/frameworks/twitter/bootstrap/hero-unit.scss
|
131
131
|
- vendor/frameworks/twitter/bootstrap/labels-badges.scss
|
132
132
|
- vendor/frameworks/twitter/bootstrap/layouts.scss
|
133
|
+
- vendor/frameworks/twitter/bootstrap/media.scss
|
133
134
|
- vendor/frameworks/twitter/bootstrap/mixins.scss
|
134
135
|
- vendor/frameworks/twitter/bootstrap/modals.scss
|
135
136
|
- vendor/frameworks/twitter/bootstrap/navbar.scss
|
@@ -168,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
168
169
|
version: '0'
|
169
170
|
segments:
|
170
171
|
- 0
|
171
|
-
hash: -
|
172
|
+
hash: -639441346049692674
|
172
173
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
173
174
|
none: false
|
174
175
|
requirements:
|
@@ -177,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
177
178
|
version: '0'
|
178
179
|
segments:
|
179
180
|
- 0
|
180
|
-
hash: -
|
181
|
+
hash: -639441346049692674
|
181
182
|
requirements: []
|
182
183
|
rubyforge_project:
|
183
184
|
rubygems_version: 1.8.24
|