twigg-app 0.0.1 → 0.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (208) hide show
  1. checksums.yaml +4 -4
  2. data/assets/javascripts/_bootstrap.js +7 -0
  3. data/assets/javascripts/_jquery.js +19 -0
  4. data/assets/javascripts/_tables.js +3 -0
  5. data/assets/javascripts/_views.js +10 -0
  6. data/assets/javascripts/application.js +9 -0
  7. data/{public/application.js → assets/javascripts/views/_commit_set_bar_chart.js} +32 -34
  8. data/assets/javascripts/views/_russia.js +61 -0
  9. data/assets/javascripts/views/_tags.js +56 -0
  10. data/assets/javascripts/views/_tags_word_cloud.js +51 -0
  11. data/assets/stylesheets/_bootstrap_overrides.scss +15 -0
  12. data/assets/stylesheets/_footer.scss +28 -0
  13. data/assets/stylesheets/_global.scss +14 -0
  14. data/assets/stylesheets/_tables.scss +20 -0
  15. data/assets/stylesheets/application.scss +10 -0
  16. data/assets/stylesheets/d3/_bar_chart.scss +25 -0
  17. data/assets/stylesheets/d3/_bubble_chart.scss +22 -0
  18. data/lib/twigg-app/app/routes.rb +4 -0
  19. data/lib/twigg-app/app/server.rb +78 -21
  20. data/lib/twigg-app/app/version.rb +1 -1
  21. data/public/vendor/bootstrap/Gruntfile.js +32 -10
  22. data/public/vendor/bootstrap/README.md +2 -0
  23. data/public/vendor/bootstrap/_config.yml +5 -10
  24. data/public/vendor/bootstrap/_includes/footer.html +2 -1
  25. data/public/vendor/bootstrap/_includes/nav-components.html +33 -31
  26. data/public/vendor/bootstrap/_includes/nav-css.html +32 -22
  27. data/public/vendor/bootstrap/_includes/nav-getting-started.html +17 -1
  28. data/public/vendor/bootstrap/_includes/nav-javascript.html +1 -1
  29. data/public/vendor/bootstrap/_includes/nav-main.html +1 -1
  30. data/public/vendor/bootstrap/_includes/social-buttons.html +1 -1
  31. data/public/vendor/bootstrap/_layouts/default.html +18 -14
  32. data/public/vendor/bootstrap/_layouts/home.html +9 -6
  33. data/public/vendor/bootstrap/assets/css/docs.css +584 -396
  34. data/public/vendor/bootstrap/assets/ico/apple-touch-icon-114-precomposed.png +0 -0
  35. data/public/vendor/bootstrap/assets/ico/apple-touch-icon-144-precomposed.png +0 -0
  36. data/public/vendor/bootstrap/assets/ico/apple-touch-icon-57-precomposed.png +0 -0
  37. data/public/vendor/bootstrap/assets/ico/apple-touch-icon-72-precomposed.png +0 -0
  38. data/public/vendor/bootstrap/assets/ico/favicon.png +0 -0
  39. data/public/vendor/bootstrap/assets/js/application.js +2 -1
  40. data/public/vendor/bootstrap/assets/js/customizer.js +160 -45
  41. data/public/vendor/bootstrap/assets/js/filesaver.js +169 -0
  42. data/public/vendor/bootstrap/assets/js/jquery.js +6 -5
  43. data/public/vendor/bootstrap/assets/js/raw-files.js +3 -0
  44. data/public/vendor/bootstrap/bower.json +1 -1
  45. data/public/vendor/bootstrap/components.html +787 -364
  46. data/public/vendor/bootstrap/composer.json +1 -1
  47. data/public/vendor/bootstrap/css.html +413 -248
  48. data/public/vendor/bootstrap/customize.html +413 -447
  49. data/public/vendor/bootstrap/dist/css/bootstrap-theme.css +384 -0
  50. data/public/vendor/bootstrap/dist/css/bootstrap-theme.min.css +1 -0
  51. data/public/vendor/bootstrap/dist/css/bootstrap.css +3033 -1807
  52. data/public/vendor/bootstrap/dist/css/bootstrap.min.css +1 -1
  53. data/public/vendor/bootstrap/dist/fonts/glyphicons-halflings-regular.eot +0 -0
  54. data/public/vendor/bootstrap/dist/fonts/glyphicons-halflings-regular.svg +228 -0
  55. data/public/vendor/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf +0 -0
  56. data/public/vendor/bootstrap/dist/fonts/glyphicons-halflings-regular.woff +0 -0
  57. data/public/vendor/bootstrap/dist/js/bootstrap.js +18 -12
  58. data/public/vendor/bootstrap/dist/js/bootstrap.min.js +1 -1
  59. data/public/vendor/bootstrap/examples/carousel/carousel.css +128 -0
  60. data/public/vendor/bootstrap/examples/carousel/index.html +201 -0
  61. data/public/vendor/bootstrap/examples/grid/grid.css +28 -0
  62. data/public/vendor/bootstrap/examples/grid/index.html +119 -0
  63. data/public/vendor/bootstrap/examples/jumbotron/index.html +111 -0
  64. data/public/vendor/bootstrap/examples/jumbotron/jumbotron.css +5 -0
  65. data/public/vendor/bootstrap/examples/jumbotron-narrow/index.html +78 -0
  66. data/public/vendor/bootstrap/examples/jumbotron-narrow/jumbotron-narrow.css +79 -0
  67. data/public/vendor/bootstrap/examples/justified-nav/index.html +79 -0
  68. data/public/vendor/bootstrap/examples/justified-nav/justified-nav.css +88 -0
  69. data/public/vendor/bootstrap/examples/navbar/index.html +83 -0
  70. data/public/vendor/bootstrap/examples/navbar/navbar.css +7 -0
  71. data/public/vendor/bootstrap/examples/navbar-fixed-top/index.html +86 -0
  72. data/public/vendor/bootstrap/examples/navbar-fixed-top/navbar-fixed-top.css +4 -0
  73. data/public/vendor/bootstrap/examples/navbar-static-top/index.html +87 -0
  74. data/public/vendor/bootstrap/examples/navbar-static-top/navbar-static-top.css +7 -0
  75. data/public/vendor/bootstrap/examples/non-responsive/index.html +96 -0
  76. data/public/vendor/bootstrap/examples/non-responsive/non-responsive.css +117 -0
  77. data/public/vendor/bootstrap/examples/offcanvas/index.html +127 -0
  78. data/public/vendor/bootstrap/examples/offcanvas/offcanvas.css +48 -0
  79. data/public/vendor/bootstrap/examples/offcanvas/offcanvas.js +5 -0
  80. data/public/vendor/bootstrap/examples/screenshots/carousel.jpg +0 -0
  81. data/public/vendor/bootstrap/examples/screenshots/grid.jpg +0 -0
  82. data/public/vendor/bootstrap/examples/screenshots/jumbotron-narrow.jpg +0 -0
  83. data/public/vendor/bootstrap/examples/screenshots/jumbotron.jpg +0 -0
  84. data/public/vendor/bootstrap/examples/screenshots/justified-nav.jpg +0 -0
  85. data/public/vendor/bootstrap/examples/screenshots/navbar-fixed.jpg +0 -0
  86. data/public/vendor/bootstrap/examples/screenshots/navbar-static.jpg +0 -0
  87. data/public/vendor/bootstrap/examples/screenshots/navbar.jpg +0 -0
  88. data/public/vendor/bootstrap/examples/screenshots/non-responsive.jpg +0 -0
  89. data/public/vendor/bootstrap/examples/screenshots/offcanvas.jpg +0 -0
  90. data/public/vendor/bootstrap/examples/screenshots/sign-in.jpg +0 -0
  91. data/public/vendor/bootstrap/examples/screenshots/starter-template.jpg +0 -0
  92. data/public/vendor/bootstrap/examples/screenshots/sticky-footer-navbar.jpg +0 -0
  93. data/public/vendor/bootstrap/examples/screenshots/sticky-footer.jpg +0 -0
  94. data/public/vendor/bootstrap/examples/screenshots/theme.jpg +0 -0
  95. data/public/vendor/bootstrap/examples/signin/index.html +46 -0
  96. data/public/vendor/bootstrap/examples/signin/signin.css +40 -0
  97. data/public/vendor/bootstrap/examples/starter-template/index.html +63 -0
  98. data/public/vendor/bootstrap/examples/starter-template/starter-template.css +7 -0
  99. data/public/vendor/bootstrap/examples/sticky-footer/index.html +51 -0
  100. data/public/vendor/bootstrap/examples/sticky-footer/sticky-footer.css +39 -0
  101. data/public/vendor/bootstrap/examples/sticky-footer-navbar/index.html +86 -0
  102. data/public/vendor/bootstrap/examples/sticky-footer-navbar/sticky-footer-navbar.css +46 -0
  103. data/public/vendor/bootstrap/examples/theme/index.html +387 -0
  104. data/public/vendor/bootstrap/examples/theme/theme.css +14 -0
  105. data/public/vendor/bootstrap/fonts/glyphicons-halflings-regular.eot +0 -0
  106. data/public/vendor/bootstrap/fonts/glyphicons-halflings-regular.svg +228 -0
  107. data/public/vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf +0 -0
  108. data/public/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff +0 -0
  109. data/public/vendor/bootstrap/getting-started.html +513 -22
  110. data/public/vendor/bootstrap/index.html +3 -4
  111. data/public/vendor/bootstrap/javascript.html +123 -115
  112. data/public/vendor/bootstrap/js/dropdown.js +3 -3
  113. data/public/vendor/bootstrap/js/modal.js +5 -3
  114. data/public/vendor/bootstrap/js/tests/unit/modal.js +19 -0
  115. data/public/vendor/bootstrap/js/tests/vendor/jquery.js +6 -5
  116. data/public/vendor/bootstrap/js/tooltip.js +9 -5
  117. data/public/vendor/bootstrap/js/transition.js +1 -1
  118. data/public/vendor/bootstrap/less/alerts.less +7 -11
  119. data/public/vendor/bootstrap/less/bootstrap.less +17 -21
  120. data/public/vendor/bootstrap/less/button-groups.less +14 -10
  121. data/public/vendor/bootstrap/less/buttons.less +3 -2
  122. data/public/vendor/bootstrap/less/carousel.less +6 -1
  123. data/public/vendor/bootstrap/less/dropdowns.less +22 -5
  124. data/public/vendor/bootstrap/less/forms.less +36 -15
  125. data/public/vendor/bootstrap/less/glyphicons.less +232 -0
  126. data/public/vendor/bootstrap/less/grid.less +9 -3
  127. data/public/vendor/bootstrap/less/input-groups.less +1 -1
  128. data/public/vendor/bootstrap/less/jumbotron.less +16 -5
  129. data/public/vendor/bootstrap/less/labels.less +9 -5
  130. data/public/vendor/bootstrap/less/mixins.less +73 -43
  131. data/public/vendor/bootstrap/less/modals.less +8 -0
  132. data/public/vendor/bootstrap/less/navbar.less +251 -189
  133. data/public/vendor/bootstrap/less/navs.less +13 -12
  134. data/public/vendor/bootstrap/less/pager.less +1 -1
  135. data/public/vendor/bootstrap/less/pagination.less +20 -9
  136. data/public/vendor/bootstrap/less/panels.less +28 -8
  137. data/public/vendor/bootstrap/less/progress-bars.less +6 -10
  138. data/public/vendor/bootstrap/less/responsive-utilities.less +120 -49
  139. data/public/vendor/bootstrap/less/scaffolding.less +37 -18
  140. data/public/vendor/bootstrap/less/tables.less +84 -59
  141. data/public/vendor/bootstrap/less/theme.less +232 -0
  142. data/public/vendor/bootstrap/less/thumbnails.less +8 -19
  143. data/public/vendor/bootstrap/less/type.less +2 -2
  144. data/public/vendor/bootstrap/less/variables.less +63 -50
  145. data/public/vendor/bootstrap/package.json +2 -1
  146. data/public/vendor/components-backbone/LICENSE +22 -0
  147. data/public/vendor/components-backbone/README.md +10 -0
  148. data/public/vendor/components-backbone/backbone-min.js +4 -0
  149. data/public/vendor/components-backbone/backbone.js +1571 -0
  150. data/public/vendor/components-backbone/bower.json +17 -0
  151. data/public/vendor/components-backbone/component.json +21 -0
  152. data/public/vendor/components-backbone/composer.json +37 -0
  153. data/public/vendor/components-backbone/package.json +24 -0
  154. data/public/vendor/d3.layout.cloud.js +401 -0
  155. data/public/vendor/replacejs/CHANGELOG.md +4 -0
  156. data/public/vendor/replacejs/replace.js +21 -2
  157. data/public/vendor/underscore/CNAME +1 -0
  158. data/public/vendor/underscore/CONTRIBUTING.md +9 -0
  159. data/public/vendor/underscore/LICENSE +22 -0
  160. data/public/vendor/underscore/README.md +19 -0
  161. data/public/vendor/underscore/Rakefile +10 -0
  162. data/public/vendor/underscore/docs/docco.css +192 -0
  163. data/public/vendor/underscore/docs/favicon.ico +0 -0
  164. data/public/vendor/underscore/docs/images/background.png +0 -0
  165. data/public/vendor/underscore/docs/images/underscore.png +0 -0
  166. data/public/vendor/underscore/docs/underscore.html +823 -0
  167. data/public/vendor/underscore/favicon.ico +0 -0
  168. data/public/vendor/underscore/index.html +2467 -0
  169. data/public/vendor/underscore/index.js +1 -0
  170. data/public/vendor/underscore/package.json +16 -0
  171. data/public/vendor/underscore/test/arrays.js +200 -0
  172. data/public/vendor/underscore/test/chaining.js +59 -0
  173. data/public/vendor/underscore/test/collections.js +453 -0
  174. data/public/vendor/underscore/test/functions.js +265 -0
  175. data/public/vendor/underscore/test/index.html +44 -0
  176. data/public/vendor/underscore/test/objects.js +570 -0
  177. data/public/vendor/underscore/test/speed.js +75 -0
  178. data/public/vendor/underscore/test/utility.js +266 -0
  179. data/public/vendor/underscore/test/vendor/jquery.js +9404 -0
  180. data/public/vendor/underscore/test/vendor/jslitmus.js +670 -0
  181. data/public/vendor/underscore/test/vendor/qunit.css +235 -0
  182. data/public/vendor/underscore/test/vendor/qunit.js +1977 -0
  183. data/public/vendor/underscore/test/vendor/runner.js +98 -0
  184. data/public/vendor/underscore/underscore-min.js +1 -0
  185. data/public/vendor/underscore/underscore.js +1226 -0
  186. data/views/dashboard.haml +1 -1
  187. data/views/layout.haml +8 -4
  188. metadata +132 -25
  189. data/public/vendor/bootstrap/_layouts/customize.html +0 -52
  190. data/public/vendor/bootstrap/assets/js/jquery.bbq.min.js +0 -1287
  191. data/public/vendor/bootstrap-glyphicons/CHANGELOG.md +0 -3
  192. data/public/vendor/bootstrap-glyphicons/CNAME +0 -1
  193. data/public/vendor/bootstrap-glyphicons/CONTRIBUTING.md +0 -54
  194. data/public/vendor/bootstrap-glyphicons/LICENSE +0 -19
  195. data/public/vendor/bootstrap-glyphicons/README.md +0 -61
  196. data/public/vendor/bootstrap-glyphicons/_config.yml +0 -12
  197. data/public/vendor/bootstrap-glyphicons/composer.json +0 -9
  198. data/public/vendor/bootstrap-glyphicons/css/bootstrap-glyphicons.css +0 -2
  199. data/public/vendor/bootstrap-glyphicons/css/bootstrap.css +0 -9
  200. data/public/vendor/bootstrap-glyphicons/css/docs.css +0 -160
  201. data/public/vendor/bootstrap-glyphicons/fonts/glyphiconshalflings-regular.eot +0 -0
  202. data/public/vendor/bootstrap-glyphicons/fonts/glyphiconshalflings-regular.otf +0 -0
  203. data/public/vendor/bootstrap-glyphicons/fonts/glyphiconshalflings-regular.svg +0 -175
  204. data/public/vendor/bootstrap-glyphicons/fonts/glyphiconshalflings-regular.ttf +0 -0
  205. data/public/vendor/bootstrap-glyphicons/fonts/glyphiconshalflings-regular.woff +0 -0
  206. data/public/vendor/bootstrap-glyphicons/index.html +0 -255
  207. data/public/vendor/bootstrap-glyphicons/less/bootstrap-glyphicons.less +0 -201
  208. data/public/vendor/bootstrap-glyphicons/package.json +0 -18
@@ -10,10 +10,10 @@
10
10
 
11
11
  .navbar {
12
12
  position: relative;
13
+ z-index: @zindex-navbar;
13
14
  min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
14
15
  margin-bottom: @navbar-margin-bottom;
15
- background-color: @navbar-bg;
16
- border: 1px solid @navbar-border;
16
+ border: 1px solid transparent;
17
17
 
18
18
  // Prevent floats from breaking the navbar
19
19
  .clearfix();
@@ -30,8 +30,6 @@
30
30
  // styling of responsive aspects.
31
31
 
32
32
  .navbar-header {
33
- padding-left: @navbar-padding-horizontal;
34
- padding-right: @navbar-padding-horizontal;
35
33
  .clearfix();
36
34
 
37
35
  @media (min-width: @grid-float-breakpoint) {
@@ -51,25 +49,61 @@
51
49
  // content for the user's viewport.
52
50
 
53
51
  .navbar-collapse {
54
- padding: 5px @navbar-padding-horizontal;
55
- border-top: 1px solid darken(@navbar-bg, 7%);
56
- box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
57
- // Clear floated elements and prevent collapsing of padding
58
- .clearfix();
59
-
60
- // This is not automatically added to the `.navbar-fixed-top` because it causes
61
- // z-index bugs in iOS7 (possibly earlier).
62
52
  max-height: 340px;
63
53
  overflow-x: visible;
64
- overflow-y: auto;
54
+ padding-right: @navbar-padding-horizontal;
55
+ padding-left: @navbar-padding-horizontal;
56
+ border-top: 1px solid transparent;
57
+ box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
58
+ .clearfix();
65
59
  -webkit-overflow-scrolling: touch;
66
60
 
61
+ &.in {
62
+ overflow-y: auto;
63
+ }
64
+
67
65
  @media (min-width: @grid-float-breakpoint) {
68
66
  width: auto;
69
- padding-top: 0;
70
- padding-bottom: 0;
71
67
  border-top: 0;
72
68
  box-shadow: none;
69
+
70
+ &.collapse {
71
+ display: block !important;
72
+ height: auto !important;
73
+ padding-bottom: 0; // Override default setting
74
+ overflow: visible !important;
75
+ }
76
+
77
+ &.in {
78
+ overflow-y: visible;
79
+ }
80
+
81
+ // Account for first and last children spacing
82
+ .navbar-nav.navbar-left:first-child {
83
+ margin-left: -@navbar-padding-horizontal;
84
+ }
85
+ .navbar-nav.navbar-right:last-child {
86
+ margin-right: -@navbar-padding-horizontal;
87
+ }
88
+ .navbar-text:last-child {
89
+ margin-right: 0;
90
+ }
91
+ }
92
+ }
93
+
94
+
95
+ // Both navbar header and collapse
96
+ //
97
+ // When a container is present, change the behavior of the header and collapse.
98
+
99
+ .container > .navbar-header,
100
+ .container > .navbar-collapse {
101
+ margin-right: -@navbar-padding-horizontal;
102
+ margin-left: -@navbar-padding-horizontal;
103
+
104
+ @media (min-width: @grid-float-breakpoint) {
105
+ margin-right: 0;
106
+ margin-left: 0;
73
107
  }
74
108
  }
75
109
 
@@ -82,8 +116,8 @@
82
116
 
83
117
  // Static top (unfixed, but 100% wide) navbar
84
118
  .navbar-static-top {
119
+ border-width: 0 0 1px;
85
120
  @media (min-width: @grid-float-breakpoint) {
86
- border-width: 0 0 1px;
87
121
  border-radius: 0;
88
122
  }
89
123
  }
@@ -94,7 +128,6 @@
94
128
  position: fixed;
95
129
  right: 0;
96
130
  left: 0;
97
- z-index: @zindex-navbar-fixed;
98
131
  border-width: 0 0 1px;
99
132
 
100
133
  // Undo the rounded corners
@@ -103,6 +136,7 @@
103
136
  }
104
137
  }
105
138
  .navbar-fixed-top {
139
+ z-index: @zindex-navbar-fixed;
106
140
  top: 0;
107
141
  }
108
142
  .navbar-fixed-bottom {
@@ -115,17 +149,18 @@
115
149
 
116
150
  .navbar-brand {
117
151
  float: left;
118
- margin-right: (@navbar-padding-horizontal / 2);
119
- padding-top: @navbar-padding-vertical;
120
- padding-bottom: @navbar-padding-vertical;
152
+ padding: @navbar-padding-vertical @navbar-padding-horizontal;
121
153
  font-size: @font-size-large;
122
154
  line-height: @line-height-computed;
123
- color: @navbar-brand-color;
124
155
  &:hover,
125
156
  &:focus {
126
- color: @navbar-brand-hover-color;
127
157
  text-decoration: none;
128
- background-color: @navbar-brand-hover-bg;
158
+ }
159
+
160
+ @media (min-width: @grid-float-breakpoint) {
161
+ .navbar > .container & {
162
+ margin-left: -@navbar-padding-horizontal;
163
+ }
129
164
  }
130
165
  }
131
166
 
@@ -138,28 +173,27 @@
138
173
  .navbar-toggle {
139
174
  position: relative;
140
175
  float: right;
176
+ margin-right: @navbar-padding-horizontal;
141
177
  padding: 9px 10px;
142
178
  .navbar-vertical-align(34px);
143
179
  background-color: transparent;
144
- border: 1px solid @navbar-toggle-border-color;
180
+ border: 1px solid transparent;
145
181
  border-radius: @border-radius-base;
146
182
 
147
- &:hover,
148
- &:focus {
149
- background-color: @navbar-toggle-hover-bg;
150
- }
151
-
152
183
  // Bars
153
184
  .icon-bar {
154
185
  display: block;
155
186
  width: 22px;
156
187
  height: 2px;
157
- background-color: @navbar-toggle-icon-bar-bg;
158
188
  border-radius: 1px;
159
189
  }
160
190
  .icon-bar + .icon-bar {
161
191
  margin-top: 4px;
162
192
  }
193
+
194
+ @media (min-width: @grid-float-breakpoint) {
195
+ display: none;
196
+ }
163
197
  }
164
198
 
165
199
 
@@ -169,44 +203,16 @@
169
203
  // the nav the full height of the horizontal nav (above 768px).
170
204
 
171
205
  .navbar-nav {
172
- margin-left: -@navbar-padding-horizontal;
173
- margin-right: -@navbar-padding-horizontal;
174
-
175
- @media (min-width: @grid-float-breakpoint) {
176
- margin-left: 0;
177
- margin-right: 0;
178
- }
206
+ margin: (@navbar-padding-vertical / 2) -@navbar-padding-horizontal;
179
207
 
180
208
  > li > a {
181
209
  padding-top: 10px;
182
210
  padding-bottom: 10px;
183
- color: @navbar-link-color;
184
211
  line-height: @line-height-computed;
185
- &:hover,
186
- &:focus {
187
- color: @navbar-link-hover-color;
188
- background-color: @navbar-link-hover-bg;
189
- }
190
- }
191
- > .active > a {
192
- &,
193
- &:hover,
194
- &:focus {
195
- color: @navbar-link-active-color;
196
- background-color: @navbar-link-active-bg;
197
- }
198
- }
199
- > .disabled > a {
200
- &,
201
- &:hover,
202
- &:focus {
203
- color: @navbar-link-disabled-color;
204
- background-color: @navbar-link-disabled-bg;
205
- }
206
212
  }
207
213
 
208
- @media (max-width: @screen-phone-max) {
209
- // Dropdowns get custom display
214
+ @media (max-width: @screen-xs-max) {
215
+ // Dropdowns get custom display when collapsed
210
216
  .open .dropdown-menu {
211
217
  position: static;
212
218
  float: none;
@@ -220,30 +226,25 @@
220
226
  padding: 5px 15px 5px 25px;
221
227
  }
222
228
  > li > a {
223
- color: @navbar-link-color;
224
229
  line-height: @line-height-computed;
225
230
  &:hover,
226
231
  &:focus {
227
- color: @navbar-link-hover-color;
228
- background-color: @navbar-link-hover-bg;
229
232
  background-image: none;
230
233
  }
231
234
  }
232
- > .active > a {
233
- &,
234
- &:hover,
235
- &:focus {
236
- color: @navbar-link-active-color;
237
- background-color: @navbar-link-active-bg;
238
- }
239
- }
240
- > .disabled > a {
241
- &,
242
- &:hover,
243
- &:focus {
244
- color: @navbar-link-disabled-color;
245
- background-color: @navbar-link-disabled-bg;
246
- }
235
+ }
236
+ }
237
+
238
+ // Uncollapse the nav
239
+ @media (min-width: @grid-float-breakpoint) {
240
+ float: left;
241
+ margin: 0;
242
+
243
+ > li {
244
+ float: left;
245
+ > a {
246
+ padding-top: ((@navbar-height - @line-height-computed) / 2);
247
+ padding-bottom: ((@navbar-height - @line-height-computed) / 2);
247
248
  }
248
249
  }
249
250
  }
@@ -272,14 +273,16 @@
272
273
  margin-left: -@navbar-padding-horizontal;
273
274
  margin-right: -@navbar-padding-horizontal;
274
275
  padding: 10px @navbar-padding-horizontal;
275
- border-top: 1px solid darken(@navbar-bg, 7%);
276
- border-bottom: 1px solid darken(@navbar-bg, 7%);
276
+ border-top: 1px solid transparent;
277
+ border-bottom: 1px solid transparent;
278
+ @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
279
+ .box-shadow(@shadow);
277
280
 
278
281
  // Mixin behavior for optimum display
279
282
  .form-inline();
280
283
 
281
284
  .form-group {
282
- @media (max-width: @screen-phone-max) {
285
+ @media (max-width: @screen-xs-max) {
283
286
  margin-bottom: 5px;
284
287
  }
285
288
  }
@@ -295,6 +298,7 @@
295
298
  margin-right: 0;
296
299
  padding-top: 0;
297
300
  padding-bottom: 0;
301
+ .box-shadow(none);
298
302
  }
299
303
  }
300
304
 
@@ -311,45 +315,176 @@
311
315
  .border-bottom-radius(0);
312
316
  }
313
317
 
314
- // Dropdown menu items and carets
315
- .navbar-nav {
316
- // Caret should match text color on hover
317
- > .dropdown > a:hover .caret,
318
- > .dropdown > a:focus .caret {
319
- border-top-color: @navbar-link-hover-color;
320
- border-bottom-color: @navbar-link-hover-color;
318
+ // Right aligned menus need alt position
319
+ .navbar-nav.pull-right > li > .dropdown-menu,
320
+ .navbar-nav > li > .dropdown-menu.pull-right {
321
+ left: auto;
322
+ right: 0;
323
+ }
324
+
325
+
326
+ // Buttons in navbars
327
+ //
328
+ // Vertically center a button within a navbar (when *not* in a form).
329
+
330
+ .navbar-btn {
331
+ .navbar-vertical-align(@input-height-base);
332
+ }
333
+
334
+
335
+ // Text in navbars
336
+ //
337
+ // Add a class to make any element properly align itself vertically within the navbars.
338
+
339
+ .navbar-text {
340
+ float: left;
341
+ .navbar-vertical-align(@line-height-computed);
342
+
343
+ @media (min-width: @grid-float-breakpoint) {
344
+ margin-left: @navbar-padding-horizontal;
345
+ margin-right: @navbar-padding-horizontal;
321
346
  }
347
+ }
348
+
349
+ // Alternate navbars
350
+ // --------------------------------------------------
322
351
 
323
- // Remove background color from open dropdown
324
- > .open > a {
325
- &,
352
+ // Default navbar
353
+ .navbar-default {
354
+ background-color: @navbar-default-bg;
355
+ border-color: @navbar-default-border;
356
+
357
+ .navbar-brand {
358
+ color: @navbar-default-brand-color;
326
359
  &:hover,
327
360
  &:focus {
328
- background-color: @navbar-link-active-bg;
329
- color: @navbar-link-active-color;
330
- .caret {
331
- border-top-color: @navbar-link-active-color;
332
- border-bottom-color: @navbar-link-active-color;
361
+ color: @navbar-default-brand-hover-color;
362
+ background-color: @navbar-default-brand-hover-bg;
363
+ }
364
+ }
365
+
366
+ .navbar-text {
367
+ color: @navbar-default-color;
368
+ }
369
+
370
+ .navbar-nav {
371
+ > li > a {
372
+ color: @navbar-default-link-color;
373
+
374
+ &:hover,
375
+ &:focus {
376
+ color: @navbar-default-link-hover-color;
377
+ background-color: @navbar-default-link-hover-bg;
378
+ }
379
+ }
380
+ > .active > a {
381
+ &,
382
+ &:hover,
383
+ &:focus {
384
+ color: @navbar-default-link-active-color;
385
+ background-color: @navbar-default-link-active-bg;
386
+ }
387
+ }
388
+ > .disabled > a {
389
+ &,
390
+ &:hover,
391
+ &:focus {
392
+ color: @navbar-default-link-disabled-color;
393
+ background-color: @navbar-default-link-disabled-bg;
333
394
  }
334
395
  }
335
396
  }
336
- > .dropdown > a .caret {
337
- border-top-color: @navbar-link-color;
338
- border-bottom-color: @navbar-link-color;
397
+
398
+ .navbar-toggle {
399
+ border-color: @navbar-default-toggle-border-color;
400
+ &:hover,
401
+ &:focus {
402
+ background-color: @navbar-default-toggle-hover-bg;
403
+ }
404
+ .icon-bar {
405
+ background-color: @navbar-default-toggle-icon-bar-bg;
406
+ }
339
407
  }
340
- }
341
408
 
342
- // Right aligned menus need alt position
343
- .navbar-nav.pull-right > li > .dropdown-menu,
344
- .navbar-nav > li > .dropdown-menu.pull-right {
345
- left: auto;
346
- right: 0;
347
- }
409
+ .navbar-collapse,
410
+ .navbar-form {
411
+ border-color: darken(@navbar-default-bg, 7%);
412
+ }
413
+
414
+ // Dropdown menu items and carets
415
+ .navbar-nav {
416
+ // Caret should match text color on hover
417
+ > .dropdown > a:hover .caret,
418
+ > .dropdown > a:focus .caret {
419
+ border-top-color: @navbar-default-link-hover-color;
420
+ border-bottom-color: @navbar-default-link-hover-color;
421
+ }
348
422
 
423
+ // Remove background color from open dropdown
424
+ > .open > a {
425
+ &,
426
+ &:hover,
427
+ &:focus {
428
+ background-color: @navbar-default-link-active-bg;
429
+ color: @navbar-default-link-active-color;
430
+ .caret {
431
+ border-top-color: @navbar-default-link-active-color;
432
+ border-bottom-color: @navbar-default-link-active-color;
433
+ }
434
+ }
435
+ }
436
+ > .dropdown > a .caret {
437
+ border-top-color: @navbar-default-link-color;
438
+ border-bottom-color: @navbar-default-link-color;
439
+ }
349
440
 
350
441
 
442
+ @media (max-width: @screen-xs-max) {
443
+ // Dropdowns get custom display when collapsed
444
+ .open .dropdown-menu {
445
+ > li > a {
446
+ color: @navbar-default-link-color;
447
+ &:hover,
448
+ &:focus {
449
+ color: @navbar-default-link-hover-color;
450
+ background-color: @navbar-default-link-hover-bg;
451
+ }
452
+ }
453
+ > .active > a {
454
+ &,
455
+ &:hover,
456
+ &:focus {
457
+ color: @navbar-default-link-active-color;
458
+ background-color: @navbar-default-link-active-bg;
459
+ }
460
+ }
461
+ > .disabled > a {
462
+ &,
463
+ &:hover,
464
+ &:focus {
465
+ color: @navbar-default-link-disabled-color;
466
+ background-color: @navbar-default-link-disabled-bg;
467
+ }
468
+ }
469
+ }
470
+ }
471
+ }
472
+
473
+
474
+ // Links in navbars
475
+ //
476
+ // Add a class to ensure links outside the navbar nav are colored correctly.
477
+
478
+ .navbar-link {
479
+ color: @navbar-default-link-color;
480
+ &:hover {
481
+ color: @navbar-default-link-hover-color;
482
+ }
483
+ }
484
+
485
+ }
486
+
351
487
  // Inverse navbar
352
- // --------------------------------------------------
353
488
 
354
489
  .navbar-inverse {
355
490
  background-color: @navbar-inverse-bg;
@@ -408,8 +543,9 @@
408
543
  }
409
544
  }
410
545
 
411
- .navbar-collapse {
412
- border-top-color: darken(@navbar-inverse-bg, 7%);
546
+ .navbar-collapse,
547
+ .navbar-form {
548
+ border-color: darken(@navbar-inverse-bg, 7%);
413
549
  }
414
550
 
415
551
  // Dropdowns
@@ -441,7 +577,7 @@
441
577
  }
442
578
  }
443
579
 
444
- @media (max-width: @screen-phone-max) {
580
+ @media (max-width: @screen-xs-max) {
445
581
  // Dropdowns get custom display
446
582
  .open .dropdown-menu {
447
583
  > .dropdown-header {
@@ -475,85 +611,11 @@
475
611
  }
476
612
  }
477
613
 
478
- }
479
-
480
-
481
-
482
- // Responsive navbar
483
- // --------------------------------------------------
484
-
485
- @media screen and (min-width: @grid-float-breakpoint) {
486
-
487
- .navbar-nav {
488
- float: left;
489
- // undo margin to make nav extend full height of navbar
490
- margin-top: 0;
491
- margin-bottom: 0;
492
-
493
- > li {
494
- float: left;
495
- > a {
496
- padding-top: ((@navbar-height - @line-height-computed) / 2);
497
- padding-bottom: ((@navbar-height - @line-height-computed) / 2);
498
- }
614
+ .navbar-link {
615
+ color: @navbar-inverse-link-color;
616
+ &:hover {
617
+ color: @navbar-inverse-link-hover-color;
499
618
  }
500
619
  }
501
620
 
502
- // Required to make the collapsing navbar work on regular desktops
503
- .navbar-toggle {
504
- position: relative;
505
- top: auto;
506
- left: auto;
507
- display: none;
508
- }
509
- .navbar-collapse.collapse {
510
- display: block !important;
511
- height: auto !important;
512
- padding-bottom: 0; // Override default setting
513
- overflow: visible !important;
514
- }
515
-
516
- }
517
-
518
-
519
-
520
- // Buttons in navbars
521
- //
522
- // Vertically center a button within a navbar (when *not* in a form).
523
-
524
- .navbar-btn {
525
- margin-top: ((@navbar-height - @input-height-base) / 2);
526
- }
527
-
528
-
529
-
530
- // Text in navbars
531
- //
532
- // Add a class to make any element properly align itself vertically within the navbars.
533
-
534
- .navbar-text {
535
- float: left;
536
- .navbar-vertical-align(@line-height-computed);
537
- }
538
-
539
-
540
-
541
- // Links in navbars
542
- //
543
- // Add a class to ensure links outside the navbar nav are colored correctly.
544
-
545
- // Default navbar variables
546
- .navbar-link {
547
- color: @navbar-link-color;
548
- &:hover {
549
- color: @navbar-link-hover-color;
550
- }
551
- }
552
-
553
- // Use the inverse navbar variables
554
- .navbar-inverse .navbar-link {
555
- color: @navbar-inverse-link-color;
556
- &:hover {
557
- color: @navbar-inverse-link-hover-color;
558
- }
559
621
  }
@@ -19,7 +19,7 @@
19
19
  > a {
20
20
  position: relative;
21
21
  display: block;
22
- padding: 10px 15px;
22
+ padding: @nav-link-padding;
23
23
  &:hover,
24
24
  &:focus {
25
25
  text-decoration: none;
@@ -42,17 +42,12 @@
42
42
  }
43
43
 
44
44
  // Open dropdowns
45
- &.open > a {
45
+ .open > a {
46
46
  &,
47
47
  &:hover,
48
48
  &:focus {
49
- color: @nav-open-link-hover-color;
50
- background-color: @link-color;
49
+ background-color: @nav-link-hover-bg;
51
50
  border-color: @link-color;
52
- .caret {
53
- border-top-color: @nav-open-caret-border-color;
54
- border-bottom-color: @nav-open-caret-border-color;
55
- }
56
51
  }
57
52
  }
58
53
 
@@ -87,7 +82,7 @@
87
82
  border: 1px solid transparent;
88
83
  border-radius: @border-radius-base @border-radius-base 0 0;
89
84
  &:hover {
90
- border-color: @nav-tabs-link-hover-border-color;
85
+ border-color: @nav-tabs-link-hover-border-color @nav-tabs-link-hover-border-color @nav-tabs-border-color;
91
86
  }
92
87
  }
93
88
 
@@ -159,14 +154,20 @@
159
154
 
160
155
  .nav-justified {
161
156
  width: 100%;
157
+
162
158
  > li {
163
159
  float: none;
164
- display: table-cell;
165
- width: 1%;
166
- > a {
160
+ > a {
167
161
  text-align: center;
168
162
  }
169
163
  }
164
+
165
+ @media (min-width: @screen-sm) {
166
+ > li {
167
+ display: table-cell;
168
+ width: 1%;
169
+ }
170
+ }
170
171
  }
171
172
 
172
173
  // Move borders to anchors instead of bottom of list
@@ -23,7 +23,7 @@
23
23
  > a:hover,
24
24
  > a:focus {
25
25
  text-decoration: none;
26
- background-color: @pagination-active-bg;
26
+ background-color: @pagination-hover-bg;
27
27
  }
28
28
  }
29
29