compass_twitter_bootstrap 2.2.2.2 → 2.3.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/CHANGELOG.md +3 -0
- data/README.md +5 -4
- data/lib/compass_twitter_bootstrap/version.rb +1 -1
- data/stylesheets/_compass_twitter_bootstrap.scss +15 -5
- data/stylesheets/_compass_twitter_bootstrap_awesome.scss +17 -6
- data/stylesheets/_compass_twitter_bootstrap_responsive.scss +17 -5
- data/stylesheets/compass_twitter_bootstrap/_button-groups.scss +4 -2
- data/stylesheets/compass_twitter_bootstrap/_buttons.scss +9 -11
- data/stylesheets/compass_twitter_bootstrap/_carousel.scss +34 -7
- data/stylesheets/compass_twitter_bootstrap/_close.scss +2 -1
- data/stylesheets/compass_twitter_bootstrap/_dropdowns.scss +16 -12
- data/stylesheets/compass_twitter_bootstrap/_forms.scss +5 -2
- data/stylesheets/compass_twitter_bootstrap/_labels-badges.scss +4 -2
- data/stylesheets/compass_twitter_bootstrap/_media.scss +2 -2
- data/stylesheets/compass_twitter_bootstrap/_mixins.scss +39 -8
- data/stylesheets/compass_twitter_bootstrap/_navbar.scss +20 -13
- data/stylesheets/compass_twitter_bootstrap/_navs.scss +39 -21
- data/stylesheets/compass_twitter_bootstrap/_pager.scss +3 -1
- data/stylesheets/compass_twitter_bootstrap/_pagination.scss +3 -1
- data/stylesheets/compass_twitter_bootstrap/_popovers.scss +5 -1
- data/stylesheets/compass_twitter_bootstrap/_responsive-767px-max.scss +2 -2
- data/stylesheets/compass_twitter_bootstrap/_responsive-navbar.scss +6 -2
- data/stylesheets/compass_twitter_bootstrap/_responsive-utilities.scss +16 -0
- data/stylesheets/compass_twitter_bootstrap/_scaffolding.scss +2 -1
- data/stylesheets/compass_twitter_bootstrap/_sprites.scss +7 -3
- data/stylesheets/compass_twitter_bootstrap/_tables.scss +24 -17
- data/stylesheets/compass_twitter_bootstrap/_thumbnails.scss +3 -2
- data/stylesheets/compass_twitter_bootstrap/_tooltip.scss +6 -6
- data/stylesheets/compass_twitter_bootstrap/_type.scss +19 -7
- data/stylesheets/compass_twitter_bootstrap/_utilities.scss +1 -3
- data/stylesheets/compass_twitter_bootstrap/_variables.scss +4 -4
- data/stylesheets_sass/_compass_twitter_bootstrap.sass +14 -6
- data/stylesheets_sass/_compass_twitter_bootstrap_awesome.sass +16 -7
- data/stylesheets_sass/_compass_twitter_bootstrap_responsive.sass +14 -5
- data/stylesheets_sass/compass_twitter_bootstrap/_button-groups.sass +4 -3
- data/stylesheets_sass/compass_twitter_bootstrap/_buttons.sass +9 -11
- data/stylesheets_sass/compass_twitter_bootstrap/_carousel.sass +30 -6
- data/stylesheets_sass/compass_twitter_bootstrap/_close.sass +2 -1
- data/stylesheets_sass/compass_twitter_bootstrap/_code.sass +1 -1
- data/stylesheets_sass/compass_twitter_bootstrap/_dropdowns.sass +18 -13
- data/stylesheets_sass/compass_twitter_bootstrap/_font-awesome.sass +339 -46
- data/stylesheets_sass/compass_twitter_bootstrap/_forms.sass +12 -15
- data/stylesheets_sass/compass_twitter_bootstrap/_labels-badges.sass +4 -2
- data/stylesheets_sass/compass_twitter_bootstrap/_media.sass +2 -2
- data/stylesheets_sass/compass_twitter_bootstrap/_mixins.sass +41 -7
- data/stylesheets_sass/compass_twitter_bootstrap/_modals.sass +4 -4
- data/stylesheets_sass/compass_twitter_bootstrap/_navbar.sass +23 -14
- data/stylesheets_sass/compass_twitter_bootstrap/_navs.sass +51 -30
- data/stylesheets_sass/compass_twitter_bootstrap/_pager.sass +4 -2
- data/stylesheets_sass/compass_twitter_bootstrap/_pagination.sass +3 -1
- data/stylesheets_sass/compass_twitter_bootstrap/_popovers.sass +4 -2
- data/stylesheets_sass/compass_twitter_bootstrap/_reset.sass +2 -2
- data/stylesheets_sass/compass_twitter_bootstrap/_responsive-767px-max.sass +1 -1
- data/stylesheets_sass/compass_twitter_bootstrap/_responsive-navbar.sass +6 -2
- data/stylesheets_sass/compass_twitter_bootstrap/_responsive-utilities.sass +19 -0
- data/stylesheets_sass/compass_twitter_bootstrap/_scaffolding.sass +3 -2
- data/stylesheets_sass/compass_twitter_bootstrap/_sprites.sass +8 -3
- data/stylesheets_sass/compass_twitter_bootstrap/_tables.sass +24 -16
- data/stylesheets_sass/compass_twitter_bootstrap/_thumbnails.sass +5 -3
- data/stylesheets_sass/compass_twitter_bootstrap/_tooltip.sass +6 -2
- data/stylesheets_sass/compass_twitter_bootstrap/_type.sass +24 -7
- data/stylesheets_sass/compass_twitter_bootstrap/_utilities.sass +0 -3
- data/stylesheets_sass/compass_twitter_bootstrap/_variables.sass +4 -4
- data/vendor/assets/images/glyphicons-halflings-white.png +0 -0
- data/vendor/assets/images/glyphicons-halflings.png +0 -0
- data/vendor/assets/javascripts/bootstrap-affix.js +1 -1
- data/vendor/assets/javascripts/bootstrap-alert.js +1 -1
- data/vendor/assets/javascripts/bootstrap-all.js +0 -1
- data/vendor/assets/javascripts/bootstrap-button.js +1 -1
- data/vendor/assets/javascripts/bootstrap-carousel.js +32 -10
- data/vendor/assets/javascripts/bootstrap-collapse.js +4 -4
- data/vendor/assets/javascripts/bootstrap-dropdown.js +14 -10
- data/vendor/assets/javascripts/bootstrap-modal.js +14 -12
- data/vendor/assets/javascripts/bootstrap-popover.js +5 -5
- data/vendor/assets/javascripts/bootstrap-scrollspy.js +2 -2
- data/vendor/assets/javascripts/bootstrap-tab.js +1 -1
- data/vendor/assets/javascripts/bootstrap-tooltip.js +104 -30
- data/vendor/assets/javascripts/bootstrap-transition.js +1 -1
- data/vendor/assets/javascripts/bootstrap-typeahead.js +16 -4
- metadata +10 -22
- data/stylesheets/compass_twitter_bootstrap/_responsive.scss +0 -48
- data/stylesheets_sass/compass_twitter_bootstrap/_responsive.sass +0 -44
@@ -16,10 +16,11 @@
|
|
16
16
|
display: inline-block
|
17
17
|
padding: 5px 14px
|
18
18
|
background-color: #fff
|
19
|
-
border: 1px solid #
|
19
|
+
border: 1px solid #dddddd
|
20
20
|
+ctb-border-radius(15px)
|
21
21
|
|
22
|
-
.pager li > a:hover
|
22
|
+
.pager li > a:hover,
|
23
|
+
.pager li > a:focus
|
23
24
|
text-decoration: none
|
24
25
|
background-color: #f5f5f5
|
25
26
|
|
@@ -33,6 +34,7 @@
|
|
33
34
|
|
34
35
|
.pager .disabled > a,
|
35
36
|
.pager .disabled > a:hover,
|
37
|
+
.pager .disabled > a:focus,
|
36
38
|
.pager .disabled > span
|
37
39
|
color: $grayLight
|
38
40
|
background-color: #fff
|
@@ -33,6 +33,7 @@
|
|
33
33
|
border-left-width: 0
|
34
34
|
|
35
35
|
.pagination ul > li > a:hover,
|
36
|
+
.pagination ul > li > a:focus,
|
36
37
|
.pagination ul > .active > a,
|
37
38
|
.pagination ul > .active > span
|
38
39
|
background-color: $paginationActiveBackground
|
@@ -44,7 +45,8 @@
|
|
44
45
|
|
45
46
|
.pagination ul > .disabled > span,
|
46
47
|
.pagination ul > .disabled > a,
|
47
|
-
.pagination ul > .disabled > a:hover
|
48
|
+
.pagination ul > .disabled > a:hover,
|
49
|
+
.pagination ul > .disabled > a:focus
|
48
50
|
color: $grayLight
|
49
51
|
background-color: transparent
|
50
52
|
cursor: default
|
@@ -8,7 +8,7 @@
|
|
8
8
|
left: 0
|
9
9
|
z-index: $zindexPopover
|
10
10
|
display: none
|
11
|
-
width:
|
11
|
+
max-width: 276px
|
12
12
|
padding: 1px
|
13
13
|
text-align: left
|
14
14
|
// Reset given new insertion method
|
@@ -16,7 +16,7 @@
|
|
16
16
|
-webkit-background-clip: padding-box
|
17
17
|
-moz-background-clip: padding
|
18
18
|
background-clip: padding-box
|
19
|
-
border: 1px solid #
|
19
|
+
border: 1px solid #cccccc
|
20
20
|
border: 1px solid rgba(0, 0, 0, 0.2)
|
21
21
|
+ctb-border-radius(6px)
|
22
22
|
+ctb-box-shadow(0 5px 10px rgba(0, 0, 0, 0.2))
|
@@ -42,6 +42,8 @@
|
|
42
42
|
background-color: $popoverTitleBackground
|
43
43
|
border-bottom: 1px solid darken($popoverTitleBackground, 5%)
|
44
44
|
+ctb-border-radius(5px 5px 0 0)
|
45
|
+
&:empty
|
46
|
+
display: none
|
45
47
|
|
46
48
|
.popover-content
|
47
49
|
padding: 9px 14px
|
@@ -158,7 +158,7 @@ textarea
|
|
158
158
|
@media print
|
159
159
|
*
|
160
160
|
text-shadow: none !important
|
161
|
-
color:
|
161
|
+
color: black !important
|
162
162
|
// Black prints faster: h5bp.com/s
|
163
163
|
background: transparent !important
|
164
164
|
box-shadow: none !important
|
@@ -176,7 +176,7 @@ textarea
|
|
176
176
|
content: ""
|
177
177
|
pre,
|
178
178
|
blockquote
|
179
|
-
border: 1px solid #
|
179
|
+
border: 1px solid #999999
|
180
180
|
page-break-inside: avoid
|
181
181
|
thead
|
182
182
|
display: table-header-group
|
@@ -62,13 +62,17 @@
|
|
62
62
|
.nav-collapse .dropdown-menu li + li a
|
63
63
|
margin-bottom: 2px
|
64
64
|
.nav-collapse .nav > li > a:hover,
|
65
|
-
.nav-collapse .
|
65
|
+
.nav-collapse .nav > li > a:focus,
|
66
|
+
.nav-collapse .dropdown-menu a:hover,
|
67
|
+
.nav-collapse .dropdown-menu a:focus
|
66
68
|
background-color: $navbarBackground
|
67
69
|
.navbar-inverse .nav-collapse .nav > li > a,
|
68
70
|
.navbar-inverse .nav-collapse .dropdown-menu a
|
69
71
|
color: $navbarInverseLinkColor
|
70
72
|
.navbar-inverse .nav-collapse .nav > li > a:hover,
|
71
|
-
.navbar-inverse .nav-collapse .
|
73
|
+
.navbar-inverse .nav-collapse .nav > li > a:focus,
|
74
|
+
.navbar-inverse .nav-collapse .dropdown-menu a:hover,
|
75
|
+
.navbar-inverse .nav-collapse .dropdown-menu a:focus
|
72
76
|
background-color: $navbarInverseBackground
|
73
77
|
// Buttons in the navbar
|
74
78
|
.nav-collapse.in .btn-group
|
@@ -2,6 +2,13 @@
|
|
2
2
|
// Responsive: Utility classes
|
3
3
|
// --------------------------------------------------
|
4
4
|
|
5
|
+
// IE10 Metro responsive
|
6
|
+
// Required for Windows 8 Metro split-screen snapping with IE10
|
7
|
+
// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
|
8
|
+
@-ms-viewport
|
9
|
+
width: device-width
|
10
|
+
|
11
|
+
|
5
12
|
// Hide from screenreaders and browsers
|
6
13
|
// Credit: HTML5 Boilerplate
|
7
14
|
.hidden
|
@@ -55,3 +62,15 @@
|
|
55
62
|
// Hide
|
56
63
|
.hidden-phone
|
57
64
|
display: none !important
|
65
|
+
|
66
|
+
// Print utilities
|
67
|
+
.visible-print
|
68
|
+
display: none !important
|
69
|
+
|
70
|
+
.hidden-print
|
71
|
+
|
72
|
+
@media print
|
73
|
+
.visible-print
|
74
|
+
display: inherit !important
|
75
|
+
.hidden-print
|
76
|
+
display: none !important
|
@@ -20,7 +20,8 @@ a
|
|
20
20
|
color: $linkColor
|
21
21
|
text-decoration: none
|
22
22
|
|
23
|
-
a:hover
|
23
|
+
a:hover,
|
24
|
+
a:focus
|
24
25
|
color: $linkColorHover
|
25
26
|
text-decoration: underline
|
26
27
|
|
@@ -35,7 +36,7 @@ a:hover
|
|
35
36
|
.img-polaroid
|
36
37
|
padding: 4px
|
37
38
|
background-color: #fff
|
38
|
-
border: 1px solid #
|
39
|
+
border: 1px solid #cccccc
|
39
40
|
border: 1px solid rgba(0, 0, 0, 0.2)
|
40
41
|
+ctb-box-shadow(0 1px 3px rgba(0, 0, 0, 0.1))
|
41
42
|
|
@@ -26,7 +26,7 @@
|
|
26
26
|
background-repeat: no-repeat
|
27
27
|
margin-top: 1px
|
28
28
|
|
29
|
-
/* White icons with optional class, or on hover/active states of certain elements
|
29
|
+
/* White icons with optional class, or on hover/focus/active states of certain elements
|
30
30
|
|
31
31
|
.icon-white,
|
32
32
|
.nav-pills > .active > a > [class^="icon-"],
|
@@ -36,15 +36,19 @@
|
|
36
36
|
.navbar-inverse .nav > .active > a > [class^="icon-"],
|
37
37
|
.navbar-inverse .nav > .active > a > [class*=" icon-"],
|
38
38
|
.dropdown-menu > li > a:hover > [class^="icon-"],
|
39
|
+
.dropdown-menu > li > a:focus > [class^="icon-"],
|
39
40
|
.dropdown-menu > li > a:hover > [class*=" icon-"],
|
41
|
+
.dropdown-menu > li > a:focus > [class*=" icon-"],
|
40
42
|
.dropdown-menu > .active > a > [class^="icon-"],
|
41
43
|
.dropdown-menu > .active > a > [class*=" icon-"],
|
42
44
|
.dropdown-submenu:hover > a > [class^="icon-"],
|
43
|
-
.dropdown-submenu:
|
45
|
+
.dropdown-submenu:focus > a > [class^="icon-"],
|
46
|
+
.dropdown-submenu:hover > a > [class*=" icon-"],
|
47
|
+
.dropdown-submenu:focus > a > [class*=" icon-"]
|
44
48
|
background-image: image-url(#{$iconWhiteSpritePath})
|
45
49
|
|
46
50
|
.icon-glass
|
47
|
-
background-position: 0
|
51
|
+
background-position: 0 0
|
48
52
|
|
49
53
|
.icon-music
|
50
54
|
background-position: -24px 0
|
@@ -399,6 +403,7 @@
|
|
399
403
|
|
400
404
|
.icon-folder-close
|
401
405
|
background-position: -384px -120px
|
406
|
+
width: 16px
|
402
407
|
|
403
408
|
.icon-folder-open
|
404
409
|
background-position: -408px -120px
|
@@ -78,21 +78,29 @@ table
|
|
78
78
|
tbody:first-child tr:first-child th,
|
79
79
|
tbody:first-child tr:first-child td
|
80
80
|
border-top: 0
|
81
|
-
// For first th
|
81
|
+
// For first th/td in the first row in the first thead or tbody
|
82
82
|
thead:first-child tr:first-child > th:first-child,
|
83
|
-
tbody:first-child tr:first-child > td:first-child
|
83
|
+
tbody:first-child tr:first-child > td:first-child,
|
84
|
+
tbody:first-child tr:first-child > th:first-child
|
84
85
|
+ctb-border-top-left-radius($baseBorderRadius)
|
86
|
+
// For last th/td in the first row in the first thead or tbody
|
85
87
|
thead:first-child tr:first-child > th:last-child,
|
86
|
-
tbody:first-child tr:first-child > td:last-child
|
88
|
+
tbody:first-child tr:first-child > td:last-child,
|
89
|
+
tbody:first-child tr:first-child > th:last-child
|
87
90
|
+ctb-border-top-right-radius($baseBorderRadius)
|
88
|
-
// For first th
|
91
|
+
// For first th/td (can be either) in the last row in the last thead, tbody, and tfoot
|
89
92
|
thead:last-child tr:last-child > th:first-child,
|
90
93
|
tbody:last-child tr:last-child > td:first-child,
|
91
|
-
|
94
|
+
tbody:last-child tr:last-child > th:first-child,
|
95
|
+
tfoot:last-child tr:last-child > td:first-child,
|
96
|
+
tfoot:last-child tr:last-child > th:first-child
|
92
97
|
+ctb-border-bottom-left-radius($baseBorderRadius)
|
98
|
+
// For last th/td (can be either) in the last row in the last thead, tbody, and tfoot
|
93
99
|
thead:last-child tr:last-child > th:last-child,
|
94
100
|
tbody:last-child tr:last-child > td:last-child,
|
95
|
-
|
101
|
+
tbody:last-child tr:last-child > th:last-child,
|
102
|
+
tfoot:last-child tr:last-child > td:last-child,
|
103
|
+
tfoot:last-child tr:last-child > th:last-child
|
96
104
|
+ctb-border-bottom-right-radius($baseBorderRadius)
|
97
105
|
// Clear border-radius for first and last td in the last row in the last tbody for table with tfoot
|
98
106
|
tfoot + tbody:last-child tr:last-child td:first-child
|
@@ -126,8 +134,8 @@ table
|
|
126
134
|
// Placed here since it has to come after the potential zebra striping
|
127
135
|
.table-hover
|
128
136
|
tbody
|
129
|
-
tr:hover td,
|
130
|
-
tr:hover th
|
137
|
+
tr:hover > td,
|
138
|
+
tr:hover > th
|
131
139
|
background-color: $tableBackgroundHover
|
132
140
|
|
133
141
|
// TABLE CELL SIZING
|
@@ -179,22 +187,22 @@ table th[class*="span"],
|
|
179
187
|
// Exact selectors below required to override .table-striped
|
180
188
|
|
181
189
|
.table tbody tr
|
182
|
-
&.success td
|
190
|
+
&.success > td
|
183
191
|
background-color: $successBackground
|
184
|
-
&.error td
|
192
|
+
&.error > td
|
185
193
|
background-color: $errorBackground
|
186
|
-
&.warning td
|
194
|
+
&.warning > td
|
187
195
|
background-color: $warningBackground
|
188
|
-
&.info td
|
196
|
+
&.info > td
|
189
197
|
background-color: $infoBackground
|
190
198
|
|
191
199
|
// Hover states for .table-hover
|
192
200
|
.table-hover tbody tr
|
193
|
-
&.success:hover td
|
201
|
+
&.success:hover > td
|
194
202
|
background-color: darken($successBackground, 5%)
|
195
|
-
&.error:hover td
|
203
|
+
&.error:hover > td
|
196
204
|
background-color: darken($errorBackground, 5%)
|
197
|
-
&.warning:hover td
|
205
|
+
&.warning:hover > td
|
198
206
|
background-color: darken($warningBackground, 5%)
|
199
|
-
&.info:hover td
|
207
|
+
&.info:hover > td
|
200
208
|
background-color: darken($infoBackground, 5%)
|
@@ -26,13 +26,15 @@
|
|
26
26
|
display: block
|
27
27
|
padding: 4px
|
28
28
|
line-height: $baseLineHeight
|
29
|
-
border: 1px solid #
|
29
|
+
border: 1px solid #dddddd
|
30
30
|
+ctb-border-radius($baseBorderRadius)
|
31
31
|
+ctb-box-shadow(0 1px 3px rgba(0, 0, 0, 0.055))
|
32
32
|
+ctb-transition(all 0.2s ease-in-out)
|
33
33
|
|
34
|
-
// Add a hover state for linked versions only
|
35
|
-
|
34
|
+
// Add a hover/focus state for linked versions only
|
35
|
+
|
36
|
+
a.thumbnail:hover,
|
37
|
+
a.thumbnail:focus
|
36
38
|
border-color: $linkColor
|
37
39
|
+ctb-box-shadow(0 1px 4px rgba(0, 105, 214, 0.25))
|
38
40
|
|
@@ -8,24 +8,28 @@
|
|
8
8
|
z-index: $zindexTooltip
|
9
9
|
display: block
|
10
10
|
visibility: visible
|
11
|
-
padding: 5px
|
12
11
|
font-size: 11px
|
12
|
+
line-height: 1.4
|
13
13
|
+ctb-opacity(0)
|
14
14
|
&.in
|
15
15
|
+ctb-opacity(80)
|
16
16
|
&.top
|
17
17
|
margin-top: -3px
|
18
|
+
padding: 5px 0
|
18
19
|
&.right
|
19
20
|
margin-left: 3px
|
21
|
+
padding: 0 5px
|
20
22
|
&.bottom
|
21
23
|
margin-top: 3px
|
24
|
+
padding: 5px 0
|
22
25
|
&.left
|
23
26
|
margin-left: -3px
|
27
|
+
padding: 0 5px
|
24
28
|
|
25
29
|
// Wrapper for the tooltip content
|
26
30
|
.tooltip-inner
|
27
31
|
max-width: 200px
|
28
|
-
padding:
|
32
|
+
padding: 8px
|
29
33
|
color: $tooltipColor
|
30
34
|
text-align: center
|
31
35
|
text-decoration: none
|
@@ -34,33 +34,47 @@ cite
|
|
34
34
|
.muted
|
35
35
|
color: $grayLight
|
36
36
|
|
37
|
-
a.muted:hover
|
37
|
+
a.muted:hover,
|
38
|
+
a.muted:focus
|
38
39
|
color: darken($grayLight, 10%)
|
39
40
|
|
40
41
|
.text-warning
|
41
42
|
color: $warningText
|
42
43
|
|
43
|
-
a.text-warning:hover
|
44
|
+
a.text-warning:hover,
|
45
|
+
a.text-warning:focus
|
44
46
|
color: darken($warningText, 10%)
|
45
47
|
|
46
48
|
.text-error
|
47
49
|
color: $errorText
|
48
50
|
|
49
|
-
a.text-error:hover
|
51
|
+
a.text-error:hover,
|
52
|
+
a.text-error:focus
|
50
53
|
color: darken($errorText, 10%)
|
51
54
|
|
52
55
|
.text-info
|
53
56
|
color: $infoText
|
54
57
|
|
55
|
-
a.text-info:hover
|
58
|
+
a.text-info:hover,
|
59
|
+
a.text-info:focus
|
56
60
|
color: darken($infoText, 10%)
|
57
61
|
|
58
62
|
.text-success
|
59
63
|
color: $successText
|
60
64
|
|
61
|
-
a.text-success:hover
|
65
|
+
a.text-success:hover,
|
66
|
+
a.text-success:focus
|
62
67
|
color: darken($successText, 10%)
|
63
68
|
|
69
|
+
.text-left
|
70
|
+
text-align: left
|
71
|
+
|
72
|
+
.text-right
|
73
|
+
text-align: right
|
74
|
+
|
75
|
+
.text-center
|
76
|
+
text-align: center
|
77
|
+
|
64
78
|
// Headings
|
65
79
|
// -------------------------
|
66
80
|
|
@@ -158,8 +172,9 @@ ul.inline,
|
|
158
172
|
ol.inline
|
159
173
|
margin-left: 0
|
160
174
|
list-style: none
|
161
|
-
|
175
|
+
> li
|
162
176
|
display: inline-block
|
177
|
+
+ctb-ie7-inline-block
|
163
178
|
padding-left: 5px
|
164
179
|
padding-right: 5px
|
165
180
|
|
@@ -218,7 +233,9 @@ blockquote
|
|
218
233
|
border-left: 5px solid $grayLighter
|
219
234
|
p
|
220
235
|
margin-bottom: 0
|
221
|
-
|
236
|
+
font-size: $baseFontSize * 1.25
|
237
|
+
font-weight: 300
|
238
|
+
line-height: 1.25
|
222
239
|
small
|
223
240
|
display: block
|
224
241
|
line-height: $baseLineHeight
|
@@ -47,13 +47,13 @@ $baseFontFamily: $sansFontFamily !default
|
|
47
47
|
$baseLineHeight: 20px !default
|
48
48
|
$altFontFamily: $serifFontFamily !default
|
49
49
|
|
50
|
-
$headingsFontFamily: inherit
|
50
|
+
$headingsFontFamily: inherit !default
|
51
51
|
|
52
52
|
// empty to use BS default, $baseFontFamily
|
53
|
-
$headingsFontWeight: bold
|
53
|
+
$headingsFontWeight: bold !default
|
54
54
|
|
55
55
|
// instead of browser default, bold
|
56
|
-
$headingsColor: inherit
|
56
|
+
$headingsColor: inherit !default
|
57
57
|
|
58
58
|
// empty to use BS default, $textColor
|
59
59
|
|
@@ -104,7 +104,7 @@ $tableBorder: #dddddd
|
|
104
104
|
// -------------------------
|
105
105
|
$btnBackground: $white !default
|
106
106
|
$btnBackgroundHighlight: darken($white, 10%) !default
|
107
|
-
$btnBorder: #
|
107
|
+
$btnBorder: #cccccc !default
|
108
108
|
|
109
109
|
$btnPrimaryBackground: $linkColor !default
|
110
110
|
$btnPrimaryBackgroundHighlight: adjust-hue($btnPrimaryBackground, 20%) !default
|
File without changes
|
File without changes
|