anjlab-bootstrap-rails 2.3.1.2 → 3.0.0.0.alpha1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (103) hide show
  1. checksums.yaml +4 -4
  2. data/.gitmodules +3 -0
  3. data/Rakefile +42 -26
  4. data/lib/bootstrap-rails.rb +5 -6
  5. data/lib/bootstrap-rails/engine.rb +2 -9
  6. data/lib/bootstrap-rails/version.rb +1 -1
  7. data/test/test_helper.rb +2 -2
  8. data/vendor/assets/fonts/twitter/glyphiconshalflings-regular.eot +0 -0
  9. data/vendor/assets/fonts/twitter/glyphiconshalflings-regular.otf +0 -0
  10. data/vendor/assets/fonts/twitter/glyphiconshalflings-regular.svg +175 -0
  11. data/vendor/assets/fonts/twitter/glyphiconshalflings-regular.ttf +0 -0
  12. data/vendor/assets/fonts/twitter/glyphiconshalflings-regular.woff +0 -0
  13. data/vendor/assets/javascripts/twitter/bootstrap.js +4 -5
  14. data/vendor/assets/javascripts/twitter/bootstrap/affix.js +50 -47
  15. data/vendor/assets/javascripts/twitter/bootstrap/alert.js +32 -35
  16. data/vendor/assets/javascripts/twitter/bootstrap/button.js +37 -37
  17. data/vendor/assets/javascripts/twitter/bootstrap/carousel.js +123 -127
  18. data/vendor/assets/javascripts/twitter/bootstrap/collapse.js +81 -95
  19. data/vendor/assets/javascripts/twitter/bootstrap/dropdown.js +61 -81
  20. data/vendor/assets/javascripts/twitter/bootstrap/modal.js +146 -151
  21. data/vendor/assets/javascripts/twitter/bootstrap/popover.js +53 -58
  22. data/vendor/assets/javascripts/twitter/bootstrap/scrollspy.js +99 -105
  23. data/vendor/assets/javascripts/twitter/bootstrap/tab.js +70 -81
  24. data/vendor/assets/javascripts/twitter/bootstrap/tooltip.js +246 -254
  25. data/vendor/assets/javascripts/twitter/bootstrap/transition.js +24 -37
  26. data/vendor/assets/stylesheets/twitter/bootstrap.scss +1 -1
  27. data/vendor/{frameworks/twitter/bootstrap/accordion.scss → assets/stylesheets/twitter/bootstrap/_accordion.scss} +2 -2
  28. data/vendor/assets/stylesheets/twitter/bootstrap/_alerts.scss +92 -0
  29. data/vendor/assets/stylesheets/twitter/bootstrap/_badges.scss +58 -0
  30. data/vendor/assets/stylesheets/twitter/bootstrap/_bootstrap.scss +64 -0
  31. data/vendor/assets/stylesheets/twitter/bootstrap/_breadcrumbs.scss +28 -0
  32. data/vendor/assets/stylesheets/twitter/bootstrap/_button-groups.scss +170 -0
  33. data/vendor/assets/stylesheets/twitter/bootstrap/_buttons.scss +160 -0
  34. data/vendor/assets/stylesheets/twitter/bootstrap/_carousel.scss +191 -0
  35. data/vendor/{frameworks/twitter/bootstrap/close.scss → assets/stylesheets/twitter/bootstrap/_close.scss} +7 -6
  36. data/vendor/{frameworks/twitter/bootstrap/code.scss → assets/stylesheets/twitter/bootstrap/_code.scss} +14 -14
  37. data/vendor/{frameworks/twitter/bootstrap/component-animations.scss → assets/stylesheets/twitter/bootstrap/_component-animations.scss} +1 -0
  38. data/vendor/{frameworks/twitter/bootstrap/dropdowns.scss → assets/stylesheets/twitter/bootstrap/_dropdowns.scss} +46 -57
  39. data/vendor/assets/stylesheets/twitter/bootstrap/_forms.scss +464 -0
  40. data/vendor/assets/stylesheets/twitter/bootstrap/_glyphicons.scss +200 -0
  41. data/vendor/assets/stylesheets/twitter/bootstrap/_grid.scss +65 -0
  42. data/vendor/assets/stylesheets/twitter/bootstrap/_jumbotron.scss +32 -0
  43. data/vendor/assets/stylesheets/twitter/bootstrap/_labels.scss +70 -0
  44. data/vendor/assets/stylesheets/twitter/bootstrap/_list-group.scss +96 -0
  45. data/vendor/{frameworks/twitter/bootstrap/media.scss → assets/stylesheets/twitter/bootstrap/_media.scss} +0 -1
  46. data/vendor/assets/stylesheets/twitter/bootstrap/_mixins.scss +510 -0
  47. data/vendor/assets/stylesheets/twitter/bootstrap/_modals.scss +137 -0
  48. data/vendor/assets/stylesheets/twitter/bootstrap/_navbar.scss +356 -0
  49. data/vendor/assets/stylesheets/twitter/bootstrap/_navs.scss +249 -0
  50. data/vendor/assets/stylesheets/twitter/bootstrap/_normalize.scss +396 -0
  51. data/vendor/assets/stylesheets/twitter/bootstrap/_pager.scss +54 -0
  52. data/vendor/assets/stylesheets/twitter/bootstrap/_pagination.scss +87 -0
  53. data/vendor/assets/stylesheets/twitter/bootstrap/_panels.scss +96 -0
  54. data/vendor/{frameworks/twitter/bootstrap/popovers.scss → assets/stylesheets/twitter/bootstrap/_popovers.scss} +32 -32
  55. data/vendor/assets/stylesheets/twitter/bootstrap/_print.scss +74 -0
  56. data/vendor/{frameworks/twitter/bootstrap/progress-bars.scss → assets/stylesheets/twitter/bootstrap/_progress-bars.scss} +40 -44
  57. data/vendor/assets/stylesheets/twitter/bootstrap/_responsive-utilities.scss +77 -0
  58. data/vendor/assets/stylesheets/twitter/bootstrap/_scaffolding.scss +83 -0
  59. data/vendor/assets/stylesheets/twitter/bootstrap/_tables.scss +242 -0
  60. data/vendor/assets/stylesheets/twitter/bootstrap/_thumbnails.scss +43 -0
  61. data/vendor/{frameworks/twitter/bootstrap/tooltip.scss → assets/stylesheets/twitter/bootstrap/_tooltip.scss} +20 -19
  62. data/vendor/assets/stylesheets/twitter/bootstrap/_type.scss +253 -0
  63. data/vendor/{frameworks/twitter/bootstrap/utilities.scss → assets/stylesheets/twitter/bootstrap/_utilities.scss} +17 -5
  64. data/vendor/assets/stylesheets/twitter/bootstrap/_variables.scss +416 -0
  65. data/vendor/{frameworks/twitter/bootstrap/wells.scss → assets/stylesheets/twitter/bootstrap/_wells.scss} +5 -5
  66. metadata +49 -53
  67. data/lib/bootstrap-rails/ie_hex_str.rb +0 -16
  68. data/test/ie_hex_str_test.rb +0 -26
  69. data/vendor/assets/images/twitter/glyphicons-halflings-white.png +0 -0
  70. data/vendor/assets/images/twitter/glyphicons-halflings.png +0 -0
  71. data/vendor/assets/javascripts/twitter/bootstrap/typeahead.js +0 -335
  72. data/vendor/assets/stylesheets/twitter/bootstrap-responsive.scss +0 -1
  73. data/vendor/frameworks/twitter/bootstrap.scss +0 -1
  74. data/vendor/frameworks/twitter/bootstrap/alerts.scss +0 -79
  75. data/vendor/frameworks/twitter/bootstrap/bootstrap.scss +0 -63
  76. data/vendor/frameworks/twitter/bootstrap/breadcrumbs.scss +0 -24
  77. data/vendor/frameworks/twitter/bootstrap/button-groups.scss +0 -230
  78. data/vendor/frameworks/twitter/bootstrap/buttons.scss +0 -228
  79. data/vendor/frameworks/twitter/bootstrap/carousel.scss +0 -158
  80. data/vendor/frameworks/twitter/bootstrap/forms.scss +0 -690
  81. data/vendor/frameworks/twitter/bootstrap/grid.scss +0 -21
  82. data/vendor/frameworks/twitter/bootstrap/hero-unit.scss +0 -25
  83. data/vendor/frameworks/twitter/bootstrap/labels-badges.scss +0 -83
  84. data/vendor/frameworks/twitter/bootstrap/layouts.scss +0 -16
  85. data/vendor/frameworks/twitter/bootstrap/mixins.scss +0 -704
  86. data/vendor/frameworks/twitter/bootstrap/modals.scss +0 -95
  87. data/vendor/frameworks/twitter/bootstrap/navbar.scss +0 -496
  88. data/vendor/frameworks/twitter/bootstrap/navs.scss +0 -409
  89. data/vendor/frameworks/twitter/bootstrap/pager.scss +0 -43
  90. data/vendor/frameworks/twitter/bootstrap/pagination.scss +0 -123
  91. data/vendor/frameworks/twitter/bootstrap/reset.scss +0 -216
  92. data/vendor/frameworks/twitter/bootstrap/responsive-1200px-min.scss +0 -28
  93. data/vendor/frameworks/twitter/bootstrap/responsive-767px-max.scss +0 -189
  94. data/vendor/frameworks/twitter/bootstrap/responsive-768px-979px.scss +0 -19
  95. data/vendor/frameworks/twitter/bootstrap/responsive-navbar.scss +0 -189
  96. data/vendor/frameworks/twitter/bootstrap/responsive-utilities.scss +0 -59
  97. data/vendor/frameworks/twitter/bootstrap/responsive.scss +0 -48
  98. data/vendor/frameworks/twitter/bootstrap/scaffolding.scss +0 -53
  99. data/vendor/frameworks/twitter/bootstrap/sprites.scss +0 -197
  100. data/vendor/frameworks/twitter/bootstrap/tables.scss +0 -235
  101. data/vendor/frameworks/twitter/bootstrap/thumbnails.scss +0 -53
  102. data/vendor/frameworks/twitter/bootstrap/type.scss +0 -246
  103. data/vendor/frameworks/twitter/bootstrap/variables.scss +0 -295
@@ -0,0 +1,160 @@
1
+ //
2
+ // Buttons
3
+ // --------------------------------------------------
4
+
5
+
6
+ // Base styles
7
+ // --------------------------------------------------
8
+
9
+ // Core styles
10
+ .btn {
11
+ display: inline-block;
12
+ padding: $padding-base-vertical $padding-base-horizontal;
13
+ margin-bottom: 0; // For input.btn
14
+ font-size: $font-size-base;
15
+ font-weight: 500;
16
+ line-height: $line-height-base;
17
+ text-align: center;
18
+ vertical-align: middle;
19
+ cursor: pointer;
20
+ border: 1px solid transparent;
21
+ border-radius: $border-radius-base;
22
+ white-space: nowrap;
23
+
24
+ &:focus {
25
+ @include tab-focus();
26
+ }
27
+
28
+ &:hover,
29
+ &:focus {
30
+ color: #fff;
31
+ text-decoration: none;
32
+ }
33
+
34
+ &:active,
35
+ &.active {
36
+ outline: 0;
37
+ background-image: none;
38
+ @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
39
+ }
40
+
41
+ &.disabled,
42
+ &[disabled],
43
+ fieldset[disabled] & {
44
+ cursor: default;
45
+ pointer-events: none; // Future-proof disabling of clicks
46
+ @include opacity(.65);
47
+ @include box-shadow(none);
48
+ }
49
+
50
+ }
51
+
52
+
53
+ // Alternate buttons
54
+ // --------------------------------------------------
55
+
56
+ .btn-default {
57
+ @include btn-pseudo-states($btn-default-color, $btn-default-bg, $btn-default-border);
58
+ }
59
+ .btn-primary {
60
+ @include btn-pseudo-states($btn-primary-color, $btn-primary-bg, $btn-primary-border);
61
+ }
62
+ // Warning appears as orange
63
+ .btn-warning {
64
+ @include btn-pseudo-states($btn-warning-color, $btn-warning-bg, $btn-warning-border);
65
+ }
66
+ // Danger and error appear as red
67
+ .btn-danger {
68
+ @include btn-pseudo-states($btn-danger-color, $btn-danger-bg, $btn-danger-border);
69
+ }
70
+ // Success appears as green
71
+ .btn-success {
72
+ @include btn-pseudo-states($btn-success-color, $btn-success-bg, $btn-success-border);
73
+ }
74
+ // Info appears as blue-green
75
+ .btn-info {
76
+ @include btn-pseudo-states($btn-info-color, $btn-info-bg, $btn-info-border);
77
+ }
78
+
79
+
80
+ // Link buttons
81
+ // -------------------------
82
+
83
+ // Make a button look and behave like a link
84
+ .btn-link,
85
+ .btn-link:active,
86
+ .btn-link[disabled],
87
+ fieldset[disabled] .btn-link {
88
+ background-color: transparent;
89
+ background-image: none;
90
+ @include box-shadow(none);
91
+ }
92
+ .btn-link,
93
+ .btn-link:hover,
94
+ .btn-link:focus,
95
+ .btn-link:active {
96
+ border-color: transparent;
97
+ }
98
+ .btn-link {
99
+ color: $link-color;
100
+ font-weight: normal;
101
+ cursor: pointer;
102
+ border-radius: 0;
103
+ }
104
+ .btn-link:hover,
105
+ .btn-link:focus {
106
+ color: $link-hover-color;
107
+ text-decoration: underline;
108
+ background-color: transparent;
109
+ }
110
+ .btn-link {
111
+ &[disabled],
112
+ fieldset[disabled] & {
113
+ &:hover,
114
+ &:focus {
115
+ color: $gray-dark;
116
+ text-decoration: none;
117
+ }
118
+ }
119
+ }
120
+
121
+
122
+ // Button Sizes
123
+ // --------------------------------------------------
124
+
125
+ .btn-large {
126
+ padding: $padding-large-vertical $padding-large-horizontal;
127
+ font-size: $font-size-large;
128
+ border-radius: $border-radius-large;
129
+ }
130
+ .btn-small {
131
+ padding: $padding-small-vertical $padding-small-horizontal;
132
+ font-size: $font-size-small;
133
+ line-height: 1.5; // ensure proper height of button next to small input
134
+ border-radius: $border-radius-small;
135
+ }
136
+
137
+
138
+ // Block button
139
+ // --------------------------------------------------
140
+
141
+ .btn-block {
142
+ display: block;
143
+ width: 100%;
144
+ padding-left: 0;
145
+ padding-right: 0;
146
+ }
147
+
148
+ // Vertically space out multiple block buttons
149
+ .btn-block + .btn-block {
150
+ margin-top: 5px;
151
+ }
152
+
153
+ // Specificity overrides
154
+ input[type="submit"],
155
+ input[type="reset"],
156
+ input[type="button"] {
157
+ &.btn-block {
158
+ width: 100%;
159
+ }
160
+ }
@@ -0,0 +1,191 @@
1
+ //
2
+ // Carousel
3
+ // --------------------------------------------------
4
+
5
+
6
+ // Wrapper for the slide container and indicators
7
+ .carousel {
8
+ position: relative;
9
+ }
10
+
11
+ // Wrap all slides, but only show the active one
12
+ .carousel-inner {
13
+ position: relative;
14
+ overflow: hidden;
15
+ width: 100%;
16
+ }
17
+
18
+ // Immediate parent of all slides
19
+ .carousel-inner {
20
+
21
+ > .item {
22
+ display: none;
23
+ position: relative;
24
+ @include transition(.6s ease-in-out left);
25
+
26
+ // Account for jankitude on images
27
+ > img,
28
+ > a > img {
29
+ display: block;
30
+ line-height: 1;
31
+ }
32
+ }
33
+
34
+ > .active,
35
+ > .next,
36
+ > .prev { display: block; }
37
+
38
+ > .active {
39
+ left: 0;
40
+ }
41
+
42
+ > .next,
43
+ > .prev {
44
+ position: absolute;
45
+ top: 0;
46
+ width: 100%;
47
+ }
48
+
49
+ > .next {
50
+ left: 100%;
51
+ }
52
+ > .prev {
53
+ left: -100%;
54
+ }
55
+ > .next.left,
56
+ > .prev.right {
57
+ left: 0;
58
+ }
59
+
60
+ > .active.left {
61
+ left: -100%;
62
+ }
63
+ > .active.right {
64
+ left: 100%;
65
+ }
66
+
67
+ }
68
+
69
+ // Left/right controls for nav
70
+ // ---------------------------
71
+
72
+ .carousel-control {
73
+ position: absolute;
74
+ top: 0;
75
+ left: 0;
76
+ bottom: 0;
77
+ width: 15%;
78
+ @include opacity(.5);
79
+ font-size: 20px;
80
+ color: #fff;
81
+ text-align: center;
82
+ text-shadow: 0 1px 2px rgba(0,0,0,.6);
83
+
84
+ // we can't have this transition here
85
+ // because webkit cancels the carousel
86
+ // animation if you trip this while
87
+ // in the middle of another animation
88
+ // ;_;
89
+ // .transition(opacity .2s linear);
90
+
91
+ // Set gradients for backgrounds
92
+ &.left {
93
+ @include gradient-horizontal(rgba(0,0,0,.5), rgba(0,0,0,.0001));
94
+ background-color: transparent;
95
+ }
96
+ &.right {
97
+ left: auto;
98
+ right: 0;
99
+ @include gradient-horizontal(rgba(0,0,0,.0001), rgba(0,0,0,.5));
100
+ background-color: transparent;
101
+ }
102
+
103
+ // Hover/focus state
104
+ &:hover,
105
+ &:focus {
106
+ color: #fff;
107
+ text-decoration: none;
108
+ @include opacity(.9);
109
+ }
110
+
111
+ // Toggles
112
+ .glyphicon {
113
+ position: absolute;
114
+ top: 50%;
115
+ left: 50%;
116
+ z-index: 5;
117
+ display: inline-block;
118
+ width: 20px;
119
+ height: 20px;
120
+ margin-top: -10px;
121
+ margin-left: -10px;
122
+ }
123
+ }
124
+
125
+ // Optional indicator pips
126
+ // -----------------------------
127
+ .carousel-indicators {
128
+ position: absolute;
129
+ bottom: 20px;
130
+ left: 50%;
131
+ z-index: 15;
132
+ width: 100px;
133
+ margin: 0 0 0 -50px;
134
+ list-style: none;
135
+ text-align: center;
136
+
137
+ li {
138
+ display: inline-block;
139
+ width: 8px;
140
+ height: 8px;
141
+ margin-left: 0;
142
+ margin-right: 0;
143
+ text-indent: -999px;
144
+ border: 1px solid #fff;
145
+ border-radius: 5px;
146
+ cursor: pointer;
147
+ }
148
+ .active {
149
+ background-color: #fff;
150
+ }
151
+ }
152
+
153
+ // Optional captions
154
+ // -----------------------------
155
+ // Hidden by default for smaller viewports
156
+ .carousel-caption {
157
+ position: absolute;
158
+ left: 15%;
159
+ right: 15%;
160
+ bottom: 20px;
161
+ z-index: 10;
162
+ padding-top: 20px;
163
+ padding-bottom: 20px;
164
+ color: #fff;
165
+ text-align: center;
166
+ text-shadow: 0 1px 2px rgba(0,0,0,.6);
167
+ & .btn {
168
+ text-shadow: none; // No shadow for button elements in carousel-caption
169
+ }
170
+ }
171
+
172
+
173
+ // Scale up controls for tablets and up
174
+ @media screen and (min-width: $screen-tablet) {
175
+
176
+ // Scale up the controls a smidge
177
+ .carousel-control .glyphicon {
178
+ width: 30px;
179
+ height: 30px;
180
+ margin-top: -15px;
181
+ margin-left: -15px;
182
+ font-size: 30px;
183
+ }
184
+
185
+ // Show and left align the captions
186
+ .carousel-caption {
187
+ left: 20%;
188
+ right: 20%;
189
+ padding-bottom: 30px;
190
+ }
191
+ }
@@ -5,18 +5,19 @@
5
5
 
6
6
  .close {
7
7
  float: right;
8
- font-size: 20px;
8
+ font-size: ($font-size-base * 1.5);
9
9
  font-weight: bold;
10
- line-height: $baseLineHeight;
11
- color: $black;
10
+ line-height: 1;
11
+ color: #000;
12
12
  text-shadow: 0 1px 0 rgba(255,255,255,1);
13
- @include opacity(20);
13
+ @include opacity(.2);
14
+
14
15
  &:hover,
15
16
  &:focus {
16
- color: $black;
17
+ color: #000;
17
18
  text-decoration: none;
18
19
  cursor: pointer;
19
- @include opacity(40);
20
+ @include opacity(.5);
20
21
  }
21
22
  }
22
23
 
@@ -7,40 +7,40 @@
7
7
  code,
8
8
  pre {
9
9
  padding: 0 3px 2px;
10
- @include font-family-monospace;
11
- font-size: $baseFontSize - 2;
12
- color: $grayDark;
13
- @include border-radius(3px);
10
+ font-family: $font-family-monospace;
11
+ font-size: ($font-size-base - 2);
12
+ color: $gray-dark;
13
+ border-radius: 4px;
14
14
  }
15
15
 
16
16
  // Inline code
17
17
  code {
18
18
  padding: 2px 4px;
19
- color: #d14;
20
- background-color: #f7f7f9;
21
- border: 1px solid #e1e1e8;
19
+ font-size: 90%;
20
+ color: #c7254e;
21
+ background-color: #f9f2f4;
22
22
  white-space: nowrap;
23
23
  }
24
24
 
25
25
  // Blocks of code
26
26
  pre {
27
27
  display: block;
28
- padding: ($baseLineHeight - 1) / 2;
29
- margin: 0 0 $baseLineHeight / 2;
30
- font-size: $baseFontSize - 1; // 14px to 13px
31
- line-height: $baseLineHeight;
28
+ padding: (($line-height-computed - 1) / 2);
29
+ margin: 0 0 ($line-height-computed / 2);
30
+ font-size: ($font-size-base - 1); // 14px to 13px
31
+ line-height: $line-height-base;
32
32
  word-break: break-all;
33
33
  word-wrap: break-word;
34
34
  white-space: pre;
35
35
  white-space: pre-wrap;
36
36
  background-color: #f5f5f5;
37
- border: 1px solid #ccc; // fallback for IE7-8
37
+ border: 1px solid #ccc; // IE8 fallback
38
38
  border: 1px solid rgba(0,0,0,.15);
39
- @include border-radius($baseBorderRadius);
39
+ border-radius: $border-radius-base;
40
40
 
41
41
  // Make prettyprint styles more spaced out for readability
42
42
  &.prettyprint {
43
- margin-bottom: $baseLineHeight;
43
+ margin-bottom: $line-height-computed;
44
44
  }
45
45
 
46
46
  // Account for some code outputs that place code tags in pre tags
@@ -16,6 +16,7 @@
16
16
  height: 0;
17
17
  overflow: hidden;
18
18
  @include transition(height .35s ease);
19
+
19
20
  &.in {
20
21
  height: auto;
21
22
  }
@@ -3,62 +3,39 @@
3
3
  // --------------------------------------------------
4
4
 
5
5
 
6
- // Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns
7
- .dropup,
8
- .dropdown {
9
- position: relative;
10
- }
11
- .dropdown-toggle {
12
- // The caret makes the toggle a bit too tall in IE7
13
- *margin-bottom: -3px;
14
- }
15
- .dropdown-toggle:active,
16
- .open .dropdown-toggle {
17
- outline: 0;
18
- }
19
-
20
6
  // Dropdown arrow/caret
21
7
  // --------------------
22
8
  .caret {
23
9
  display: inline-block;
24
10
  width: 0;
25
11
  height: 0;
26
- vertical-align: top;
27
- border-top: 4px solid $black;
12
+ margin-left: 2px;
13
+ vertical-align: middle;
14
+ border-top: 4px solid #000;
28
15
  border-right: 4px solid transparent;
29
16
  border-left: 4px solid transparent;
30
17
  content: "";
31
18
  }
32
19
 
33
- // Place the caret
34
- .dropdown .caret {
35
- margin-top: 8px;
36
- margin-left: 2px;
37
- }
38
-
39
20
  // The dropdown menu (ul)
40
21
  // ----------------------
41
22
  .dropdown-menu {
42
23
  position: absolute;
43
24
  top: 100%;
44
25
  left: 0;
45
- z-index: $zindexDropdown;
26
+ z-index: $zindex-dropdown;
46
27
  display: none; // none by default, but block on "open" of the menu
47
28
  float: left;
48
29
  min-width: 160px;
49
30
  padding: 5px 0;
50
31
  margin: 2px 0 0; // override default ul
51
32
  list-style: none;
52
- background-color: $dropdownBackground;
53
- border: 1px solid #ccc; // Fallback for IE7-8
54
- border: 1px solid $dropdownBorder;
55
- *border-right-width: 2px;
56
- *border-bottom-width: 2px;
57
- @include border-radius(6px);
58
- @include box-shadow(0 5px 10px rgba(0,0,0,.2));
59
- -webkit-background-clip: padding-box;
60
- -moz-background-clip: padding;
61
- background-clip: padding-box;
33
+ background-color: $dropdown-bg;
34
+ border: 1px solid #ccc; // IE8 fallback
35
+ border: 1px solid $dropdown-border;
36
+ border-radius: $border-radius-base;
37
+ @include box-shadow(0 6px 12px rgba(0,0,0,.175));
38
+ @include background-clip(padding-box);
62
39
 
63
40
  // Aligns the dropdown menu to right
64
41
  &.pull-right {
@@ -68,7 +45,7 @@
68
45
 
69
46
  // Dividers (basically an hr) within the dropdown
70
47
  .divider {
71
- @include nav-divider($dropdownDividerTop, $dropdownDividerBottom);
48
+ @include nav-divider($dropdown-divider-top, $dropdown-divider-bottom);
72
49
  }
73
50
 
74
51
  // Links within the dropdown menu
@@ -77,9 +54,9 @@
77
54
  padding: 3px 20px;
78
55
  clear: both;
79
56
  font-weight: normal;
80
- line-height: $baseLineHeight;
81
- color: $dropdownLinkColor;
82
- white-space: nowrap;
57
+ line-height: $line-height-base;
58
+ color: $dropdown-link-color;
59
+ white-space: nowrap; // prevent links from randomly breaking onto new lines
83
60
  }
84
61
  }
85
62
 
@@ -90,8 +67,8 @@
90
67
  .dropdown-submenu:hover > a,
91
68
  .dropdown-submenu:focus > a {
92
69
  text-decoration: none;
93
- color: $dropdownLinkColorHover;
94
- @include gradient-vertical($dropdownLinkBackgroundHover, darken($dropdownLinkBackgroundHover, 5%));
70
+ color: $dropdown-link-hover-color;
71
+ @include gradient-vertical($dropdown-link-hover-bg, darken($dropdown-link-hover-bg, 5%));
95
72
  }
96
73
 
97
74
  // Active state
@@ -99,10 +76,10 @@
99
76
  .dropdown-menu > .active > a,
100
77
  .dropdown-menu > .active > a:hover,
101
78
  .dropdown-menu > .active > a:focus {
102
- color: $dropdownLinkColorActive;
79
+ color: $dropdown-link-active-color;
103
80
  text-decoration: none;
104
81
  outline: 0;
105
- @include gradient-vertical($dropdownLinkBackgroundActive, darken($dropdownLinkBackgroundActive, 5%));
82
+ @include gradient-vertical($dropdown-link-active-bg, darken($dropdown-link-active-bg, 5%));
106
83
  }
107
84
 
108
85
  // Disabled state
@@ -111,7 +88,7 @@
111
88
  .dropdown-menu > .disabled > a,
112
89
  .dropdown-menu > .disabled > a:hover,
113
90
  .dropdown-menu > .disabled > a:focus {
114
- color: $grayLight;
91
+ color: $gray-light;
115
92
  }
116
93
  // Nuke hover/focus effects
117
94
  .dropdown-menu > .disabled > a:hover,
@@ -126,13 +103,27 @@
126
103
  // Open state for the dropdown
127
104
  // ---------------------------
128
105
  .open {
129
- // IE7's z-index only goes to the nearest positioned ancestor, which would
130
- // make the menu appear below buttons that appeared later on the page
131
- *z-index: $zindexDropdown;
132
-
133
- & > .dropdown-menu {
106
+ // Show the menu
107
+ > .dropdown-menu {
134
108
  display: block;
135
109
  }
110
+
111
+ // Remove the outline when :focus is triggered
112
+ > a {
113
+ outline: 0;
114
+ }
115
+ }
116
+
117
+
118
+ // Backdrop to catch body clicks on mobile, etc.
119
+ // ---------------------------
120
+ .dropdown-backdrop {
121
+ position: fixed;
122
+ left: 0;
123
+ right: 0;
124
+ bottom: 0;
125
+ top: 0;
126
+ z-index: $zindex-dropdown - 10;
136
127
  }
137
128
 
138
129
  // Right aligned dropdowns
@@ -151,7 +142,7 @@
151
142
  // Reverse the caret
152
143
  .caret {
153
144
  border-top: 0;
154
- border-bottom: 4px solid $black;
145
+ border-bottom: 4px solid #000;
155
146
  content: "";
156
147
  }
157
148
  // Different positioning for bottom up menu
@@ -173,7 +164,7 @@
173
164
  left: 100%;
174
165
  margin-top: -6px;
175
166
  margin-left: -1px;
176
- @include border-radius(0 6px 6px 6px);
167
+ border-top-left-radius: 0; // Nuke the closest corner as appropriate
177
168
  }
178
169
  .dropdown-submenu:hover > .dropdown-menu {
179
170
  display: block;
@@ -185,7 +176,7 @@
185
176
  bottom: 0;
186
177
  margin-top: 0;
187
178
  margin-bottom: -2px;
188
- @include border-radius(5px 5px 5px 0);
179
+ border-bottom-left-radius: 0; // Nuke the closest corner as appropriate
189
180
  }
190
181
 
191
182
  // Caret to indicate there is a submenu
@@ -198,12 +189,12 @@
198
189
  border-color: transparent;
199
190
  border-style: solid;
200
191
  border-width: 5px 0 5px 5px;
201
- border-left-color: darken($dropdownBackground, 20%);
192
+ border-left-color: darken($dropdown-bg, 20%);
202
193
  margin-top: 5px;
203
194
  margin-right: -10px;
204
195
  }
205
196
  .dropdown-submenu:hover > a:after {
206
- border-left-color: $dropdownLinkColorHover;
197
+ border-left-color: $dropdown-link-hover-color;
207
198
  }
208
199
 
209
200
  // Left aligned submenus
@@ -216,12 +207,12 @@
216
207
  > .dropdown-menu {
217
208
  left: -100%;
218
209
  margin-left: 10px;
219
- @include border-radius(6px 0 6px 6px);
210
+ border-top-right-radius: 0; // Remove the rounded corner here
220
211
  }
221
212
  }
222
213
 
223
214
  // Tweak nav headers
224
- // -----------------
215
+ // ---------------------------
225
216
  // Increase padding from 15px to 20px on sides
226
217
  .dropdown .dropdown-menu .nav-header {
227
218
  padding-left: 20px;
@@ -229,9 +220,7 @@
229
220
  }
230
221
 
231
222
  // Typeahead
232
- // ---------
223
+ // ---------------------------
233
224
  .typeahead {
234
225
  z-index: 1051;
235
- margin-top: 2px; // give it some space to breathe
236
- @include border-radius($baseBorderRadius);
237
226
  }