Merge lp:~huwshimi/charmworld/charmworld-styling into lp:~juju-jitsu/charmworld/trunk
- charmworld-styling
- Merge into trunk
Status: | Merged |
---|---|
Merged at revision: | 390 |
Proposed branch: | lp:~huwshimi/charmworld/charmworld-styling |
Merge into: | lp:~juju-jitsu/charmworld/trunk |
Diff against target: |
11237 lines (+753/-9850) 79 files modified
charmworld/globals.py (+30/-4) charmworld/routes.py (+2/-1) charmworld/static/bootstrap-dropdown.js (+0/-100) charmworld/static/css/LICENSE (+0/-177) charmworld/static/css/base.css (+29/-0) charmworld/static/css/bootstrap/LICENSE (+0/-179) charmworld/static/css/bootstrap/accordion.less (+0/-34) charmworld/static/css/bootstrap/alerts.less (+0/-79) charmworld/static/css/bootstrap/bootstrap.less (+0/-63) charmworld/static/css/bootstrap/breadcrumbs.less (+0/-24) charmworld/static/css/bootstrap/button-groups.less (+0/-227) charmworld/static/css/bootstrap/buttons.less (+0/-230) charmworld/static/css/bootstrap/carousel.less (+0/-131) charmworld/static/css/bootstrap/close.less (+0/-31) charmworld/static/css/bootstrap/code.less (+0/-61) charmworld/static/css/bootstrap/component-animations.less (+0/-22) charmworld/static/css/bootstrap/dropdowns.less (+0/-233) charmworld/static/css/bootstrap/forms.less (+0/-687) charmworld/static/css/bootstrap/grid.less (+0/-21) charmworld/static/css/bootstrap/hero-unit.less (+0/-25) charmworld/static/css/bootstrap/labels-badges.less (+0/-82) charmworld/static/css/bootstrap/layouts.less (+0/-16) charmworld/static/css/bootstrap/media.less (+0/-55) charmworld/static/css/bootstrap/mixins.less (+0/-686) charmworld/static/css/bootstrap/modals.less (+0/-95) charmworld/static/css/bootstrap/navbar.less (+0/-490) charmworld/static/css/bootstrap/navs.less (+0/-391) charmworld/static/css/bootstrap/pager.less (+0/-41) charmworld/static/css/bootstrap/pagination.less (+0/-121) charmworld/static/css/bootstrap/popovers.less (+0/-129) charmworld/static/css/bootstrap/progress-bars.less (+0/-122) charmworld/static/css/bootstrap/reset.less (+0/-216) charmworld/static/css/bootstrap/responsive-1200px-min.less (+0/-28) charmworld/static/css/bootstrap/responsive-767px-max.less (+0/-193) charmworld/static/css/bootstrap/responsive-768px-979px.less (+0/-19) charmworld/static/css/bootstrap/responsive-navbar.less (+0/-185) charmworld/static/css/bootstrap/responsive-utilities.less (+0/-43) charmworld/static/css/bootstrap/responsive.less (+0/-57) charmworld/static/css/bootstrap/scaffolding.less (+0/-52) charmworld/static/css/bootstrap/sprites.less (+0/-193) charmworld/static/css/bootstrap/tables.less (+0/-237) charmworld/static/css/bootstrap/tests/buttons.html (+0/-139) charmworld/static/css/bootstrap/tests/css-tests.css (+0/-139) charmworld/static/css/bootstrap/tests/css-tests.html (+0/-1345) charmworld/static/css/bootstrap/tests/forms-responsive.html (+0/-71) charmworld/static/css/bootstrap/tests/forms.html (+0/-179) charmworld/static/css/bootstrap/tests/navbar-fixed-top.html (+0/-104) charmworld/static/css/bootstrap/tests/navbar-static-top.html (+0/-107) charmworld/static/css/bootstrap/tests/navbar.html (+0/-107) charmworld/static/css/bootstrap/thumbnails.less (+0/-52) charmworld/static/css/bootstrap/tooltip.less (+0/-70) charmworld/static/css/bootstrap/type.less (+0/-235) charmworld/static/css/bootstrap/utilities.less (+0/-30) charmworld/static/css/bootstrap/variables.less (+0/-301) charmworld/static/css/bootstrap/wells.less (+0/-29) charmworld/static/css/bootswatch.less (+0/-128) charmworld/static/css/theme.less (+0/-76) charmworld/static/css/variables.less (+0/-301) charmworld/static/jquery-1.7.2.min.js (+0/-4) charmworld/static/pylons.css (+0/-65) charmworld/templates/bundle.pt (+64/-70) charmworld/templates/charm-collection.pt (+27/-34) charmworld/templates/charm-proof-errors.pt (+4/-5) charmworld/templates/charm.pt (+219/-183) charmworld/templates/config.pt (+9/-8) charmworld/templates/hook.pt (+12/-9) charmworld/templates/index.pt (+29/-24) charmworld/templates/interface-collection-redux.pt (+30/-21) charmworld/templates/interface-collection.pt (+16/-6) charmworld/templates/interface.pt (+62/-57) charmworld/templates/main.pt (+90/-61) charmworld/templates/recent.pt (+22/-22) charmworld/templates/review.pt (+21/-25) charmworld/templates/search.pt (+31/-33) charmworld/templates/store-missing.pt (+17/-20) charmworld/templates/tools.pt (+14/-0) charmworld/views/tests/test_feeds.py (+1/-1) charmworld/views/tests/test_tools.py (+16/-8) charmworld/views/tools.py (+8/-1) |
To merge this branch: | bzr merge lp:~huwshimi/charmworld/charmworld-styling |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brad Crittenden (community) | code | Approve | |
Benji York (community) | Approve | ||
Review via email: mp+184078@code.launchpad.net |
Commit message
Update design to use Ubuntu framework.
Description of the change
This branch provides an entire overhaul of the visual design for charmworld.
The design uses the Ubuntu web framework.
This branch includes:
- New layout for all pages.
- Tools moved to own section.
- Removal of bootstrap and other old files.
Apologies to whoever who ends up reviewing this huge branch.
Brad Crittenden (bac) wrote : | # |
Hi Huw,
Sorry for the late review but I've been working with your branch and noticed a few other things:
* It has been discussed, but the Makefile is busted wrt CSS generation.
* There are also references to theme.css in .bzrignore and hacking.rst
* The conditional on the charm display of the Readme does not work as intended. See the following for one with empty content. The heading should not be displayed:
http://
Feel free to defer fixing the last one in order to facilitate landing this branch. I'll be happy to fix it in my follow-on branch.
Marked as 'approved' but the first two are 'needs fixing'.
Benji York (benji) wrote : | # |
Huw, I have fixes for the Makefile and for .bzrignore in lp:~/charmworld/fix-charmworld-styling-makefile. You should be able to merge that branch into yours to address the first 1 and a half issues Brad lists.
Brad Crittenden (bac) wrote : | # |
Actually the conditional display of the README is working. I was confused because of the styling of the header and didn't notice the next section was the MD formatted content of the readme.
Huw Wilkins (huwshimi) wrote : | # |
Thanks for the reviews, guys.
Benji, thanks for the makefile fix. I imagine the dropdown for the tools will get added in again at some stage, but the Ubuntu CSS framework doesn't come with the JS for doing that.
I'll push a branch with the other fixes shortly.
Preview Diff
1 | === modified file 'charmworld/globals.py' |
2 | --- charmworld/globals.py 2013-02-11 17:04:31 +0000 |
3 | +++ charmworld/globals.py 2013-09-05 11:05:34 +0000 |
4 | @@ -25,10 +25,36 @@ |
5 | |
6 | def sections(request): |
7 | sections = [ |
8 | - {"url": u"/", "name": u"Home", 'active': False}, |
9 | - {"url": u"/charms", "name": u"Charms", 'active': False}, |
10 | - {"url": u"/interfaces", "name": u"Interfaces", 'active': False}, |
11 | - {"url": u"/recently-changed", "name": u"Changes", 'active': False}, |
12 | + { |
13 | + "url": u"/", |
14 | + "name": u"Home", |
15 | + 'active': False, |
16 | + 'visible': False |
17 | + }, |
18 | + { |
19 | + "url": u"/charms", |
20 | + "name": u"Charms", |
21 | + 'active': False, |
22 | + 'visible': True |
23 | + }, |
24 | + { |
25 | + "url": u"/interfaces", |
26 | + "name": u"Interfaces", |
27 | + 'active': False, |
28 | + 'visible': True |
29 | + }, |
30 | + { |
31 | + "url": u"/recently-changed", |
32 | + "name": u"Changes", |
33 | + 'active': False, |
34 | + 'visible': True |
35 | + }, |
36 | + { |
37 | + "url": u"/tools", |
38 | + "name": u"Tools", |
39 | + 'active': False, |
40 | + 'visible': True |
41 | + }, |
42 | ] |
43 | section = "/%s" % request.path_info[1:].split("/", 1)[0] |
44 | # fix up oddballs |
45 | |
46 | === modified file 'charmworld/routes.py' |
47 | --- charmworld/routes.py 2013-09-04 14:03:52 +0000 |
48 | +++ charmworld/routes.py 2013-09-05 11:05:34 +0000 |
49 | @@ -67,8 +67,9 @@ |
50 | "/bundles/{basket}/{rev}/{bundle}") |
51 | |
52 | # Tools |
53 | + config.add_route("tools", "/tools") |
54 | config.add_route("tools-core-review", "/tools/core-review-queue") |
55 | - config.add_route("tools-review", "/review-queue") |
56 | + config.add_route("tools-review", "/tools/review-queue") |
57 | config.add_route("tools-store-missing", "/tools/store-missing") |
58 | config.add_route("tools-proof-errors", "/tools/proof-errors") |
59 | |
60 | |
61 | === removed file 'charmworld/static/bootstrap-dropdown.js' |
62 | --- charmworld/static/bootstrap-dropdown.js 2012-06-10 03:01:29 +0000 |
63 | +++ charmworld/static/bootstrap-dropdown.js 1970-01-01 00:00:00 +0000 |
64 | @@ -1,100 +0,0 @@ |
65 | -/* ============================================================ |
66 | - * bootstrap-dropdown.js v2.0.4 |
67 | - * http://twitter.github.com/bootstrap/javascript.html#dropdowns |
68 | - * ============================================================ |
69 | - * Copyright 2012 Twitter, Inc. |
70 | - * |
71 | - * Licensed under the Apache License, Version 2.0 (the "License"); |
72 | - * you may not use this file except in compliance with the License. |
73 | - * You may obtain a copy of the License at |
74 | - * |
75 | - * http://www.apache.org/licenses/LICENSE-2.0 |
76 | - * |
77 | - * Unless required by applicable law or agreed to in writing, software |
78 | - * distributed under the License is distributed on an "AS IS" BASIS, |
79 | - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
80 | - * See the License for the specific language governing permissions and |
81 | - * limitations under the License. |
82 | - * ============================================================ */ |
83 | - |
84 | - |
85 | -!function ($) { |
86 | - |
87 | - "use strict"; // jshint ;_; |
88 | - |
89 | - |
90 | - /* DROPDOWN CLASS DEFINITION |
91 | - * ========================= */ |
92 | - |
93 | - var toggle = '[data-toggle="dropdown"]' |
94 | - , Dropdown = function (element) { |
95 | - var $el = $(element).on('click.dropdown.data-api', this.toggle) |
96 | - $('html').on('click.dropdown.data-api', function () { |
97 | - $el.parent().removeClass('open') |
98 | - }) |
99 | - } |
100 | - |
101 | - Dropdown.prototype = { |
102 | - |
103 | - constructor: Dropdown |
104 | - |
105 | - , toggle: function (e) { |
106 | - var $this = $(this) |
107 | - , $parent |
108 | - , selector |
109 | - , isActive |
110 | - |
111 | - if ($this.is('.disabled, :disabled')) return |
112 | - |
113 | - selector = $this.attr('data-target') |
114 | - |
115 | - if (!selector) { |
116 | - selector = $this.attr('href') |
117 | - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 |
118 | - } |
119 | - |
120 | - $parent = $(selector) |
121 | - $parent.length || ($parent = $this.parent()) |
122 | - |
123 | - isActive = $parent.hasClass('open') |
124 | - |
125 | - clearMenus() |
126 | - |
127 | - if (!isActive) $parent.toggleClass('open') |
128 | - |
129 | - return false |
130 | - } |
131 | - |
132 | - } |
133 | - |
134 | - function clearMenus() { |
135 | - $(toggle).parent().removeClass('open') |
136 | - } |
137 | - |
138 | - |
139 | - /* DROPDOWN PLUGIN DEFINITION |
140 | - * ========================== */ |
141 | - |
142 | - $.fn.dropdown = function (option) { |
143 | - return this.each(function () { |
144 | - var $this = $(this) |
145 | - , data = $this.data('dropdown') |
146 | - if (!data) $this.data('dropdown', (data = new Dropdown(this))) |
147 | - if (typeof option == 'string') data[option].call($this) |
148 | - }) |
149 | - } |
150 | - |
151 | - $.fn.dropdown.Constructor = Dropdown |
152 | - |
153 | - |
154 | - /* APPLY TO STANDARD DROPDOWN ELEMENTS |
155 | - * =================================== */ |
156 | - |
157 | - $(function () { |
158 | - $('html').on('click.dropdown.data-api', clearMenus) |
159 | - $('body') |
160 | - .on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() }) |
161 | - .on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) |
162 | - }) |
163 | - |
164 | -}(window.jQuery); |
165 | \ No newline at end of file |
166 | |
167 | === removed file 'charmworld/static/css/LICENSE' |
168 | --- charmworld/static/css/LICENSE 2013-02-12 16:12:10 +0000 |
169 | +++ charmworld/static/css/LICENSE 1970-01-01 00:00:00 +0000 |
170 | @@ -1,177 +0,0 @@ |
171 | -Origin of files in this directory: https://github.com/thomaspark/bootswatch |
172 | - |
173 | - |
174 | - Apache License |
175 | - Version 2.0, January 2004 |
176 | - http://www.apache.org/licenses/ |
177 | - |
178 | - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION |
179 | - |
180 | - 1. Definitions. |
181 | - |
182 | - "License" shall mean the terms and conditions for use, reproduction, |
183 | - and distribution as defined by Sections 1 through 9 of this document. |
184 | - |
185 | - "Licensor" shall mean the copyright owner or entity authorized by |
186 | - the copyright owner that is granting the License. |
187 | - |
188 | - "Legal Entity" shall mean the union of the acting entity and all |
189 | - other entities that control, are controlled by, or are under common |
190 | - control with that entity. For the purposes of this definition, |
191 | - "control" means (i) the power, direct or indirect, to cause the |
192 | - direction or management of such entity, whether by contract or |
193 | - otherwise, or (ii) ownership of fifty percent (50%) or more of the |
194 | - outstanding shares, or (iii) beneficial ownership of such entity. |
195 | - |
196 | - "You" (or "Your") shall mean an individual or Legal Entity |
197 | - exercising permissions granted by this License. |
198 | - |
199 | - "Source" form shall mean the preferred form for making modifications, |
200 | - including but not limited to software source code, documentation |
201 | - source, and configuration files. |
202 | - |
203 | - "Object" form shall mean any form resulting from mechanical |
204 | - transformation or translation of a Source form, including but |
205 | - not limited to compiled object code, generated documentation, |
206 | - and conversions to other media types. |
207 | - |
208 | - "Work" shall mean the work of authorship, whether in Source or |
209 | - Object form, made available under the License, as indicated by a |
210 | - copyright notice that is included in or attached to the work |
211 | - (an example is provided in the Appendix below). |
212 | - |
213 | - "Derivative Works" shall mean any work, whether in Source or Object |
214 | - form, that is based on (or derived from) the Work and for which the |
215 | - editorial revisions, annotations, elaborations, or other modifications |
216 | - represent, as a whole, an original work of authorship. For the purposes |
217 | - of this License, Derivative Works shall not include works that remain |
218 | - separable from, or merely link (or bind by name) to the interfaces of, |
219 | - the Work and Derivative Works thereof. |
220 | - |
221 | - "Contribution" shall mean any work of authorship, including |
222 | - the original version of the Work and any modifications or additions |
223 | - to that Work or Derivative Works thereof, that is intentionally |
224 | - submitted to Licensor for inclusion in the Work by the copyright owner |
225 | - or by an individual or Legal Entity authorized to submit on behalf of |
226 | - the copyright owner. For the purposes of this definition, "submitted" |
227 | - means any form of electronic, verbal, or written communication sent |
228 | - to the Licensor or its representatives, including but not limited to |
229 | - communication on electronic mailing lists, source code control systems, |
230 | - and issue tracking systems that are managed by, or on behalf of, the |
231 | - Licensor for the purpose of discussing and improving the Work, but |
232 | - excluding communication that is conspicuously marked or otherwise |
233 | - designated in writing by the copyright owner as "Not a Contribution." |
234 | - |
235 | - "Contributor" shall mean Licensor and any individual or Legal Entity |
236 | - on behalf of whom a Contribution has been received by Licensor and |
237 | - subsequently incorporated within the Work. |
238 | - |
239 | - 2. Grant of Copyright License. Subject to the terms and conditions of |
240 | - this License, each Contributor hereby grants to You a perpetual, |
241 | - worldwide, non-exclusive, no-charge, royalty-free, irrevocable |
242 | - copyright license to reproduce, prepare Derivative Works of, |
243 | - publicly display, publicly perform, sublicense, and distribute the |
244 | - Work and such Derivative Works in Source or Object form. |
245 | - |
246 | - 3. Grant of Patent License. Subject to the terms and conditions of |
247 | - this License, each Contributor hereby grants to You a perpetual, |
248 | - worldwide, non-exclusive, no-charge, royalty-free, irrevocable |
249 | - (except as stated in this section) patent license to make, have made, |
250 | - use, offer to sell, sell, import, and otherwise transfer the Work, |
251 | - where such license applies only to those patent claims licensable |
252 | - by such Contributor that are necessarily infringed by their |
253 | - Contribution(s) alone or by combination of their Contribution(s) |
254 | - with the Work to which such Contribution(s) was submitted. If You |
255 | - institute patent litigation against any entity (including a |
256 | - cross-claim or counterclaim in a lawsuit) alleging that the Work |
257 | - or a Contribution incorporated within the Work constitutes direct |
258 | - or contributory patent infringement, then any patent licenses |
259 | - granted to You under this License for that Work shall terminate |
260 | - as of the date such litigation is filed. |
261 | - |
262 | - 4. Redistribution. You may reproduce and distribute copies of the |
263 | - Work or Derivative Works thereof in any medium, with or without |
264 | - modifications, and in Source or Object form, provided that You |
265 | - meet the following conditions: |
266 | - |
267 | - (a) You must give any other recipients of the Work or |
268 | - Derivative Works a copy of this License; and |
269 | - |
270 | - (b) You must cause any modified files to carry prominent notices |
271 | - stating that You changed the files; and |
272 | - |
273 | - (c) You must retain, in the Source form of any Derivative Works |
274 | - that You distribute, all copyright, patent, trademark, and |
275 | - attribution notices from the Source form of the Work, |
276 | - excluding those notices that do not pertain to any part of |
277 | - the Derivative Works; and |
278 | - |
279 | - (d) If the Work includes a "NOTICE" text file as part of its |
280 | - distribution, then any Derivative Works that You distribute must |
281 | - include a readable copy of the attribution notices contained |
282 | - within such NOTICE file, excluding those notices that do not |
283 | - pertain to any part of the Derivative Works, in at least one |
284 | - of the following places: within a NOTICE text file distributed |
285 | - as part of the Derivative Works; within the Source form or |
286 | - documentation, if provided along with the Derivative Works; or, |
287 | - within a display generated by the Derivative Works, if and |
288 | - wherever such third-party notices normally appear. The contents |
289 | - of the NOTICE file are for informational purposes only and |
290 | - do not modify the License. You may add Your own attribution |
291 | - notices within Derivative Works that You distribute, alongside |
292 | - or as an addendum to the NOTICE text from the Work, provided |
293 | - that such additional attribution notices cannot be construed |
294 | - as modifying the License. |
295 | - |
296 | - You may add Your own copyright statement to Your modifications and |
297 | - may provide additional or different license terms and conditions |
298 | - for use, reproduction, or distribution of Your modifications, or |
299 | - for any such Derivative Works as a whole, provided Your use, |
300 | - reproduction, and distribution of the Work otherwise complies with |
301 | - the conditions stated in this License. |
302 | - |
303 | - 5. Submission of Contributions. Unless You explicitly state otherwise, |
304 | - any Contribution intentionally submitted for inclusion in the Work |
305 | - by You to the Licensor shall be under the terms and conditions of |
306 | - this License, without any additional terms or conditions. |
307 | - Notwithstanding the above, nothing herein shall supersede or modify |
308 | - the terms of any separate license agreement you may have executed |
309 | - with Licensor regarding such Contributions. |
310 | - |
311 | - 6. Trademarks. This License does not grant permission to use the trade |
312 | - names, trademarks, service marks, or product names of the Licensor, |
313 | - except as required for reasonable and customary use in describing the |
314 | - origin of the Work and reproducing the content of the NOTICE file. |
315 | - |
316 | - 7. Disclaimer of Warranty. Unless required by applicable law or |
317 | - agreed to in writing, Licensor provides the Work (and each |
318 | - Contributor provides its Contributions) on an "AS IS" BASIS, |
319 | - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or |
320 | - implied, including, without limitation, any warranties or conditions |
321 | - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A |
322 | - PARTICULAR PURPOSE. You are solely responsible for determining the |
323 | - appropriateness of using or redistributing the Work and assume any |
324 | - risks associated with Your exercise of permissions under this License. |
325 | - |
326 | - 8. Limitation of Liability. In no event and under no legal theory, |
327 | - whether in tort (including negligence), contract, or otherwise, |
328 | - unless required by applicable law (such as deliberate and grossly |
329 | - negligent acts) or agreed to in writing, shall any Contributor be |
330 | - liable to You for damages, including any direct, indirect, special, |
331 | - incidental, or consequential damages of any character arising as a |
332 | - result of this License or out of the use or inability to use the |
333 | - Work (including but not limited to damages for loss of goodwill, |
334 | - work stoppage, computer failure or malfunction, or any and all |
335 | - other commercial damages or losses), even if such Contributor |
336 | - has been advised of the possibility of such damages. |
337 | - |
338 | - 9. Accepting Warranty or Additional Liability. While redistributing |
339 | - the Work or Derivative Works thereof, You may choose to offer, |
340 | - and charge a fee for, acceptance of support, warranty, indemnity, |
341 | - or other liability obligations and/or rights consistent with this |
342 | - License. However, in accepting such obligations, You may act only |
343 | - on Your own behalf and on Your sole responsibility, not on behalf |
344 | - of any other Contributor, and only if You agree to indemnify, |
345 | - defend, and hold each Contributor harmless for any liability |
346 | - incurred by, or claims asserted against, such Contributor by reason |
347 | - of your accepting any such warranty or additional liability. |
348 | |
349 | === added file 'charmworld/static/css/base.css' |
350 | --- charmworld/static/css/base.css 1970-01-01 00:00:00 +0000 |
351 | +++ charmworld/static/css/base.css 2013-09-05 11:05:34 +0000 |
352 | @@ -0,0 +1,29 @@ |
353 | +table ul { |
354 | + margin: 0; |
355 | + list-style: none; |
356 | +} |
357 | +.box.space-bottom { |
358 | + margin-bottom: 20px; |
359 | +} |
360 | +pre.prettyprint { |
361 | + border: none !important; |
362 | + padding: .6em 1em !important; |
363 | +} |
364 | +pre.prettyprint.linenums { |
365 | + padding-left: 3em !important; |
366 | +} |
367 | + |
368 | +/* Overrides for framework */ |
369 | + |
370 | +/* Fixes spacing and removes default logo */ |
371 | +header.banner .nav-primary.nav-right .logo-ubuntu { |
372 | + width: 150px; |
373 | + padding-top: 11px; |
374 | + background-image: none; |
375 | + text-transform: capitalize; |
376 | +} |
377 | +/* Fixes display issue */ |
378 | +.row.vertical-divider { |
379 | + display: table; |
380 | + width: 100%; |
381 | +} |
382 | |
383 | === removed directory 'charmworld/static/css/bootstrap' |
384 | === removed file 'charmworld/static/css/bootstrap/LICENSE' |
385 | --- charmworld/static/css/bootstrap/LICENSE 2013-02-12 16:12:10 +0000 |
386 | +++ charmworld/static/css/bootstrap/LICENSE 1970-01-01 00:00:00 +0000 |
387 | @@ -1,179 +0,0 @@ |
388 | -Origin of files in this directory: https://github.com/twitter/bootstrap |
389 | - |
390 | - |
391 | - Apache License |
392 | - Version 2.0, January 2004 |
393 | - http://www.apache.org/licenses/ |
394 | - |
395 | - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION |
396 | - |
397 | - 1. Definitions. |
398 | - |
399 | - "License" shall mean the terms and conditions for use, reproduction, |
400 | - and distribution as defined by Sections 1 through 9 of this document. |
401 | - |
402 | - "Licensor" shall mean the copyright owner or entity authorized by |
403 | - the copyright owner that is granting the License. |
404 | - |
405 | - "Legal Entity" shall mean the union of the acting entity and all |
406 | - other entities that control, are controlled by, or are under common |
407 | - control with that entity. For the purposes of this definition, |
408 | - "control" means (i) the power, direct or indirect, to cause the |
409 | - direction or management of such entity, whether by contract or |
410 | - otherwise, or (ii) ownership of fifty percent (50%) or more of the |
411 | - outstanding shares, or (iii) beneficial ownership of such entity. |
412 | - |
413 | - "You" (or "Your") shall mean an individual or Legal Entity |
414 | - exercising permissions granted by this License. |
415 | - |
416 | - "Source" form shall mean the preferred form for making modifications, |
417 | - including but not limited to software source code, documentation |
418 | - source, and configuration files. |
419 | - |
420 | - "Object" form shall mean any form resulting from mechanical |
421 | - transformation or translation of a Source form, including but |
422 | - not limited to compiled object code, generated documentation, |
423 | - and conversions to other media types. |
424 | - |
425 | - "Work" shall mean the work of authorship, whether in Source or |
426 | - Object form, made available under the License, as indicated by a |
427 | - copyright notice that is included in or attached to the work |
428 | - (an example is provided in the Appendix below). |
429 | - |
430 | - "Derivative Works" shall mean any work, whether in Source or Object |
431 | - form, that is based on (or derived from) the Work and for which the |
432 | - editorial revisions, annotations, elaborations, or other modifications |
433 | - represent, as a whole, an original work of authorship. For the purposes |
434 | - of this License, Derivative Works shall not include works that remain |
435 | - separable from, or merely link (or bind by name) to the interfaces of, |
436 | - the Work and Derivative Works thereof. |
437 | - |
438 | - "Contribution" shall mean any work of authorship, including |
439 | - the original version of the Work and any modifications or additions |
440 | - to that Work or Derivative Works thereof, that is intentionally |
441 | - submitted to Licensor for inclusion in the Work by the copyright owner |
442 | - or by an individual or Legal Entity authorized to submit on behalf of |
443 | - the copyright owner. For the purposes of this definition, "submitted" |
444 | - means any form of electronic, verbal, or written communication sent |
445 | - to the Licensor or its representatives, including but not limited to |
446 | - communication on electronic mailing lists, source code control systems, |
447 | - and issue tracking systems that are managed by, or on behalf of, the |
448 | - Licensor for the purpose of discussing and improving the Work, but |
449 | - excluding communication that is conspicuously marked or otherwise |
450 | - designated in writing by the copyright owner as "Not a Contribution." |
451 | - |
452 | - "Contributor" shall mean Licensor and any individual or Legal Entity |
453 | - on behalf of whom a Contribution has been received by Licensor and |
454 | - subsequently incorporated within the Work. |
455 | - |
456 | - 2. Grant of Copyright License. Subject to the terms and conditions of |
457 | - this License, each Contributor hereby grants to You a perpetual, |
458 | - worldwide, non-exclusive, no-charge, royalty-free, irrevocable |
459 | - copyright license to reproduce, prepare Derivative Works of, |
460 | - publicly display, publicly perform, sublicense, and distribute the |
461 | - Work and such Derivative Works in Source or Object form. |
462 | - |
463 | - 3. Grant of Patent License. Subject to the terms and conditions of |
464 | - this License, each Contributor hereby grants to You a perpetual, |
465 | - worldwide, non-exclusive, no-charge, royalty-free, irrevocable |
466 | - (except as stated in this section) patent license to make, have made, |
467 | - use, offer to sell, sell, import, and otherwise transfer the Work, |
468 | - where such license applies only to those patent claims licensable |
469 | - by such Contributor that are necessarily infringed by their |
470 | - Contribution(s) alone or by combination of their Contribution(s) |
471 | - with the Work to which such Contribution(s) was submitted. If You |
472 | - institute patent litigation against any entity (including a |
473 | - cross-claim or counterclaim in a lawsuit) alleging that the Work |
474 | - or a Contribution incorporated within the Work constitutes direct |
475 | - or contributory patent infringement, then any patent licenses |
476 | - granted to You under this License for that Work shall terminate |
477 | - as of the date such litigation is filed. |
478 | - |
479 | - 4. Redistribution. You may reproduce and distribute copies of the |
480 | - Work or Derivative Works thereof in any medium, with or without |
481 | - modifications, and in Source or Object form, provided that You |
482 | - meet the following conditions: |
483 | - |
484 | - (a) You must give any other recipients of the Work or |
485 | - Derivative Works a copy of this License; and |
486 | - |
487 | - (b) You must cause any modified files to carry prominent notices |
488 | - stating that You changed the files; and |
489 | - |
490 | - (c) You must retain, in the Source form of any Derivative Works |
491 | - that You distribute, all copyright, patent, trademark, and |
492 | - attribution notices from the Source form of the Work, |
493 | - excluding those notices that do not pertain to any part of |
494 | - the Derivative Works; and |
495 | - |
496 | - (d) If the Work includes a "NOTICE" text file as part of its |
497 | - distribution, then any Derivative Works that You distribute must |
498 | - include a readable copy of the attribution notices contained |
499 | - within such NOTICE file, excluding those notices that do not |
500 | - pertain to any part of the Derivative Works, in at least one |
501 | - of the following places: within a NOTICE text file distributed |
502 | - as part of the Derivative Works; within the Source form or |
503 | - documentation, if provided along with the Derivative Works; or, |
504 | - within a display generated by the Derivative Works, if and |
505 | - wherever such third-party notices normally appear. The contents |
506 | - of the NOTICE file are for informational purposes only and |
507 | - do not modify the License. You may add Your own attribution |
508 | - notices within Derivative Works that You distribute, alongside |
509 | - or as an addendum to the NOTICE text from the Work, provided |
510 | - that such additional attribution notices cannot be construed |
511 | - as modifying the License. |
512 | - |
513 | - You may add Your own copyright statement to Your modifications and |
514 | - may provide additional or different license terms and conditions |
515 | - for use, reproduction, or distribution of Your modifications, or |
516 | - for any such Derivative Works as a whole, provided Your use, |
517 | - reproduction, and distribution of the Work otherwise complies with |
518 | - the conditions stated in this License. |
519 | - |
520 | - 5. Submission of Contributions. Unless You explicitly state otherwise, |
521 | - any Contribution intentionally submitted for inclusion in the Work |
522 | - by You to the Licensor shall be under the terms and conditions of |
523 | - this License, without any additional terms or conditions. |
524 | - Notwithstanding the above, nothing herein shall supersede or modify |
525 | - the terms of any separate license agreement you may have executed |
526 | - with Licensor regarding such Contributions. |
527 | - |
528 | - 6. Trademarks. This License does not grant permission to use the trade |
529 | - names, trademarks, service marks, or product names of the Licensor, |
530 | - except as required for reasonable and customary use in describing the |
531 | - origin of the Work and reproducing the content of the NOTICE file. |
532 | - |
533 | - 7. Disclaimer of Warranty. Unless required by applicable law or |
534 | - agreed to in writing, Licensor provides the Work (and each |
535 | - Contributor provides its Contributions) on an "AS IS" BASIS, |
536 | - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or |
537 | - implied, including, without limitation, any warranties or conditions |
538 | - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A |
539 | - PARTICULAR PURPOSE. You are solely responsible for determining the |
540 | - appropriateness of using or redistributing the Work and assume any |
541 | - risks associated with Your exercise of permissions under this License. |
542 | - |
543 | - 8. Limitation of Liability. In no event and under no legal theory, |
544 | - whether in tort (including negligence), contract, or otherwise, |
545 | - unless required by applicable law (such as deliberate and grossly |
546 | - negligent acts) or agreed to in writing, shall any Contributor be |
547 | - liable to You for damages, including any direct, indirect, special, |
548 | - incidental, or consequential damages of any character arising as a |
549 | - result of this License or out of the use or inability to use the |
550 | - Work (including but not limited to damages for loss of goodwill, |
551 | - work stoppage, computer failure or malfunction, or any and all |
552 | - other commercial damages or losses), even if such Contributor |
553 | - has been advised of the possibility of such damages. |
554 | - |
555 | - 9. Accepting Warranty or Additional Liability. While redistributing |
556 | - the Work or Derivative Works thereof, You may choose to offer, |
557 | - and charge a fee for, acceptance of support, warranty, indemnity, |
558 | - or other liability obligations and/or rights consistent with this |
559 | - License. However, in accepting such obligations, You may act only |
560 | - on Your own behalf and on Your sole responsibility, not on behalf |
561 | - of any other Contributor, and only if You agree to indemnify, |
562 | - defend, and hold each Contributor harmless for any liability |
563 | - incurred by, or claims asserted against, such Contributor by reason |
564 | - of your accepting any such warranty or additional liability. |
565 | - |
566 | - END OF TERMS AND CONDITIONS |
567 | |
568 | === removed file 'charmworld/static/css/bootstrap/accordion.less' |
569 | --- charmworld/static/css/bootstrap/accordion.less 2013-01-21 13:40:18 +0000 |
570 | +++ charmworld/static/css/bootstrap/accordion.less 1970-01-01 00:00:00 +0000 |
571 | @@ -1,34 +0,0 @@ |
572 | -// |
573 | -// Accordion |
574 | -// -------------------------------------------------- |
575 | - |
576 | - |
577 | -// Parent container |
578 | -.accordion { |
579 | - margin-bottom: @baseLineHeight; |
580 | -} |
581 | - |
582 | -// Group == heading + body |
583 | -.accordion-group { |
584 | - margin-bottom: 2px; |
585 | - border: 1px solid #e5e5e5; |
586 | - .border-radius(@baseBorderRadius); |
587 | -} |
588 | -.accordion-heading { |
589 | - border-bottom: 0; |
590 | -} |
591 | -.accordion-heading .accordion-toggle { |
592 | - display: block; |
593 | - padding: 8px 15px; |
594 | -} |
595 | - |
596 | -// General toggle styles |
597 | -.accordion-toggle { |
598 | - cursor: pointer; |
599 | -} |
600 | - |
601 | -// Inner needs the styles because you can't animate properly with any styles on the element |
602 | -.accordion-inner { |
603 | - padding: 9px 15px; |
604 | - border-top: 1px solid #e5e5e5; |
605 | -} |
606 | |
607 | === removed file 'charmworld/static/css/bootstrap/alerts.less' |
608 | --- charmworld/static/css/bootstrap/alerts.less 2013-01-21 13:40:18 +0000 |
609 | +++ charmworld/static/css/bootstrap/alerts.less 1970-01-01 00:00:00 +0000 |
610 | @@ -1,79 +0,0 @@ |
611 | -// |
612 | -// Alerts |
613 | -// -------------------------------------------------- |
614 | - |
615 | - |
616 | -// Base styles |
617 | -// ------------------------- |
618 | - |
619 | -.alert { |
620 | - padding: 8px 35px 8px 14px; |
621 | - margin-bottom: @baseLineHeight; |
622 | - text-shadow: 0 1px 0 rgba(255,255,255,.5); |
623 | - background-color: @warningBackground; |
624 | - border: 1px solid @warningBorder; |
625 | - .border-radius(@baseBorderRadius); |
626 | -} |
627 | -.alert, |
628 | -.alert h4 { |
629 | - // Specified for the h4 to prevent conflicts of changing @headingsColor |
630 | - color: @warningText; |
631 | -} |
632 | -.alert h4 { |
633 | - margin: 0; |
634 | -} |
635 | - |
636 | -// Adjust close link position |
637 | -.alert .close { |
638 | - position: relative; |
639 | - top: -2px; |
640 | - right: -21px; |
641 | - line-height: @baseLineHeight; |
642 | -} |
643 | - |
644 | - |
645 | -// Alternate styles |
646 | -// ------------------------- |
647 | - |
648 | -.alert-success { |
649 | - background-color: @successBackground; |
650 | - border-color: @successBorder; |
651 | - color: @successText; |
652 | -} |
653 | -.alert-success h4 { |
654 | - color: @successText; |
655 | -} |
656 | -.alert-danger, |
657 | -.alert-error { |
658 | - background-color: @errorBackground; |
659 | - border-color: @errorBorder; |
660 | - color: @errorText; |
661 | -} |
662 | -.alert-danger h4, |
663 | -.alert-error h4 { |
664 | - color: @errorText; |
665 | -} |
666 | -.alert-info { |
667 | - background-color: @infoBackground; |
668 | - border-color: @infoBorder; |
669 | - color: @infoText; |
670 | -} |
671 | -.alert-info h4 { |
672 | - color: @infoText; |
673 | -} |
674 | - |
675 | - |
676 | -// Block alerts |
677 | -// ------------------------- |
678 | - |
679 | -.alert-block { |
680 | - padding-top: 14px; |
681 | - padding-bottom: 14px; |
682 | -} |
683 | -.alert-block > p, |
684 | -.alert-block > ul { |
685 | - margin-bottom: 0; |
686 | -} |
687 | -.alert-block p + p { |
688 | - margin-top: 5px; |
689 | -} |
690 | |
691 | === removed file 'charmworld/static/css/bootstrap/bootstrap.less' |
692 | --- charmworld/static/css/bootstrap/bootstrap.less 2013-01-21 13:40:18 +0000 |
693 | +++ charmworld/static/css/bootstrap/bootstrap.less 1970-01-01 00:00:00 +0000 |
694 | @@ -1,63 +0,0 @@ |
695 | -/*! |
696 | - * Bootstrap v2.2.2 |
697 | - * |
698 | - * Copyright 2012 Twitter, Inc |
699 | - * Licensed under the Apache License v2.0 |
700 | - * http://www.apache.org/licenses/LICENSE-2.0 |
701 | - * |
702 | - * Designed and built with all the love in the world @twitter by @mdo and @fat. |
703 | - */ |
704 | - |
705 | -// CSS Reset |
706 | -@import "reset.less"; |
707 | - |
708 | -// Core variables and mixins |
709 | -@import "variables.less"; // Modify this for custom colors, font-sizes, etc |
710 | -@import "mixins.less"; |
711 | - |
712 | -// Grid system and page structure |
713 | -@import "scaffolding.less"; |
714 | -@import "grid.less"; |
715 | -@import "layouts.less"; |
716 | - |
717 | -// Base CSS |
718 | -@import "type.less"; |
719 | -@import "code.less"; |
720 | -@import "forms.less"; |
721 | -@import "tables.less"; |
722 | - |
723 | -// Components: common |
724 | -@import "sprites.less"; |
725 | -@import "dropdowns.less"; |
726 | -@import "wells.less"; |
727 | -@import "component-animations.less"; |
728 | -@import "close.less"; |
729 | - |
730 | -// Components: Buttons & Alerts |
731 | -@import "buttons.less"; |
732 | -@import "button-groups.less"; |
733 | -@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less |
734 | - |
735 | -// Components: Nav |
736 | -@import "navs.less"; |
737 | -@import "navbar.less"; |
738 | -@import "breadcrumbs.less"; |
739 | -@import "pagination.less"; |
740 | -@import "pager.less"; |
741 | - |
742 | -// Components: Popovers |
743 | -@import "modals.less"; |
744 | -@import "tooltip.less"; |
745 | -@import "popovers.less"; |
746 | - |
747 | -// Components: Misc |
748 | -@import "thumbnails.less"; |
749 | -@import "media.less"; |
750 | -@import "labels-badges.less"; |
751 | -@import "progress-bars.less"; |
752 | -@import "accordion.less"; |
753 | -@import "carousel.less"; |
754 | -@import "hero-unit.less"; |
755 | - |
756 | -// Utility classes |
757 | -@import "utilities.less"; // Has to be last to override when necessary |
758 | |
759 | === removed file 'charmworld/static/css/bootstrap/breadcrumbs.less' |
760 | --- charmworld/static/css/bootstrap/breadcrumbs.less 2013-01-21 13:40:18 +0000 |
761 | +++ charmworld/static/css/bootstrap/breadcrumbs.less 1970-01-01 00:00:00 +0000 |
762 | @@ -1,24 +0,0 @@ |
763 | -// |
764 | -// Breadcrumbs |
765 | -// -------------------------------------------------- |
766 | - |
767 | - |
768 | -.breadcrumb { |
769 | - padding: 8px 15px; |
770 | - margin: 0 0 @baseLineHeight; |
771 | - list-style: none; |
772 | - background-color: #f5f5f5; |
773 | - .border-radius(@baseBorderRadius); |
774 | - > li { |
775 | - display: inline-block; |
776 | - .ie7-inline-block(); |
777 | - text-shadow: 0 1px 0 @white; |
778 | - > .divider { |
779 | - padding: 0 5px; |
780 | - color: #ccc; |
781 | - } |
782 | - } |
783 | - > .active { |
784 | - color: @grayLight; |
785 | - } |
786 | -} |
787 | |
788 | === removed file 'charmworld/static/css/bootstrap/button-groups.less' |
789 | --- charmworld/static/css/bootstrap/button-groups.less 2013-01-21 13:40:18 +0000 |
790 | +++ charmworld/static/css/bootstrap/button-groups.less 1970-01-01 00:00:00 +0000 |
791 | @@ -1,227 +0,0 @@ |
792 | -// |
793 | -// Button groups |
794 | -// -------------------------------------------------- |
795 | - |
796 | - |
797 | -// Make the div behave like a button |
798 | -.btn-group { |
799 | - position: relative; |
800 | - display: inline-block; |
801 | - .ie7-inline-block(); |
802 | - font-size: 0; // remove as part 1 of font-size inline-block hack |
803 | - vertical-align: middle; // match .btn alignment given font-size hack above |
804 | - white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page) |
805 | - .ie7-restore-left-whitespace(); |
806 | -} |
807 | - |
808 | -// Space out series of button groups |
809 | -.btn-group + .btn-group { |
810 | - margin-left: 5px; |
811 | -} |
812 | - |
813 | -// Optional: Group multiple button groups together for a toolbar |
814 | -.btn-toolbar { |
815 | - font-size: 0; // Hack to remove whitespace that results from using inline-block |
816 | - margin-top: @baseLineHeight / 2; |
817 | - margin-bottom: @baseLineHeight / 2; |
818 | - > .btn + .btn, |
819 | - > .btn-group + .btn, |
820 | - > .btn + .btn-group { |
821 | - margin-left: 5px; |
822 | - } |
823 | -} |
824 | - |
825 | -// Float them, remove border radius, then re-add to first and last elements |
826 | -.btn-group > .btn { |
827 | - position: relative; |
828 | - .border-radius(0); |
829 | -} |
830 | -.btn-group > .btn + .btn { |
831 | - margin-left: -1px; |
832 | -} |
833 | -.btn-group > .btn, |
834 | -.btn-group > .dropdown-menu, |
835 | -.btn-group > .popover { |
836 | - font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack |
837 | -} |
838 | - |
839 | -// Reset fonts for other sizes |
840 | -.btn-group > .btn-mini { |
841 | - font-size: @fontSizeMini; |
842 | -} |
843 | -.btn-group > .btn-small { |
844 | - font-size: @fontSizeSmall; |
845 | -} |
846 | -.btn-group > .btn-large { |
847 | - font-size: @fontSizeLarge; |
848 | -} |
849 | - |
850 | -// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match |
851 | -.btn-group > .btn:first-child { |
852 | - margin-left: 0; |
853 | - .border-top-left-radius(@baseBorderRadius); |
854 | - .border-bottom-left-radius(@baseBorderRadius); |
855 | -} |
856 | -// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it |
857 | -.btn-group > .btn:last-child, |
858 | -.btn-group > .dropdown-toggle { |
859 | - .border-top-right-radius(@baseBorderRadius); |
860 | - .border-bottom-right-radius(@baseBorderRadius); |
861 | -} |
862 | -// Reset corners for large buttons |
863 | -.btn-group > .btn.large:first-child { |
864 | - margin-left: 0; |
865 | - .border-top-left-radius(@borderRadiusLarge); |
866 | - .border-bottom-left-radius(@borderRadiusLarge); |
867 | -} |
868 | -.btn-group > .btn.large:last-child, |
869 | -.btn-group > .large.dropdown-toggle { |
870 | - .border-top-right-radius(@borderRadiusLarge); |
871 | - .border-bottom-right-radius(@borderRadiusLarge); |
872 | -} |
873 | - |
874 | -// On hover/focus/active, bring the proper btn to front |
875 | -.btn-group > .btn:hover, |
876 | -.btn-group > .btn:focus, |
877 | -.btn-group > .btn:active, |
878 | -.btn-group > .btn.active { |
879 | - z-index: 2; |
880 | -} |
881 | - |
882 | -// On active and open, don't show outline |
883 | -.btn-group .dropdown-toggle:active, |
884 | -.btn-group.open .dropdown-toggle { |
885 | - outline: 0; |
886 | -} |
887 | - |
888 | - |
889 | - |
890 | -// Split button dropdowns |
891 | -// ---------------------- |
892 | - |
893 | -// Give the line between buttons some depth |
894 | -.btn-group > .btn + .dropdown-toggle { |
895 | - padding-left: 8px; |
896 | - padding-right: 8px; |
897 | - .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)"); |
898 | - *padding-top: 5px; |
899 | - *padding-bottom: 5px; |
900 | -} |
901 | -.btn-group > .btn-mini + .dropdown-toggle { |
902 | - padding-left: 5px; |
903 | - padding-right: 5px; |
904 | - *padding-top: 2px; |
905 | - *padding-bottom: 2px; |
906 | -} |
907 | -.btn-group > .btn-small + .dropdown-toggle { |
908 | - *padding-top: 5px; |
909 | - *padding-bottom: 4px; |
910 | -} |
911 | -.btn-group > .btn-large + .dropdown-toggle { |
912 | - padding-left: 12px; |
913 | - padding-right: 12px; |
914 | - *padding-top: 7px; |
915 | - *padding-bottom: 7px; |
916 | -} |
917 | - |
918 | -.btn-group.open { |
919 | - |
920 | - // The clickable button for toggling the menu |
921 | - // Remove the gradient and set the same inset shadow as the :active state |
922 | - .dropdown-toggle { |
923 | - background-image: none; |
924 | - .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)"); |
925 | - } |
926 | - |
927 | - // Keep the hover's background when dropdown is open |
928 | - .btn.dropdown-toggle { |
929 | - background-color: @btnBackgroundHighlight; |
930 | - } |
931 | - .btn-primary.dropdown-toggle { |
932 | - background-color: @btnPrimaryBackgroundHighlight; |
933 | - } |
934 | - .btn-warning.dropdown-toggle { |
935 | - background-color: @btnWarningBackgroundHighlight; |
936 | - } |
937 | - .btn-danger.dropdown-toggle { |
938 | - background-color: @btnDangerBackgroundHighlight; |
939 | - } |
940 | - .btn-success.dropdown-toggle { |
941 | - background-color: @btnSuccessBackgroundHighlight; |
942 | - } |
943 | - .btn-info.dropdown-toggle { |
944 | - background-color: @btnInfoBackgroundHighlight; |
945 | - } |
946 | - .btn-inverse.dropdown-toggle { |
947 | - background-color: @btnInverseBackgroundHighlight; |
948 | - } |
949 | -} |
950 | - |
951 | - |
952 | -// Reposition the caret |
953 | -.btn .caret { |
954 | - margin-top: 8px; |
955 | - margin-left: 0; |
956 | -} |
957 | -// Carets in other button sizes |
958 | -.btn-mini .caret, |
959 | -.btn-small .caret, |
960 | -.btn-large .caret { |
961 | - margin-top: 6px; |
962 | -} |
963 | -.btn-large .caret { |
964 | - border-left-width: 5px; |
965 | - border-right-width: 5px; |
966 | - border-top-width: 5px; |
967 | -} |
968 | -// Upside down carets for .dropup |
969 | -.dropup .btn-large .caret { |
970 | - border-bottom-width: 5px; |
971 | -} |
972 | - |
973 | - |
974 | - |
975 | -// Account for other colors |
976 | -.btn-primary, |
977 | -.btn-warning, |
978 | -.btn-danger, |
979 | -.btn-info, |
980 | -.btn-success, |
981 | -.btn-inverse { |
982 | - .caret { |
983 | - border-top-color: @white; |
984 | - border-bottom-color: @white; |
985 | - } |
986 | -} |
987 | - |
988 | - |
989 | - |
990 | -// Vertical button groups |
991 | -// ---------------------- |
992 | - |
993 | -.btn-group-vertical { |
994 | - display: inline-block; // makes buttons only take up the width they need |
995 | - .ie7-inline-block(); |
996 | -} |
997 | -.btn-group-vertical > .btn { |
998 | - display: block; |
999 | - float: none; |
1000 | - max-width: 100%; |
1001 | - .border-radius(0); |
1002 | -} |
1003 | -.btn-group-vertical > .btn + .btn { |
1004 | - margin-left: 0; |
1005 | - margin-top: -1px; |
1006 | -} |
1007 | -.btn-group-vertical > .btn:first-child { |
1008 | - .border-radius(@baseBorderRadius @baseBorderRadius 0 0); |
1009 | -} |
1010 | -.btn-group-vertical > .btn:last-child { |
1011 | - .border-radius(0 0 @baseBorderRadius @baseBorderRadius); |
1012 | -} |
1013 | -.btn-group-vertical > .btn-large:first-child { |
1014 | - .border-radius(@borderRadiusLarge @borderRadiusLarge 0 0); |
1015 | -} |
1016 | -.btn-group-vertical > .btn-large:last-child { |
1017 | - .border-radius(0 0 @borderRadiusLarge @borderRadiusLarge); |
1018 | -} |
1019 | |
1020 | === removed file 'charmworld/static/css/bootstrap/buttons.less' |
1021 | --- charmworld/static/css/bootstrap/buttons.less 2013-01-21 13:40:18 +0000 |
1022 | +++ charmworld/static/css/bootstrap/buttons.less 1970-01-01 00:00:00 +0000 |
1023 | @@ -1,230 +0,0 @@ |
1024 | -// |
1025 | -// Buttons |
1026 | -// -------------------------------------------------- |
1027 | - |
1028 | - |
1029 | -// Base styles |
1030 | -// -------------------------------------------------- |
1031 | - |
1032 | -// Core |
1033 | -.btn { |
1034 | - display: inline-block; |
1035 | - .ie7-inline-block(); |
1036 | - padding: 4px 12px; |
1037 | - margin-bottom: 0; // For input.btn |
1038 | - font-size: @baseFontSize; |
1039 | - line-height: @baseLineHeight; |
1040 | - text-align: center; |
1041 | - vertical-align: middle; |
1042 | - cursor: pointer; |
1043 | - .buttonBackground(@btnBackground, @btnBackgroundHighlight, @grayDark, 0 1px 1px rgba(255,255,255,.75)); |
1044 | - border: 1px solid @btnBorder; |
1045 | - *border: 0; // Remove the border to prevent IE7's black border on input:focus |
1046 | - border-bottom-color: darken(@btnBorder, 10%); |
1047 | - .border-radius(@baseBorderRadius); |
1048 | - .ie7-restore-left-whitespace(); // Give IE7 some love |
1049 | - .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)"); |
1050 | - |
1051 | - // Hover state |
1052 | - &:hover { |
1053 | - color: @grayDark; |
1054 | - text-decoration: none; |
1055 | - background-position: 0 -15px; |
1056 | - |
1057 | - // transition is only when going to hover, otherwise the background |
1058 | - // behind the gradient (there for IE<=9 fallback) gets mismatched |
1059 | - .transition(background-position .1s linear); |
1060 | - } |
1061 | - |
1062 | - // Focus state for keyboard and accessibility |
1063 | - &:focus { |
1064 | - .tab-focus(); |
1065 | - } |
1066 | - |
1067 | - // Active state |
1068 | - &.active, |
1069 | - &:active { |
1070 | - background-image: none; |
1071 | - outline: 0; |
1072 | - .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)"); |
1073 | - } |
1074 | - |
1075 | - // Disabled state |
1076 | - &.disabled, |
1077 | - &[disabled] { |
1078 | - cursor: default; |
1079 | - background-image: none; |
1080 | - .opacity(65); |
1081 | - .box-shadow(none); |
1082 | - } |
1083 | - |
1084 | -} |
1085 | - |
1086 | - |
1087 | - |
1088 | -// Button Sizes |
1089 | -// -------------------------------------------------- |
1090 | - |
1091 | -// Large |
1092 | -.btn-large { |
1093 | - padding: @paddingLarge; |
1094 | - font-size: @fontSizeLarge; |
1095 | - .border-radius(@borderRadiusLarge); |
1096 | -} |
1097 | -.btn-large [class^="icon-"], |
1098 | -.btn-large [class*=" icon-"] { |
1099 | - margin-top: 4px; |
1100 | -} |
1101 | - |
1102 | -// Small |
1103 | -.btn-small { |
1104 | - padding: @paddingSmall; |
1105 | - font-size: @fontSizeSmall; |
1106 | - .border-radius(@borderRadiusSmall); |
1107 | -} |
1108 | -.btn-small [class^="icon-"], |
1109 | -.btn-small [class*=" icon-"] { |
1110 | - margin-top: 0; |
1111 | -} |
1112 | -.btn-mini [class^="icon-"], |
1113 | -.btn-mini [class*=" icon-"] { |
1114 | - margin-top: -1px; |
1115 | -} |
1116 | - |
1117 | -// Mini |
1118 | -.btn-mini { |
1119 | - padding: @paddingMini; |
1120 | - font-size: @fontSizeMini; |
1121 | - .border-radius(@borderRadiusSmall); |
1122 | -} |
1123 | - |
1124 | - |
1125 | -// Block button |
1126 | -// ------------------------- |
1127 | - |
1128 | -.btn-block { |
1129 | - display: block; |
1130 | - width: 100%; |
1131 | - padding-left: 0; |
1132 | - padding-right: 0; |
1133 | - .box-sizing(border-box); |
1134 | -} |
1135 | - |
1136 | -// Vertically space out multiple block buttons |
1137 | -.btn-block + .btn-block { |
1138 | - margin-top: 5px; |
1139 | -} |
1140 | - |
1141 | -// Specificity overrides |
1142 | -input[type="submit"], |
1143 | -input[type="reset"], |
1144 | -input[type="button"] { |
1145 | - &.btn-block { |
1146 | - width: 100%; |
1147 | - } |
1148 | -} |
1149 | - |
1150 | - |
1151 | - |
1152 | -// Alternate buttons |
1153 | -// -------------------------------------------------- |
1154 | - |
1155 | -// Provide *some* extra contrast for those who can get it |
1156 | -.btn-primary.active, |
1157 | -.btn-warning.active, |
1158 | -.btn-danger.active, |
1159 | -.btn-success.active, |
1160 | -.btn-info.active, |
1161 | -.btn-inverse.active { |
1162 | - color: rgba(255,255,255,.75); |
1163 | -} |
1164 | - |
1165 | -// Set the backgrounds |
1166 | -// ------------------------- |
1167 | -.btn { |
1168 | - // reset here as of 2.0.3 due to Recess property order |
1169 | - border-color: #c5c5c5; |
1170 | - border-color: rgba(0,0,0,.15) rgba(0,0,0,.15) rgba(0,0,0,.25); |
1171 | -} |
1172 | -.btn-primary { |
1173 | - .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight); |
1174 | -} |
1175 | -// Warning appears are orange |
1176 | -.btn-warning { |
1177 | - .buttonBackground(@btnWarningBackground, @btnWarningBackgroundHighlight); |
1178 | -} |
1179 | -// Danger and error appear as red |
1180 | -.btn-danger { |
1181 | - .buttonBackground(@btnDangerBackground, @btnDangerBackgroundHighlight); |
1182 | -} |
1183 | -// Success appears as green |
1184 | -.btn-success { |
1185 | - .buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight); |
1186 | -} |
1187 | -// Info appears as a neutral blue |
1188 | -.btn-info { |
1189 | - .buttonBackground(@btnInfoBackground, @btnInfoBackgroundHighlight); |
1190 | -} |
1191 | -// Inverse appears as dark gray |
1192 | -.btn-inverse { |
1193 | - .buttonBackground(@btnInverseBackground, @btnInverseBackgroundHighlight); |
1194 | -} |
1195 | - |
1196 | - |
1197 | -// Cross-browser Jank |
1198 | -// -------------------------------------------------- |
1199 | - |
1200 | -button.btn, |
1201 | -input[type="submit"].btn { |
1202 | - |
1203 | - // Firefox 3.6 only I believe |
1204 | - &::-moz-focus-inner { |
1205 | - padding: 0; |
1206 | - border: 0; |
1207 | - } |
1208 | - |
1209 | - // IE7 has some default padding on button controls |
1210 | - *padding-top: 3px; |
1211 | - *padding-bottom: 3px; |
1212 | - |
1213 | - &.btn-large { |
1214 | - *padding-top: 7px; |
1215 | - *padding-bottom: 7px; |
1216 | - } |
1217 | - &.btn-small { |
1218 | - *padding-top: 3px; |
1219 | - *padding-bottom: 3px; |
1220 | - } |
1221 | - &.btn-mini { |
1222 | - *padding-top: 1px; |
1223 | - *padding-bottom: 1px; |
1224 | - } |
1225 | -} |
1226 | - |
1227 | - |
1228 | -// Link buttons |
1229 | -// -------------------------------------------------- |
1230 | - |
1231 | -// Make a button look and behave like a link |
1232 | -.btn-link, |
1233 | -.btn-link:active, |
1234 | -.btn-link[disabled] { |
1235 | - background-color: transparent; |
1236 | - background-image: none; |
1237 | - .box-shadow(none); |
1238 | -} |
1239 | -.btn-link { |
1240 | - border-color: transparent; |
1241 | - cursor: pointer; |
1242 | - color: @linkColor; |
1243 | - .border-radius(0); |
1244 | -} |
1245 | -.btn-link:hover { |
1246 | - color: @linkColorHover; |
1247 | - text-decoration: underline; |
1248 | - background-color: transparent; |
1249 | -} |
1250 | -.btn-link[disabled]:hover { |
1251 | - color: @grayDark; |
1252 | - text-decoration: none; |
1253 | -} |
1254 | |
1255 | === removed file 'charmworld/static/css/bootstrap/carousel.less' |
1256 | --- charmworld/static/css/bootstrap/carousel.less 2013-01-21 13:40:18 +0000 |
1257 | +++ charmworld/static/css/bootstrap/carousel.less 1970-01-01 00:00:00 +0000 |
1258 | @@ -1,131 +0,0 @@ |
1259 | -// |
1260 | -// Carousel |
1261 | -// -------------------------------------------------- |
1262 | - |
1263 | - |
1264 | -.carousel { |
1265 | - position: relative; |
1266 | - margin-bottom: @baseLineHeight; |
1267 | - line-height: 1; |
1268 | -} |
1269 | - |
1270 | -.carousel-inner { |
1271 | - overflow: hidden; |
1272 | - width: 100%; |
1273 | - position: relative; |
1274 | -} |
1275 | - |
1276 | -.carousel-inner { |
1277 | - |
1278 | - > .item { |
1279 | - display: none; |
1280 | - position: relative; |
1281 | - .transition(.6s ease-in-out left); |
1282 | - } |
1283 | - |
1284 | - // Account for jankitude on images |
1285 | - > .item > img { |
1286 | - display: block; |
1287 | - line-height: 1; |
1288 | - } |
1289 | - |
1290 | - > .active, |
1291 | - > .next, |
1292 | - > .prev { display: block; } |
1293 | - |
1294 | - > .active { |
1295 | - left: 0; |
1296 | - } |
1297 | - |
1298 | - > .next, |
1299 | - > .prev { |
1300 | - position: absolute; |
1301 | - top: 0; |
1302 | - width: 100%; |
1303 | - } |
1304 | - |
1305 | - > .next { |
1306 | - left: 100%; |
1307 | - } |
1308 | - > .prev { |
1309 | - left: -100%; |
1310 | - } |
1311 | - > .next.left, |
1312 | - > .prev.right { |
1313 | - left: 0; |
1314 | - } |
1315 | - |
1316 | - > .active.left { |
1317 | - left: -100%; |
1318 | - } |
1319 | - > .active.right { |
1320 | - left: 100%; |
1321 | - } |
1322 | - |
1323 | -} |
1324 | - |
1325 | -// Left/right controls for nav |
1326 | -// --------------------------- |
1327 | - |
1328 | -.carousel-control { |
1329 | - position: absolute; |
1330 | - top: 40%; |
1331 | - left: 15px; |
1332 | - width: 40px; |
1333 | - height: 40px; |
1334 | - margin-top: -20px; |
1335 | - font-size: 60px; |
1336 | - font-weight: 100; |
1337 | - line-height: 30px; |
1338 | - color: @white; |
1339 | - text-align: center; |
1340 | - background: @grayDarker; |
1341 | - border: 3px solid @white; |
1342 | - .border-radius(23px); |
1343 | - .opacity(50); |
1344 | - |
1345 | - // we can't have this transition here |
1346 | - // because webkit cancels the carousel |
1347 | - // animation if you trip this while |
1348 | - // in the middle of another animation |
1349 | - // ;_; |
1350 | - // .transition(opacity .2s linear); |
1351 | - |
1352 | - // Reposition the right one |
1353 | - &.right { |
1354 | - left: auto; |
1355 | - right: 15px; |
1356 | - } |
1357 | - |
1358 | - // Hover state |
1359 | - &:hover { |
1360 | - color: @white; |
1361 | - text-decoration: none; |
1362 | - .opacity(90); |
1363 | - } |
1364 | -} |
1365 | - |
1366 | - |
1367 | -// Caption for text below images |
1368 | -// ----------------------------- |
1369 | - |
1370 | -.carousel-caption { |
1371 | - position: absolute; |
1372 | - left: 0; |
1373 | - right: 0; |
1374 | - bottom: 0; |
1375 | - padding: 15px; |
1376 | - background: @grayDark; |
1377 | - background: rgba(0,0,0,.75); |
1378 | -} |
1379 | -.carousel-caption h4, |
1380 | -.carousel-caption p { |
1381 | - color: @white; |
1382 | - line-height: @baseLineHeight; |
1383 | -} |
1384 | -.carousel-caption h4 { |
1385 | - margin: 0 0 5px; |
1386 | -} |
1387 | -.carousel-caption p { |
1388 | - margin-bottom: 0; |
1389 | -} |
1390 | |
1391 | === removed file 'charmworld/static/css/bootstrap/close.less' |
1392 | --- charmworld/static/css/bootstrap/close.less 2013-01-21 13:40:18 +0000 |
1393 | +++ charmworld/static/css/bootstrap/close.less 1970-01-01 00:00:00 +0000 |
1394 | @@ -1,31 +0,0 @@ |
1395 | -// |
1396 | -// Close icons |
1397 | -// -------------------------------------------------- |
1398 | - |
1399 | - |
1400 | -.close { |
1401 | - float: right; |
1402 | - font-size: 20px; |
1403 | - font-weight: bold; |
1404 | - line-height: @baseLineHeight; |
1405 | - color: @black; |
1406 | - text-shadow: 0 1px 0 rgba(255,255,255,1); |
1407 | - .opacity(20); |
1408 | - &:hover { |
1409 | - color: @black; |
1410 | - text-decoration: none; |
1411 | - cursor: pointer; |
1412 | - .opacity(40); |
1413 | - } |
1414 | -} |
1415 | - |
1416 | -// Additional properties for button version |
1417 | -// iOS requires the button element instead of an anchor tag. |
1418 | -// If you want the anchor version, it requires `href="#"`. |
1419 | -button.close { |
1420 | - padding: 0; |
1421 | - cursor: pointer; |
1422 | - background: transparent; |
1423 | - border: 0; |
1424 | - -webkit-appearance: none; |
1425 | -} |
1426 | \ No newline at end of file |
1427 | |
1428 | === removed file 'charmworld/static/css/bootstrap/code.less' |
1429 | --- charmworld/static/css/bootstrap/code.less 2013-01-21 13:40:18 +0000 |
1430 | +++ charmworld/static/css/bootstrap/code.less 1970-01-01 00:00:00 +0000 |
1431 | @@ -1,61 +0,0 @@ |
1432 | -// |
1433 | -// Code (inline and blocK) |
1434 | -// -------------------------------------------------- |
1435 | - |
1436 | - |
1437 | -// Inline and block code styles |
1438 | -code, |
1439 | -pre { |
1440 | - padding: 0 3px 2px; |
1441 | - #font > #family > .monospace; |
1442 | - font-size: @baseFontSize - 2; |
1443 | - color: @grayDark; |
1444 | - .border-radius(3px); |
1445 | -} |
1446 | - |
1447 | -// Inline code |
1448 | -code { |
1449 | - padding: 2px 4px; |
1450 | - color: #d14; |
1451 | - background-color: #f7f7f9; |
1452 | - border: 1px solid #e1e1e8; |
1453 | - white-space: nowrap; |
1454 | -} |
1455 | - |
1456 | -// Blocks of code |
1457 | -pre { |
1458 | - display: block; |
1459 | - padding: (@baseLineHeight - 1) / 2; |
1460 | - margin: 0 0 @baseLineHeight / 2; |
1461 | - font-size: @baseFontSize - 1; // 14px to 13px |
1462 | - line-height: @baseLineHeight; |
1463 | - word-break: break-all; |
1464 | - word-wrap: break-word; |
1465 | - white-space: pre; |
1466 | - white-space: pre-wrap; |
1467 | - background-color: #f5f5f5; |
1468 | - border: 1px solid #ccc; // fallback for IE7-8 |
1469 | - border: 1px solid rgba(0,0,0,.15); |
1470 | - .border-radius(@baseBorderRadius); |
1471 | - |
1472 | - // Make prettyprint styles more spaced out for readability |
1473 | - &.prettyprint { |
1474 | - margin-bottom: @baseLineHeight; |
1475 | - } |
1476 | - |
1477 | - // Account for some code outputs that place code tags in pre tags |
1478 | - code { |
1479 | - padding: 0; |
1480 | - color: inherit; |
1481 | - white-space: pre; |
1482 | - white-space: pre-wrap; |
1483 | - background-color: transparent; |
1484 | - border: 0; |
1485 | - } |
1486 | -} |
1487 | - |
1488 | -// Enable scrollable blocks of code |
1489 | -.pre-scrollable { |
1490 | - max-height: 340px; |
1491 | - overflow-y: scroll; |
1492 | -} |
1493 | \ No newline at end of file |
1494 | |
1495 | === removed file 'charmworld/static/css/bootstrap/component-animations.less' |
1496 | --- charmworld/static/css/bootstrap/component-animations.less 2013-01-21 13:40:18 +0000 |
1497 | +++ charmworld/static/css/bootstrap/component-animations.less 1970-01-01 00:00:00 +0000 |
1498 | @@ -1,22 +0,0 @@ |
1499 | -// |
1500 | -// Component animations |
1501 | -// -------------------------------------------------- |
1502 | - |
1503 | - |
1504 | -.fade { |
1505 | - opacity: 0; |
1506 | - .transition(opacity .15s linear); |
1507 | - &.in { |
1508 | - opacity: 1; |
1509 | - } |
1510 | -} |
1511 | - |
1512 | -.collapse { |
1513 | - position: relative; |
1514 | - height: 0; |
1515 | - overflow: hidden; |
1516 | - .transition(height .35s ease); |
1517 | - &.in { |
1518 | - height: auto; |
1519 | - } |
1520 | -} |
1521 | |
1522 | === removed file 'charmworld/static/css/bootstrap/dropdowns.less' |
1523 | --- charmworld/static/css/bootstrap/dropdowns.less 2013-01-21 13:40:18 +0000 |
1524 | +++ charmworld/static/css/bootstrap/dropdowns.less 1970-01-01 00:00:00 +0000 |
1525 | @@ -1,233 +0,0 @@ |
1526 | -// |
1527 | -// Dropdown menus |
1528 | -// -------------------------------------------------- |
1529 | - |
1530 | - |
1531 | -// Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns |
1532 | -.dropup, |
1533 | -.dropdown { |
1534 | - position: relative; |
1535 | -} |
1536 | -.dropdown-toggle { |
1537 | - // The caret makes the toggle a bit too tall in IE7 |
1538 | - *margin-bottom: -3px; |
1539 | -} |
1540 | -.dropdown-toggle:active, |
1541 | -.open .dropdown-toggle { |
1542 | - outline: 0; |
1543 | -} |
1544 | - |
1545 | -// Dropdown arrow/caret |
1546 | -// -------------------- |
1547 | -.caret { |
1548 | - display: inline-block; |
1549 | - width: 0; |
1550 | - height: 0; |
1551 | - vertical-align: top; |
1552 | - border-top: 4px solid @black; |
1553 | - border-right: 4px solid transparent; |
1554 | - border-left: 4px solid transparent; |
1555 | - content: ""; |
1556 | -} |
1557 | - |
1558 | -// Place the caret |
1559 | -.dropdown .caret { |
1560 | - margin-top: 8px; |
1561 | - margin-left: 2px; |
1562 | -} |
1563 | - |
1564 | -// The dropdown menu (ul) |
1565 | -// ---------------------- |
1566 | -.dropdown-menu { |
1567 | - position: absolute; |
1568 | - top: 100%; |
1569 | - left: 0; |
1570 | - z-index: @zindexDropdown; |
1571 | - display: none; // none by default, but block on "open" of the menu |
1572 | - float: left; |
1573 | - min-width: 160px; |
1574 | - padding: 5px 0; |
1575 | - margin: 2px 0 0; // override default ul |
1576 | - list-style: none; |
1577 | - background-color: @dropdownBackground; |
1578 | - border: 1px solid #ccc; // Fallback for IE7-8 |
1579 | - border: 1px solid @dropdownBorder; |
1580 | - *border-right-width: 2px; |
1581 | - *border-bottom-width: 2px; |
1582 | - .border-radius(6px); |
1583 | - .box-shadow(0 5px 10px rgba(0,0,0,.2)); |
1584 | - -webkit-background-clip: padding-box; |
1585 | - -moz-background-clip: padding; |
1586 | - background-clip: padding-box; |
1587 | - |
1588 | - // Aligns the dropdown menu to right |
1589 | - &.pull-right { |
1590 | - right: 0; |
1591 | - left: auto; |
1592 | - } |
1593 | - |
1594 | - // Dividers (basically an hr) within the dropdown |
1595 | - .divider { |
1596 | - .nav-divider(@dropdownDividerTop, @dropdownDividerBottom); |
1597 | - } |
1598 | - |
1599 | - // Links within the dropdown menu |
1600 | - li > a { |
1601 | - display: block; |
1602 | - padding: 3px 20px; |
1603 | - clear: both; |
1604 | - font-weight: normal; |
1605 | - line-height: @baseLineHeight; |
1606 | - color: @dropdownLinkColor; |
1607 | - white-space: nowrap; |
1608 | - } |
1609 | -} |
1610 | - |
1611 | -// Hover state |
1612 | -// ----------- |
1613 | -.dropdown-menu li > a:hover, |
1614 | -.dropdown-menu li > a:focus, |
1615 | -.dropdown-submenu:hover > a { |
1616 | - text-decoration: none; |
1617 | - color: @dropdownLinkColorHover; |
1618 | - #gradient > .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%)); |
1619 | -} |
1620 | - |
1621 | -// Active state |
1622 | -// ------------ |
1623 | -.dropdown-menu .active > a, |
1624 | -.dropdown-menu .active > a:hover { |
1625 | - color: @dropdownLinkColorActive; |
1626 | - text-decoration: none; |
1627 | - outline: 0; |
1628 | - #gradient > .vertical(@dropdownLinkBackgroundActive, darken(@dropdownLinkBackgroundActive, 5%)); |
1629 | -} |
1630 | - |
1631 | -// Disabled state |
1632 | -// -------------- |
1633 | -// Gray out text and ensure the hover state remains gray |
1634 | -.dropdown-menu .disabled > a, |
1635 | -.dropdown-menu .disabled > a:hover { |
1636 | - color: @grayLight; |
1637 | -} |
1638 | -// Nuke hover effects |
1639 | -.dropdown-menu .disabled > a:hover { |
1640 | - text-decoration: none; |
1641 | - background-color: transparent; |
1642 | - background-image: none; // Remove CSS gradient |
1643 | - .reset-filter(); |
1644 | - cursor: default; |
1645 | -} |
1646 | - |
1647 | -// Open state for the dropdown |
1648 | -// --------------------------- |
1649 | -.open { |
1650 | - // IE7's z-index only goes to the nearest positioned ancestor, which would |
1651 | - // make the menu appear below buttons that appeared later on the page |
1652 | - *z-index: @zindexDropdown; |
1653 | - |
1654 | - & > .dropdown-menu { |
1655 | - display: block; |
1656 | - } |
1657 | -} |
1658 | - |
1659 | -// Right aligned dropdowns |
1660 | -// --------------------------- |
1661 | -.pull-right > .dropdown-menu { |
1662 | - right: 0; |
1663 | - left: auto; |
1664 | -} |
1665 | - |
1666 | -// Allow for dropdowns to go bottom up (aka, dropup-menu) |
1667 | -// ------------------------------------------------------ |
1668 | -// Just add .dropup after the standard .dropdown class and you're set, bro. |
1669 | -// TODO: abstract this so that the navbar fixed styles are not placed here? |
1670 | -.dropup, |
1671 | -.navbar-fixed-bottom .dropdown { |
1672 | - // Reverse the caret |
1673 | - .caret { |
1674 | - border-top: 0; |
1675 | - border-bottom: 4px solid @black; |
1676 | - content: ""; |
1677 | - } |
1678 | - // Different positioning for bottom up menu |
1679 | - .dropdown-menu { |
1680 | - top: auto; |
1681 | - bottom: 100%; |
1682 | - margin-bottom: 1px; |
1683 | - } |
1684 | -} |
1685 | - |
1686 | -// Sub menus |
1687 | -// --------------------------- |
1688 | -.dropdown-submenu { |
1689 | - position: relative; |
1690 | -} |
1691 | -// Default dropdowns |
1692 | -.dropdown-submenu > .dropdown-menu { |
1693 | - top: 0; |
1694 | - left: 100%; |
1695 | - margin-top: -6px; |
1696 | - margin-left: -1px; |
1697 | - .border-radius(0 6px 6px 6px); |
1698 | -} |
1699 | -.dropdown-submenu:hover > .dropdown-menu { |
1700 | - display: block; |
1701 | -} |
1702 | - |
1703 | -// Dropups |
1704 | -.dropup .dropdown-submenu > .dropdown-menu { |
1705 | - top: auto; |
1706 | - bottom: 0; |
1707 | - margin-top: 0; |
1708 | - margin-bottom: -2px; |
1709 | - .border-radius(5px 5px 5px 0); |
1710 | -} |
1711 | - |
1712 | -// Caret to indicate there is a submenu |
1713 | -.dropdown-submenu > a:after { |
1714 | - display: block; |
1715 | - content: " "; |
1716 | - float: right; |
1717 | - width: 0; |
1718 | - height: 0; |
1719 | - border-color: transparent; |
1720 | - border-style: solid; |
1721 | - border-width: 5px 0 5px 5px; |
1722 | - border-left-color: darken(@dropdownBackground, 20%); |
1723 | - margin-top: 5px; |
1724 | - margin-right: -10px; |
1725 | -} |
1726 | -.dropdown-submenu:hover > a:after { |
1727 | - border-left-color: @dropdownLinkColorHover; |
1728 | -} |
1729 | - |
1730 | -// Left aligned submenus |
1731 | -.dropdown-submenu.pull-left { |
1732 | - // Undo the float |
1733 | - // Yes, this is awkward since .pull-left adds a float, but it sticks to our conventions elsewhere. |
1734 | - float: none; |
1735 | - |
1736 | - // Positioning the submenu |
1737 | - > .dropdown-menu { |
1738 | - left: -100%; |
1739 | - margin-left: 10px; |
1740 | - .border-radius(6px 0 6px 6px); |
1741 | - } |
1742 | -} |
1743 | - |
1744 | -// Tweak nav headers |
1745 | -// ----------------- |
1746 | -// Increase padding from 15px to 20px on sides |
1747 | -.dropdown .dropdown-menu .nav-header { |
1748 | - padding-left: 20px; |
1749 | - padding-right: 20px; |
1750 | -} |
1751 | - |
1752 | -// Typeahead |
1753 | -// --------- |
1754 | -.typeahead { |
1755 | - z-index: 1051; |
1756 | - margin-top: 2px; // give it some space to breathe |
1757 | - .border-radius(@baseBorderRadius); |
1758 | -} |
1759 | |
1760 | === removed file 'charmworld/static/css/bootstrap/forms.less' |
1761 | --- charmworld/static/css/bootstrap/forms.less 2013-01-21 13:40:18 +0000 |
1762 | +++ charmworld/static/css/bootstrap/forms.less 1970-01-01 00:00:00 +0000 |
1763 | @@ -1,687 +0,0 @@ |
1764 | -// |
1765 | -// Forms |
1766 | -// -------------------------------------------------- |
1767 | - |
1768 | - |
1769 | -// GENERAL STYLES |
1770 | -// -------------- |
1771 | - |
1772 | -// Make all forms have space below them |
1773 | -form { |
1774 | - margin: 0 0 @baseLineHeight; |
1775 | -} |
1776 | - |
1777 | -fieldset { |
1778 | - padding: 0; |
1779 | - margin: 0; |
1780 | - border: 0; |
1781 | -} |
1782 | - |
1783 | -// Groups of fields with labels on top (legends) |
1784 | -legend { |
1785 | - display: block; |
1786 | - width: 100%; |
1787 | - padding: 0; |
1788 | - margin-bottom: @baseLineHeight; |
1789 | - font-size: @baseFontSize * 1.5; |
1790 | - line-height: @baseLineHeight * 2; |
1791 | - color: @grayDark; |
1792 | - border: 0; |
1793 | - border-bottom: 1px solid #e5e5e5; |
1794 | - |
1795 | - // Small |
1796 | - small { |
1797 | - font-size: @baseLineHeight * .75; |
1798 | - color: @grayLight; |
1799 | - } |
1800 | -} |
1801 | - |
1802 | -// Set font for forms |
1803 | -label, |
1804 | -input, |
1805 | -button, |
1806 | -select, |
1807 | -textarea { |
1808 | - #font > .shorthand(@baseFontSize,normal,@baseLineHeight); // Set size, weight, line-height here |
1809 | -} |
1810 | -input, |
1811 | -button, |
1812 | -select, |
1813 | -textarea { |
1814 | - font-family: @baseFontFamily; // And only set font-family here for those that need it (note the missing label element) |
1815 | -} |
1816 | - |
1817 | -// Identify controls by their labels |
1818 | -label { |
1819 | - display: block; |
1820 | - margin-bottom: 5px; |
1821 | -} |
1822 | - |
1823 | -// Form controls |
1824 | -// ------------------------- |
1825 | - |
1826 | -// Shared size and type resets |
1827 | -select, |
1828 | -textarea, |
1829 | -input[type="text"], |
1830 | -input[type="password"], |
1831 | -input[type="datetime"], |
1832 | -input[type="datetime-local"], |
1833 | -input[type="date"], |
1834 | -input[type="month"], |
1835 | -input[type="time"], |
1836 | -input[type="week"], |
1837 | -input[type="number"], |
1838 | -input[type="email"], |
1839 | -input[type="url"], |
1840 | -input[type="search"], |
1841 | -input[type="tel"], |
1842 | -input[type="color"], |
1843 | -.uneditable-input { |
1844 | - display: inline-block; |
1845 | - height: @baseLineHeight; |
1846 | - padding: 4px 6px; |
1847 | - margin-bottom: @baseLineHeight / 2; |
1848 | - font-size: @baseFontSize; |
1849 | - line-height: @baseLineHeight; |
1850 | - color: @gray; |
1851 | - .border-radius(@inputBorderRadius); |
1852 | - vertical-align: middle; |
1853 | -} |
1854 | - |
1855 | -// Reset appearance properties for textual inputs and textarea |
1856 | -// Declare width for legacy (can't be on input[type=*] selectors or it's too specific) |
1857 | -input, |
1858 | -textarea, |
1859 | -.uneditable-input { |
1860 | - width: 206px; // plus 12px padding and 2px border |
1861 | -} |
1862 | -// Reset height since textareas have rows |
1863 | -textarea { |
1864 | - height: auto; |
1865 | -} |
1866 | -// Everything else |
1867 | -textarea, |
1868 | -input[type="text"], |
1869 | -input[type="password"], |
1870 | -input[type="datetime"], |
1871 | -input[type="datetime-local"], |
1872 | -input[type="date"], |
1873 | -input[type="month"], |
1874 | -input[type="time"], |
1875 | -input[type="week"], |
1876 | -input[type="number"], |
1877 | -input[type="email"], |
1878 | -input[type="url"], |
1879 | -input[type="search"], |
1880 | -input[type="tel"], |
1881 | -input[type="color"], |
1882 | -.uneditable-input { |
1883 | - background-color: @inputBackground; |
1884 | - border: 1px solid @inputBorder; |
1885 | - .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); |
1886 | - .transition(~"border linear .2s, box-shadow linear .2s"); |
1887 | - |
1888 | - // Focus state |
1889 | - &:focus { |
1890 | - border-color: rgba(82,168,236,.8); |
1891 | - outline: 0; |
1892 | - outline: thin dotted \9; /* IE6-9 */ |
1893 | - .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)"); |
1894 | - } |
1895 | -} |
1896 | - |
1897 | -// Position radios and checkboxes better |
1898 | -input[type="radio"], |
1899 | -input[type="checkbox"] { |
1900 | - margin: 4px 0 0; |
1901 | - *margin-top: 0; /* IE7 */ |
1902 | - margin-top: 1px \9; /* IE8-9 */ |
1903 | - line-height: normal; |
1904 | -} |
1905 | - |
1906 | -// Reset width of input images, buttons, radios, checkboxes |
1907 | -input[type="file"], |
1908 | -input[type="image"], |
1909 | -input[type="submit"], |
1910 | -input[type="reset"], |
1911 | -input[type="button"], |
1912 | -input[type="radio"], |
1913 | -input[type="checkbox"] { |
1914 | - width: auto; // Override of generic input selector |
1915 | -} |
1916 | - |
1917 | -// Set the height of select and file controls to match text inputs |
1918 | -select, |
1919 | -input[type="file"] { |
1920 | - height: @inputHeight; /* In IE7, the height of the select element cannot be changed by height, only font-size */ |
1921 | - *margin-top: 4px; /* For IE7, add top margin to align select with labels */ |
1922 | - line-height: @inputHeight; |
1923 | -} |
1924 | - |
1925 | -// Make select elements obey height by applying a border |
1926 | -select { |
1927 | - width: 220px; // default input width + 10px of padding that doesn't get applied |
1928 | - border: 1px solid @inputBorder; |
1929 | - background-color: @inputBackground; // Chrome on Linux and Mobile Safari need background-color |
1930 | -} |
1931 | - |
1932 | -// Make multiple select elements height not fixed |
1933 | -select[multiple], |
1934 | -select[size] { |
1935 | - height: auto; |
1936 | -} |
1937 | - |
1938 | -// Focus for select, file, radio, and checkbox |
1939 | -select:focus, |
1940 | -input[type="file"]:focus, |
1941 | -input[type="radio"]:focus, |
1942 | -input[type="checkbox"]:focus { |
1943 | - .tab-focus(); |
1944 | -} |
1945 | - |
1946 | - |
1947 | -// Uneditable inputs |
1948 | -// ------------------------- |
1949 | - |
1950 | -// Make uneditable inputs look inactive |
1951 | -.uneditable-input, |
1952 | -.uneditable-textarea { |
1953 | - color: @grayLight; |
1954 | - background-color: darken(@inputBackground, 1%); |
1955 | - border-color: @inputBorder; |
1956 | - .box-shadow(inset 0 1px 2px rgba(0,0,0,.025)); |
1957 | - cursor: not-allowed; |
1958 | -} |
1959 | - |
1960 | -// For text that needs to appear as an input but should not be an input |
1961 | -.uneditable-input { |
1962 | - overflow: hidden; // prevent text from wrapping, but still cut it off like an input does |
1963 | - white-space: nowrap; |
1964 | -} |
1965 | - |
1966 | -// Make uneditable textareas behave like a textarea |
1967 | -.uneditable-textarea { |
1968 | - width: auto; |
1969 | - height: auto; |
1970 | -} |
1971 | - |
1972 | - |
1973 | -// Placeholder |
1974 | -// ------------------------- |
1975 | - |
1976 | -// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn't understand a selector |
1977 | -input, |
1978 | -textarea { |
1979 | - .placeholder(); |
1980 | -} |
1981 | - |
1982 | - |
1983 | -// CHECKBOXES & RADIOS |
1984 | -// ------------------- |
1985 | - |
1986 | -// Indent the labels to position radios/checkboxes as hanging |
1987 | -.radio, |
1988 | -.checkbox { |
1989 | - min-height: @baseLineHeight; // clear the floating input if there is no label text |
1990 | - padding-left: 20px; |
1991 | -} |
1992 | -.radio input[type="radio"], |
1993 | -.checkbox input[type="checkbox"] { |
1994 | - float: left; |
1995 | - margin-left: -20px; |
1996 | -} |
1997 | - |
1998 | -// Move the options list down to align with labels |
1999 | -.controls > .radio:first-child, |
2000 | -.controls > .checkbox:first-child { |
2001 | - padding-top: 5px; // has to be padding because margin collaspes |
2002 | -} |
2003 | - |
2004 | -// Radios and checkboxes on same line |
2005 | -// TODO v3: Convert .inline to .control-inline |
2006 | -.radio.inline, |
2007 | -.checkbox.inline { |
2008 | - display: inline-block; |
2009 | - padding-top: 5px; |
2010 | - margin-bottom: 0; |
2011 | - vertical-align: middle; |
2012 | -} |
2013 | -.radio.inline + .radio.inline, |
2014 | -.checkbox.inline + .checkbox.inline { |
2015 | - margin-left: 10px; // space out consecutive inline controls |
2016 | -} |
2017 | - |
2018 | - |
2019 | - |
2020 | -// INPUT SIZES |
2021 | -// ----------- |
2022 | - |
2023 | -// General classes for quick sizes |
2024 | -.input-mini { width: 60px; } |
2025 | -.input-small { width: 90px; } |
2026 | -.input-medium { width: 150px; } |
2027 | -.input-large { width: 210px; } |
2028 | -.input-xlarge { width: 270px; } |
2029 | -.input-xxlarge { width: 530px; } |
2030 | - |
2031 | -// Grid style input sizes |
2032 | -input[class*="span"], |
2033 | -select[class*="span"], |
2034 | -textarea[class*="span"], |
2035 | -.uneditable-input[class*="span"], |
2036 | -// Redeclare since the fluid row class is more specific |
2037 | -.row-fluid input[class*="span"], |
2038 | -.row-fluid select[class*="span"], |
2039 | -.row-fluid textarea[class*="span"], |
2040 | -.row-fluid .uneditable-input[class*="span"] { |
2041 | - float: none; |
2042 | - margin-left: 0; |
2043 | -} |
2044 | -// Ensure input-prepend/append never wraps |
2045 | -.input-append input[class*="span"], |
2046 | -.input-append .uneditable-input[class*="span"], |
2047 | -.input-prepend input[class*="span"], |
2048 | -.input-prepend .uneditable-input[class*="span"], |
2049 | -.row-fluid input[class*="span"], |
2050 | -.row-fluid select[class*="span"], |
2051 | -.row-fluid textarea[class*="span"], |
2052 | -.row-fluid .uneditable-input[class*="span"], |
2053 | -.row-fluid .input-prepend [class*="span"], |
2054 | -.row-fluid .input-append [class*="span"] { |
2055 | - display: inline-block; |
2056 | -} |
2057 | - |
2058 | - |
2059 | - |
2060 | -// GRID SIZING FOR INPUTS |
2061 | -// ---------------------- |
2062 | - |
2063 | -// Grid sizes |
2064 | -#grid > .input(@gridColumnWidth, @gridGutterWidth); |
2065 | - |
2066 | -// Control row for multiple inputs per line |
2067 | -.controls-row { |
2068 | - .clearfix(); // Clear the float from controls |
2069 | -} |
2070 | - |
2071 | -// Float to collapse white-space for proper grid alignment |
2072 | -.controls-row [class*="span"], |
2073 | -// Redeclare the fluid grid collapse since we undo the float for inputs |
2074 | -.row-fluid .controls-row [class*="span"] { |
2075 | - float: left; |
2076 | -} |
2077 | -// Explicity set top padding on all checkboxes/radios, not just first-child |
2078 | -.controls-row .checkbox[class*="span"], |
2079 | -.controls-row .radio[class*="span"] { |
2080 | - padding-top: 5px; |
2081 | -} |
2082 | - |
2083 | - |
2084 | - |
2085 | - |
2086 | -// DISABLED STATE |
2087 | -// -------------- |
2088 | - |
2089 | -// Disabled and read-only inputs |
2090 | -input[disabled], |
2091 | -select[disabled], |
2092 | -textarea[disabled], |
2093 | -input[readonly], |
2094 | -select[readonly], |
2095 | -textarea[readonly] { |
2096 | - cursor: not-allowed; |
2097 | - background-color: @inputDisabledBackground; |
2098 | -} |
2099 | -// Explicitly reset the colors here |
2100 | -input[type="radio"][disabled], |
2101 | -input[type="checkbox"][disabled], |
2102 | -input[type="radio"][readonly], |
2103 | -input[type="checkbox"][readonly] { |
2104 | - background-color: transparent; |
2105 | -} |
2106 | - |
2107 | - |
2108 | - |
2109 | - |
2110 | -// FORM FIELD FEEDBACK STATES |
2111 | -// -------------------------- |
2112 | - |
2113 | -// Warning |
2114 | -.control-group.warning { |
2115 | - .formFieldState(@warningText, @warningText, @warningBackground); |
2116 | -} |
2117 | -// Error |
2118 | -.control-group.error { |
2119 | - .formFieldState(@errorText, @errorText, @errorBackground); |
2120 | -} |
2121 | -// Success |
2122 | -.control-group.success { |
2123 | - .formFieldState(@successText, @successText, @successBackground); |
2124 | -} |
2125 | -// Success |
2126 | -.control-group.info { |
2127 | - .formFieldState(@infoText, @infoText, @infoBackground); |
2128 | -} |
2129 | - |
2130 | -// HTML5 invalid states |
2131 | -// Shares styles with the .control-group.error above |
2132 | -input:focus:invalid, |
2133 | -textarea:focus:invalid, |
2134 | -select:focus:invalid { |
2135 | - color: #b94a48; |
2136 | - border-color: #ee5f5b; |
2137 | - &:focus { |
2138 | - border-color: darken(#ee5f5b, 10%); |
2139 | - @shadow: 0 0 6px lighten(#ee5f5b, 20%); |
2140 | - .box-shadow(@shadow); |
2141 | - } |
2142 | -} |
2143 | - |
2144 | - |
2145 | - |
2146 | -// FORM ACTIONS |
2147 | -// ------------ |
2148 | - |
2149 | -.form-actions { |
2150 | - padding: (@baseLineHeight - 1) 20px @baseLineHeight; |
2151 | - margin-top: @baseLineHeight; |
2152 | - margin-bottom: @baseLineHeight; |
2153 | - background-color: @formActionsBackground; |
2154 | - border-top: 1px solid #e5e5e5; |
2155 | - .clearfix(); // Adding clearfix to allow for .pull-right button containers |
2156 | -} |
2157 | - |
2158 | - |
2159 | - |
2160 | -// HELP TEXT |
2161 | -// --------- |
2162 | - |
2163 | -.help-block, |
2164 | -.help-inline { |
2165 | - color: lighten(@textColor, 15%); // lighten the text some for contrast |
2166 | -} |
2167 | - |
2168 | -.help-block { |
2169 | - display: block; // account for any element using help-block |
2170 | - margin-bottom: @baseLineHeight / 2; |
2171 | -} |
2172 | - |
2173 | -.help-inline { |
2174 | - display: inline-block; |
2175 | - .ie7-inline-block(); |
2176 | - vertical-align: middle; |
2177 | - padding-left: 5px; |
2178 | -} |
2179 | - |
2180 | - |
2181 | - |
2182 | -// INPUT GROUPS |
2183 | -// ------------ |
2184 | - |
2185 | -// Allow us to put symbols and text within the input field for a cleaner look |
2186 | -.input-append, |
2187 | -.input-prepend { |
2188 | - margin-bottom: 5px; |
2189 | - font-size: 0; // white space collapse hack |
2190 | - white-space: nowrap; // Prevent span and input from separating |
2191 | - |
2192 | - // Reset the white space collapse hack |
2193 | - input, |
2194 | - select, |
2195 | - .uneditable-input, |
2196 | - .dropdown-menu { |
2197 | - font-size: @baseFontSize; |
2198 | - } |
2199 | - |
2200 | - input, |
2201 | - select, |
2202 | - .uneditable-input { |
2203 | - position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness |
2204 | - margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms |
2205 | - *margin-left: 0; |
2206 | - vertical-align: top; |
2207 | - .border-radius(0 @inputBorderRadius @inputBorderRadius 0); |
2208 | - // Make input on top when focused so blue border and shadow always show |
2209 | - &:focus { |
2210 | - z-index: 2; |
2211 | - } |
2212 | - } |
2213 | - .add-on { |
2214 | - display: inline-block; |
2215 | - width: auto; |
2216 | - height: @baseLineHeight; |
2217 | - min-width: 16px; |
2218 | - padding: 4px 5px; |
2219 | - font-size: @baseFontSize; |
2220 | - font-weight: normal; |
2221 | - line-height: @baseLineHeight; |
2222 | - text-align: center; |
2223 | - text-shadow: 0 1px 0 @white; |
2224 | - background-color: @grayLighter; |
2225 | - border: 1px solid #ccc; |
2226 | - } |
2227 | - .add-on, |
2228 | - .btn, |
2229 | - .btn-group > .dropdown-toggle { |
2230 | - vertical-align: top; |
2231 | - .border-radius(0); |
2232 | - } |
2233 | - .active { |
2234 | - background-color: lighten(@green, 30); |
2235 | - border-color: @green; |
2236 | - } |
2237 | -} |
2238 | - |
2239 | -.input-prepend { |
2240 | - .add-on, |
2241 | - .btn { |
2242 | - margin-right: -1px; |
2243 | - } |
2244 | - .add-on:first-child, |
2245 | - .btn:first-child { |
2246 | - // FYI, `.btn:first-child` accounts for a button group that's prepended |
2247 | - .border-radius(@inputBorderRadius 0 0 @inputBorderRadius); |
2248 | - } |
2249 | -} |
2250 | - |
2251 | -.input-append { |
2252 | - input, |
2253 | - select, |
2254 | - .uneditable-input { |
2255 | - .border-radius(@inputBorderRadius 0 0 @inputBorderRadius); |
2256 | - + .btn-group .btn:last-child { |
2257 | - .border-radius(0 @inputBorderRadius @inputBorderRadius 0); |
2258 | - } |
2259 | - } |
2260 | - .add-on, |
2261 | - .btn, |
2262 | - .btn-group { |
2263 | - margin-left: -1px; |
2264 | - } |
2265 | - .add-on:last-child, |
2266 | - .btn:last-child, |
2267 | - .btn-group:last-child > .dropdown-toggle { |
2268 | - .border-radius(0 @inputBorderRadius @inputBorderRadius 0); |
2269 | - } |
2270 | -} |
2271 | - |
2272 | -// Remove all border-radius for inputs with both prepend and append |
2273 | -.input-prepend.input-append { |
2274 | - input, |
2275 | - select, |
2276 | - .uneditable-input { |
2277 | - .border-radius(0); |
2278 | - + .btn-group .btn { |
2279 | - .border-radius(0 @inputBorderRadius @inputBorderRadius 0); |
2280 | - } |
2281 | - } |
2282 | - .add-on:first-child, |
2283 | - .btn:first-child { |
2284 | - margin-right: -1px; |
2285 | - .border-radius(@inputBorderRadius 0 0 @inputBorderRadius); |
2286 | - } |
2287 | - .add-on:last-child, |
2288 | - .btn:last-child { |
2289 | - margin-left: -1px; |
2290 | - .border-radius(0 @inputBorderRadius @inputBorderRadius 0); |
2291 | - } |
2292 | - .btn-group:first-child { |
2293 | - margin-left: 0; |
2294 | - } |
2295 | -} |
2296 | - |
2297 | - |
2298 | - |
2299 | - |
2300 | -// SEARCH FORM |
2301 | -// ----------- |
2302 | - |
2303 | -input.search-query { |
2304 | - padding-right: 14px; |
2305 | - padding-right: 4px \9; |
2306 | - padding-left: 14px; |
2307 | - padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */ |
2308 | - margin-bottom: 0; // Remove the default margin on all inputs |
2309 | - .border-radius(15px); |
2310 | -} |
2311 | - |
2312 | -/* Allow for input prepend/append in search forms */ |
2313 | -.form-search .input-append .search-query, |
2314 | -.form-search .input-prepend .search-query { |
2315 | - .border-radius(0); // Override due to specificity |
2316 | -} |
2317 | -.form-search .input-append .search-query { |
2318 | - .border-radius(14px 0 0 14px); |
2319 | -} |
2320 | -.form-search .input-append .btn { |
2321 | - .border-radius(0 14px 14px 0); |
2322 | -} |
2323 | -.form-search .input-prepend .search-query { |
2324 | - .border-radius(0 14px 14px 0); |
2325 | -} |
2326 | -.form-search .input-prepend .btn { |
2327 | - .border-radius(14px 0 0 14px); |
2328 | -} |
2329 | - |
2330 | - |
2331 | - |
2332 | - |
2333 | -// HORIZONTAL & VERTICAL FORMS |
2334 | -// --------------------------- |
2335 | - |
2336 | -// Common properties |
2337 | -// ----------------- |
2338 | - |
2339 | -.form-search, |
2340 | -.form-inline, |
2341 | -.form-horizontal { |
2342 | - input, |
2343 | - textarea, |
2344 | - select, |
2345 | - .help-inline, |
2346 | - .uneditable-input, |
2347 | - .input-prepend, |
2348 | - .input-append { |
2349 | - display: inline-block; |
2350 | - .ie7-inline-block(); |
2351 | - margin-bottom: 0; |
2352 | - vertical-align: middle; |
2353 | - } |
2354 | - // Re-hide hidden elements due to specifity |
2355 | - .hide { |
2356 | - display: none; |
2357 | - } |
2358 | -} |
2359 | -.form-search label, |
2360 | -.form-inline label, |
2361 | -.form-search .btn-group, |
2362 | -.form-inline .btn-group { |
2363 | - display: inline-block; |
2364 | -} |
2365 | -// Remove margin for input-prepend/-append |
2366 | -.form-search .input-append, |
2367 | -.form-inline .input-append, |
2368 | -.form-search .input-prepend, |
2369 | -.form-inline .input-prepend { |
2370 | - margin-bottom: 0; |
2371 | -} |
2372 | -// Inline checkbox/radio labels (remove padding on left) |
2373 | -.form-search .radio, |
2374 | -.form-search .checkbox, |
2375 | -.form-inline .radio, |
2376 | -.form-inline .checkbox { |
2377 | - padding-left: 0; |
2378 | - margin-bottom: 0; |
2379 | - vertical-align: middle; |
2380 | -} |
2381 | -// Remove float and margin, set to inline-block |
2382 | -.form-search .radio input[type="radio"], |
2383 | -.form-search .checkbox input[type="checkbox"], |
2384 | -.form-inline .radio input[type="radio"], |
2385 | -.form-inline .checkbox input[type="checkbox"] { |
2386 | - float: left; |
2387 | - margin-right: 3px; |
2388 | - margin-left: 0; |
2389 | -} |
2390 | - |
2391 | - |
2392 | -// Margin to space out fieldsets |
2393 | -.control-group { |
2394 | - margin-bottom: @baseLineHeight / 2; |
2395 | -} |
2396 | - |
2397 | -// Legend collapses margin, so next element is responsible for spacing |
2398 | -legend + .control-group { |
2399 | - margin-top: @baseLineHeight; |
2400 | - -webkit-margin-top-collapse: separate; |
2401 | -} |
2402 | - |
2403 | -// Horizontal-specific styles |
2404 | -// -------------------------- |
2405 | - |
2406 | -.form-horizontal { |
2407 | - // Increase spacing between groups |
2408 | - .control-group { |
2409 | - margin-bottom: @baseLineHeight; |
2410 | - .clearfix(); |
2411 | - } |
2412 | - // Float the labels left |
2413 | - .control-label { |
2414 | - float: left; |
2415 | - width: @horizontalComponentOffset - 20; |
2416 | - padding-top: 5px; |
2417 | - text-align: right; |
2418 | - } |
2419 | - // Move over all input controls and content |
2420 | - .controls { |
2421 | - // Super jank IE7 fix to ensure the inputs in .input-append and input-prepend |
2422 | - // don't inherit the margin of the parent, in this case .controls |
2423 | - *display: inline-block; |
2424 | - *padding-left: 20px; |
2425 | - margin-left: @horizontalComponentOffset; |
2426 | - *margin-left: 0; |
2427 | - &:first-child { |
2428 | - *padding-left: @horizontalComponentOffset; |
2429 | - } |
2430 | - } |
2431 | - // Remove bottom margin on block level help text since that's accounted for on .control-group |
2432 | - .help-block { |
2433 | - margin-bottom: 0; |
2434 | - } |
2435 | - // And apply it only to .help-block instances that follow a form control |
2436 | - input, |
2437 | - select, |
2438 | - textarea, |
2439 | - .uneditable-input, |
2440 | - .input-prepend, |
2441 | - .input-append { |
2442 | - + .help-block { |
2443 | - margin-top: @baseLineHeight / 2; |
2444 | - } |
2445 | - } |
2446 | - // Move over buttons in .form-actions to align with .controls |
2447 | - .form-actions { |
2448 | - padding-left: @horizontalComponentOffset; |
2449 | - } |
2450 | -} |
2451 | |
2452 | === removed file 'charmworld/static/css/bootstrap/grid.less' |
2453 | --- charmworld/static/css/bootstrap/grid.less 2013-01-21 13:40:18 +0000 |
2454 | +++ charmworld/static/css/bootstrap/grid.less 1970-01-01 00:00:00 +0000 |
2455 | @@ -1,21 +0,0 @@ |
2456 | -// |
2457 | -// Grid system |
2458 | -// -------------------------------------------------- |
2459 | - |
2460 | - |
2461 | -// Fixed (940px) |
2462 | -#grid > .core(@gridColumnWidth, @gridGutterWidth); |
2463 | - |
2464 | -// Fluid (940px) |
2465 | -#grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth); |
2466 | - |
2467 | -// Reset utility classes due to specificity |
2468 | -[class*="span"].hide, |
2469 | -.row-fluid [class*="span"].hide { |
2470 | - display: none; |
2471 | -} |
2472 | - |
2473 | -[class*="span"].pull-right, |
2474 | -.row-fluid [class*="span"].pull-right { |
2475 | - float: right; |
2476 | -} |
2477 | |
2478 | === removed file 'charmworld/static/css/bootstrap/hero-unit.less' |
2479 | --- charmworld/static/css/bootstrap/hero-unit.less 2013-01-21 13:40:18 +0000 |
2480 | +++ charmworld/static/css/bootstrap/hero-unit.less 1970-01-01 00:00:00 +0000 |
2481 | @@ -1,25 +0,0 @@ |
2482 | -// |
2483 | -// Hero unit |
2484 | -// -------------------------------------------------- |
2485 | - |
2486 | - |
2487 | -.hero-unit { |
2488 | - padding: 60px; |
2489 | - margin-bottom: 30px; |
2490 | - font-size: 18px; |
2491 | - font-weight: 200; |
2492 | - line-height: @baseLineHeight * 1.5; |
2493 | - color: @heroUnitLeadColor; |
2494 | - background-color: @heroUnitBackground; |
2495 | - .border-radius(6px); |
2496 | - h1 { |
2497 | - margin-bottom: 0; |
2498 | - font-size: 60px; |
2499 | - line-height: 1; |
2500 | - color: @heroUnitHeadingColor; |
2501 | - letter-spacing: -1px; |
2502 | - } |
2503 | - li { |
2504 | - line-height: @baseLineHeight * 1.5; // Reset since we specify in type.less |
2505 | - } |
2506 | -} |
2507 | |
2508 | === removed file 'charmworld/static/css/bootstrap/labels-badges.less' |
2509 | --- charmworld/static/css/bootstrap/labels-badges.less 2013-01-21 13:40:18 +0000 |
2510 | +++ charmworld/static/css/bootstrap/labels-badges.less 1970-01-01 00:00:00 +0000 |
2511 | @@ -1,82 +0,0 @@ |
2512 | -// |
2513 | -// Labels and badges |
2514 | -// -------------------------------------------------- |
2515 | - |
2516 | - |
2517 | -// Base classes |
2518 | -.label, |
2519 | -.badge { |
2520 | - display: inline-block; |
2521 | - padding: 2px 4px; |
2522 | - font-size: @baseFontSize * .846; |
2523 | - font-weight: bold; |
2524 | - line-height: 14px; // ensure proper line-height if floated |
2525 | - color: @white; |
2526 | - vertical-align: baseline; |
2527 | - white-space: nowrap; |
2528 | - text-shadow: 0 -1px 0 rgba(0,0,0,.25); |
2529 | - background-color: @grayLight; |
2530 | -} |
2531 | -// Set unique padding and border-radii |
2532 | -.label { |
2533 | - .border-radius(3px); |
2534 | -} |
2535 | -.badge { |
2536 | - padding-left: 9px; |
2537 | - padding-right: 9px; |
2538 | - .border-radius(9px); |
2539 | -} |
2540 | - |
2541 | -// Empty labels/badges collapse |
2542 | -.label, |
2543 | -.badge { |
2544 | - &:empty { |
2545 | - display: none; |
2546 | - } |
2547 | -} |
2548 | - |
2549 | -// Hover state, but only for links |
2550 | -a { |
2551 | - &.label:hover, |
2552 | - &.badge:hover { |
2553 | - color: @white; |
2554 | - text-decoration: none; |
2555 | - cursor: pointer; |
2556 | - } |
2557 | -} |
2558 | - |
2559 | -// Colors |
2560 | -// Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute) |
2561 | -.label, |
2562 | -.badge { |
2563 | - // Important (red) |
2564 | - &-important { background-color: @errorText; } |
2565 | - &-important[href] { background-color: darken(@errorText, 10%); } |
2566 | - // Warnings (orange) |
2567 | - &-warning { background-color: @orange; } |
2568 | - &-warning[href] { background-color: darken(@orange, 10%); } |
2569 | - // Success (green) |
2570 | - &-success { background-color: @successText; } |
2571 | - &-success[href] { background-color: darken(@successText, 10%); } |
2572 | - // Info (turquoise) |
2573 | - &-info { background-color: @infoText; } |
2574 | - &-info[href] { background-color: darken(@infoText, 10%); } |
2575 | - // Inverse (black) |
2576 | - &-inverse { background-color: @grayDark; } |
2577 | - &-inverse[href] { background-color: darken(@grayDark, 10%); } |
2578 | -} |
2579 | - |
2580 | -// Quick fix for labels/badges in buttons |
2581 | -.btn { |
2582 | - .label, |
2583 | - .badge { |
2584 | - position: relative; |
2585 | - top: -1px; |
2586 | - } |
2587 | -} |
2588 | -.btn-mini { |
2589 | - .label, |
2590 | - .badge { |
2591 | - top: 0; |
2592 | - } |
2593 | -} |
2594 | |
2595 | === removed file 'charmworld/static/css/bootstrap/layouts.less' |
2596 | --- charmworld/static/css/bootstrap/layouts.less 2013-01-21 13:40:18 +0000 |
2597 | +++ charmworld/static/css/bootstrap/layouts.less 1970-01-01 00:00:00 +0000 |
2598 | @@ -1,16 +0,0 @@ |
2599 | -// |
2600 | -// Layouts |
2601 | -// -------------------------------------------------- |
2602 | - |
2603 | - |
2604 | -// Container (centered, fixed-width layouts) |
2605 | -.container { |
2606 | - .container-fixed(); |
2607 | -} |
2608 | - |
2609 | -// Fluid layouts (left aligned, with sidebar, min- & max-width content) |
2610 | -.container-fluid { |
2611 | - padding-right: @gridGutterWidth; |
2612 | - padding-left: @gridGutterWidth; |
2613 | - .clearfix(); |
2614 | -} |
2615 | \ No newline at end of file |
2616 | |
2617 | === removed file 'charmworld/static/css/bootstrap/media.less' |
2618 | --- charmworld/static/css/bootstrap/media.less 2013-01-21 13:40:18 +0000 |
2619 | +++ charmworld/static/css/bootstrap/media.less 1970-01-01 00:00:00 +0000 |
2620 | @@ -1,55 +0,0 @@ |
2621 | -// Media objects |
2622 | -// Source: http://stubbornella.org/content/?p=497 |
2623 | -// -------------------------------------------------- |
2624 | - |
2625 | - |
2626 | -// Common styles |
2627 | -// ------------------------- |
2628 | - |
2629 | -// Clear the floats |
2630 | -.media, |
2631 | -.media-body { |
2632 | - overflow: hidden; |
2633 | - *overflow: visible; |
2634 | - zoom: 1; |
2635 | -} |
2636 | - |
2637 | -// Proper spacing between instances of .media |
2638 | -.media, |
2639 | -.media .media { |
2640 | - margin-top: 15px; |
2641 | -} |
2642 | -.media:first-child { |
2643 | - margin-top: 0; |
2644 | -} |
2645 | - |
2646 | -// For images and videos, set to block |
2647 | -.media-object { |
2648 | - display: block; |
2649 | -} |
2650 | - |
2651 | -// Reset margins on headings for tighter default spacing |
2652 | -.media-heading { |
2653 | - margin: 0 0 5px; |
2654 | -} |
2655 | - |
2656 | - |
2657 | -// Media image alignment |
2658 | -// ------------------------- |
2659 | - |
2660 | -.media .pull-left { |
2661 | - margin-right: 10px; |
2662 | -} |
2663 | -.media .pull-right { |
2664 | - margin-left: 10px; |
2665 | -} |
2666 | - |
2667 | - |
2668 | -// Media list variation |
2669 | -// ------------------------- |
2670 | - |
2671 | -// Undo default ul/ol styles |
2672 | -.media-list { |
2673 | - margin-left: 0; |
2674 | - list-style: none; |
2675 | -} |
2676 | |
2677 | === removed file 'charmworld/static/css/bootstrap/mixins.less' |
2678 | --- charmworld/static/css/bootstrap/mixins.less 2013-01-21 13:40:18 +0000 |
2679 | +++ charmworld/static/css/bootstrap/mixins.less 1970-01-01 00:00:00 +0000 |
2680 | @@ -1,686 +0,0 @@ |
2681 | -// |
2682 | -// Mixins |
2683 | -// -------------------------------------------------- |
2684 | - |
2685 | - |
2686 | -// UTILITY MIXINS |
2687 | -// -------------------------------------------------- |
2688 | - |
2689 | -// Clearfix |
2690 | -// -------- |
2691 | -// For clearing floats like a boss h5bp.com/q |
2692 | -.clearfix { |
2693 | - *zoom: 1; |
2694 | - &:before, |
2695 | - &:after { |
2696 | - display: table; |
2697 | - content: ""; |
2698 | - // Fixes Opera/contenteditable bug: |
2699 | - // http://nicolasgallagher.com/micro-clearfix-hack/#comment-36952 |
2700 | - line-height: 0; |
2701 | - } |
2702 | - &:after { |
2703 | - clear: both; |
2704 | - } |
2705 | -} |
2706 | - |
2707 | -// Webkit-style focus |
2708 | -// ------------------ |
2709 | -.tab-focus() { |
2710 | - // Default |
2711 | - outline: thin dotted #333; |
2712 | - // Webkit |
2713 | - outline: 5px auto -webkit-focus-ring-color; |
2714 | - outline-offset: -2px; |
2715 | -} |
2716 | - |
2717 | -// Center-align a block level element |
2718 | -// ---------------------------------- |
2719 | -.center-block() { |
2720 | - display: block; |
2721 | - margin-left: auto; |
2722 | - margin-right: auto; |
2723 | -} |
2724 | - |
2725 | -// IE7 inline-block |
2726 | -// ---------------- |
2727 | -.ie7-inline-block() { |
2728 | - *display: inline; /* IE7 inline-block hack */ |
2729 | - *zoom: 1; |
2730 | -} |
2731 | - |
2732 | -// IE7 likes to collapse whitespace on either side of the inline-block elements. |
2733 | -// Ems because we're attempting to match the width of a space character. Left |
2734 | -// version is for form buttons, which typically come after other elements, and |
2735 | -// right version is for icons, which come before. Applying both is ok, but it will |
2736 | -// mean that space between those elements will be .6em (~2 space characters) in IE7, |
2737 | -// instead of the 1 space in other browsers. |
2738 | -.ie7-restore-left-whitespace() { |
2739 | - *margin-left: .3em; |
2740 | - |
2741 | - &:first-child { |
2742 | - *margin-left: 0; |
2743 | - } |
2744 | -} |
2745 | - |
2746 | -.ie7-restore-right-whitespace() { |
2747 | - *margin-right: .3em; |
2748 | -} |
2749 | - |
2750 | -// Sizing shortcuts |
2751 | -// ------------------------- |
2752 | -.size(@height, @width) { |
2753 | - width: @width; |
2754 | - height: @height; |
2755 | -} |
2756 | -.square(@size) { |
2757 | - .size(@size, @size); |
2758 | -} |
2759 | - |
2760 | -// Placeholder text |
2761 | -// ------------------------- |
2762 | -.placeholder(@color: @placeholderText) { |
2763 | - &:-moz-placeholder { |
2764 | - color: @color; |
2765 | - } |
2766 | - &:-ms-input-placeholder { |
2767 | - color: @color; |
2768 | - } |
2769 | - &::-webkit-input-placeholder { |
2770 | - color: @color; |
2771 | - } |
2772 | -} |
2773 | - |
2774 | -// Text overflow |
2775 | -// ------------------------- |
2776 | -// Requires inline-block or block for proper styling |
2777 | -.text-overflow() { |
2778 | - overflow: hidden; |
2779 | - text-overflow: ellipsis; |
2780 | - white-space: nowrap; |
2781 | -} |
2782 | - |
2783 | -// CSS image replacement |
2784 | -// ------------------------- |
2785 | -// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757 |
2786 | -.hide-text { |
2787 | - font: 0/0 a; |
2788 | - color: transparent; |
2789 | - text-shadow: none; |
2790 | - background-color: transparent; |
2791 | - border: 0; |
2792 | -} |
2793 | - |
2794 | - |
2795 | -// FONTS |
2796 | -// -------------------------------------------------- |
2797 | - |
2798 | -#font { |
2799 | - #family { |
2800 | - .serif() { |
2801 | - font-family: @serifFontFamily; |
2802 | - } |
2803 | - .sans-serif() { |
2804 | - font-family: @sansFontFamily; |
2805 | - } |
2806 | - .monospace() { |
2807 | - font-family: @monoFontFamily; |
2808 | - } |
2809 | - } |
2810 | - .shorthand(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { |
2811 | - font-size: @size; |
2812 | - font-weight: @weight; |
2813 | - line-height: @lineHeight; |
2814 | - } |
2815 | - .serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { |
2816 | - #font > #family > .serif; |
2817 | - #font > .shorthand(@size, @weight, @lineHeight); |
2818 | - } |
2819 | - .sans-serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { |
2820 | - #font > #family > .sans-serif; |
2821 | - #font > .shorthand(@size, @weight, @lineHeight); |
2822 | - } |
2823 | - .monospace(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { |
2824 | - #font > #family > .monospace; |
2825 | - #font > .shorthand(@size, @weight, @lineHeight); |
2826 | - } |
2827 | -} |
2828 | - |
2829 | - |
2830 | -// FORMS |
2831 | -// -------------------------------------------------- |
2832 | - |
2833 | -// Block level inputs |
2834 | -.input-block-level { |
2835 | - display: block; |
2836 | - width: 100%; |
2837 | - min-height: @inputHeight; // Make inputs at least the height of their button counterpart (base line-height + padding + border) |
2838 | - .box-sizing(border-box); // Makes inputs behave like true block-level elements |
2839 | -} |
2840 | - |
2841 | - |
2842 | - |
2843 | -// Mixin for form field states |
2844 | -.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) { |
2845 | - // Set the text color |
2846 | - .control-label, |
2847 | - .help-block, |
2848 | - .help-inline { |
2849 | - color: @textColor; |
2850 | - } |
2851 | - // Style inputs accordingly |
2852 | - .checkbox, |
2853 | - .radio, |
2854 | - input, |
2855 | - select, |
2856 | - textarea { |
2857 | - color: @textColor; |
2858 | - } |
2859 | - input, |
2860 | - select, |
2861 | - textarea { |
2862 | - border-color: @borderColor; |
2863 | - .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work |
2864 | - &:focus { |
2865 | - border-color: darken(@borderColor, 10%); |
2866 | - @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%); |
2867 | - .box-shadow(@shadow); |
2868 | - } |
2869 | - } |
2870 | - // Give a small background color for input-prepend/-append |
2871 | - .input-prepend .add-on, |
2872 | - .input-append .add-on { |
2873 | - color: @textColor; |
2874 | - background-color: @backgroundColor; |
2875 | - border-color: @textColor; |
2876 | - } |
2877 | -} |
2878 | - |
2879 | - |
2880 | - |
2881 | -// CSS3 PROPERTIES |
2882 | -// -------------------------------------------------- |
2883 | - |
2884 | -// Border Radius |
2885 | -.border-radius(@radius) { |
2886 | - -webkit-border-radius: @radius; |
2887 | - -moz-border-radius: @radius; |
2888 | - border-radius: @radius; |
2889 | -} |
2890 | - |
2891 | -// Single Corner Border Radius |
2892 | -.border-top-left-radius(@radius) { |
2893 | - -webkit-border-top-left-radius: @radius; |
2894 | - -moz-border-radius-topleft: @radius; |
2895 | - border-top-left-radius: @radius; |
2896 | -} |
2897 | -.border-top-right-radius(@radius) { |
2898 | - -webkit-border-top-right-radius: @radius; |
2899 | - -moz-border-radius-topright: @radius; |
2900 | - border-top-right-radius: @radius; |
2901 | -} |
2902 | -.border-bottom-right-radius(@radius) { |
2903 | - -webkit-border-bottom-right-radius: @radius; |
2904 | - -moz-border-radius-bottomright: @radius; |
2905 | - border-bottom-right-radius: @radius; |
2906 | -} |
2907 | -.border-bottom-left-radius(@radius) { |
2908 | - -webkit-border-bottom-left-radius: @radius; |
2909 | - -moz-border-radius-bottomleft: @radius; |
2910 | - border-bottom-left-radius: @radius; |
2911 | -} |
2912 | - |
2913 | -// Single Side Border Radius |
2914 | -.border-top-radius(@radius) { |
2915 | - .border-top-right-radius(@radius); |
2916 | - .border-top-left-radius(@radius); |
2917 | -} |
2918 | -.border-right-radius(@radius) { |
2919 | - .border-top-right-radius(@radius); |
2920 | - .border-bottom-right-radius(@radius); |
2921 | -} |
2922 | -.border-bottom-radius(@radius) { |
2923 | - .border-bottom-right-radius(@radius); |
2924 | - .border-bottom-left-radius(@radius); |
2925 | -} |
2926 | -.border-left-radius(@radius) { |
2927 | - .border-top-left-radius(@radius); |
2928 | - .border-bottom-left-radius(@radius); |
2929 | -} |
2930 | - |
2931 | -// Drop shadows |
2932 | -.box-shadow(@shadow) { |
2933 | - -webkit-box-shadow: @shadow; |
2934 | - -moz-box-shadow: @shadow; |
2935 | - box-shadow: @shadow; |
2936 | -} |
2937 | - |
2938 | -// Transitions |
2939 | -.transition(@transition) { |
2940 | - -webkit-transition: @transition; |
2941 | - -moz-transition: @transition; |
2942 | - -o-transition: @transition; |
2943 | - transition: @transition; |
2944 | -} |
2945 | -.transition-delay(@transition-delay) { |
2946 | - -webkit-transition-delay: @transition-delay; |
2947 | - -moz-transition-delay: @transition-delay; |
2948 | - -o-transition-delay: @transition-delay; |
2949 | - transition-delay: @transition-delay; |
2950 | -} |
2951 | - |
2952 | -// Transformations |
2953 | -.rotate(@degrees) { |
2954 | - -webkit-transform: rotate(@degrees); |
2955 | - -moz-transform: rotate(@degrees); |
2956 | - -ms-transform: rotate(@degrees); |
2957 | - -o-transform: rotate(@degrees); |
2958 | - transform: rotate(@degrees); |
2959 | -} |
2960 | -.scale(@ratio) { |
2961 | - -webkit-transform: scale(@ratio); |
2962 | - -moz-transform: scale(@ratio); |
2963 | - -ms-transform: scale(@ratio); |
2964 | - -o-transform: scale(@ratio); |
2965 | - transform: scale(@ratio); |
2966 | -} |
2967 | -.translate(@x, @y) { |
2968 | - -webkit-transform: translate(@x, @y); |
2969 | - -moz-transform: translate(@x, @y); |
2970 | - -ms-transform: translate(@x, @y); |
2971 | - -o-transform: translate(@x, @y); |
2972 | - transform: translate(@x, @y); |
2973 | -} |
2974 | -.skew(@x, @y) { |
2975 | - -webkit-transform: skew(@x, @y); |
2976 | - -moz-transform: skew(@x, @y); |
2977 | - -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twitter/bootstrap/issues/4885 |
2978 | - -o-transform: skew(@x, @y); |
2979 | - transform: skew(@x, @y); |
2980 | - -webkit-backface-visibility: hidden; // See https://github.com/twitter/bootstrap/issues/5319 |
2981 | -} |
2982 | -.translate3d(@x, @y, @z) { |
2983 | - -webkit-transform: translate3d(@x, @y, @z); |
2984 | - -moz-transform: translate3d(@x, @y, @z); |
2985 | - -o-transform: translate3d(@x, @y, @z); |
2986 | - transform: translate3d(@x, @y, @z); |
2987 | -} |
2988 | - |
2989 | -// Backface visibility |
2990 | -// Prevent browsers from flickering when using CSS 3D transforms. |
2991 | -// Default value is `visible`, but can be changed to `hidden |
2992 | -// See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples |
2993 | -.backface-visibility(@visibility){ |
2994 | - -webkit-backface-visibility: @visibility; |
2995 | - -moz-backface-visibility: @visibility; |
2996 | - backface-visibility: @visibility; |
2997 | -} |
2998 | - |
2999 | -// Background clipping |
3000 | -// Heads up: FF 3.6 and under need "padding" instead of "padding-box" |
3001 | -.background-clip(@clip) { |
3002 | - -webkit-background-clip: @clip; |
3003 | - -moz-background-clip: @clip; |
3004 | - background-clip: @clip; |
3005 | -} |
3006 | - |
3007 | -// Background sizing |
3008 | -.background-size(@size) { |
3009 | - -webkit-background-size: @size; |
3010 | - -moz-background-size: @size; |
3011 | - -o-background-size: @size; |
3012 | - background-size: @size; |
3013 | -} |
3014 | - |
3015 | - |
3016 | -// Box sizing |
3017 | -.box-sizing(@boxmodel) { |
3018 | - -webkit-box-sizing: @boxmodel; |
3019 | - -moz-box-sizing: @boxmodel; |
3020 | - box-sizing: @boxmodel; |
3021 | -} |
3022 | - |
3023 | -// User select |
3024 | -// For selecting text on the page |
3025 | -.user-select(@select) { |
3026 | - -webkit-user-select: @select; |
3027 | - -moz-user-select: @select; |
3028 | - -ms-user-select: @select; |
3029 | - -o-user-select: @select; |
3030 | - user-select: @select; |
3031 | -} |
3032 | - |
3033 | -// Resize anything |
3034 | -.resizable(@direction) { |
3035 | - resize: @direction; // Options: horizontal, vertical, both |
3036 | - overflow: auto; // Safari fix |
3037 | -} |
3038 | - |
3039 | -// CSS3 Content Columns |
3040 | -.content-columns(@columnCount, @columnGap: @gridGutterWidth) { |
3041 | - -webkit-column-count: @columnCount; |
3042 | - -moz-column-count: @columnCount; |
3043 | - column-count: @columnCount; |
3044 | - -webkit-column-gap: @columnGap; |
3045 | - -moz-column-gap: @columnGap; |
3046 | - column-gap: @columnGap; |
3047 | -} |
3048 | - |
3049 | -// Optional hyphenation |
3050 | -.hyphens(@mode: auto) { |
3051 | - word-wrap: break-word; |
3052 | - -webkit-hyphens: @mode; |
3053 | - -moz-hyphens: @mode; |
3054 | - -ms-hyphens: @mode; |
3055 | - -o-hyphens: @mode; |
3056 | - hyphens: @mode; |
3057 | -} |
3058 | - |
3059 | -// Opacity |
3060 | -.opacity(@opacity) { |
3061 | - opacity: @opacity / 100; |
3062 | - filter: ~"alpha(opacity=@{opacity})"; |
3063 | -} |
3064 | - |
3065 | - |
3066 | - |
3067 | -// BACKGROUNDS |
3068 | -// -------------------------------------------------- |
3069 | - |
3070 | -// Add an alphatransparency value to any background or border color (via Elyse Holladay) |
3071 | -#translucent { |
3072 | - .background(@color: @white, @alpha: 1) { |
3073 | - background-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha); |
3074 | - } |
3075 | - .border(@color: @white, @alpha: 1) { |
3076 | - border-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha); |
3077 | - .background-clip(padding-box); |
3078 | - } |
3079 | -} |
3080 | - |
3081 | -// Gradient Bar Colors for buttons and alerts |
3082 | -.gradientBar(@primaryColor, @secondaryColor, @textColor: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) { |
3083 | - color: @textColor; |
3084 | - text-shadow: @textShadow; |
3085 | - #gradient > .vertical(@primaryColor, @secondaryColor); |
3086 | - border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%); |
3087 | - border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); |
3088 | -} |
3089 | - |
3090 | -// Gradients |
3091 | -#gradient { |
3092 | - .horizontal(@startColor: #555, @endColor: #333) { |
3093 | - background-color: @endColor; |
3094 | - background-image: -moz-linear-gradient(left, @startColor, @endColor); // FF 3.6+ |
3095 | - background-image: -webkit-gradient(linear, 0 0, 100% 0, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ |
3096 | - background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ |
3097 | - background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 |
3098 | - background-image: linear-gradient(to right, @startColor, @endColor); // Standard, IE10 |
3099 | - background-repeat: repeat-x; |
3100 | - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@startColor),argb(@endColor))); // IE9 and down |
3101 | - } |
3102 | - .vertical(@startColor: #555, @endColor: #333) { |
3103 | - background-color: mix(@startColor, @endColor, 60%); |
3104 | - background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+ |
3105 | - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ |
3106 | - background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+ |
3107 | - background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10 |
3108 | - background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10 |
3109 | - background-repeat: repeat-x; |
3110 | - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down |
3111 | - } |
3112 | - .directional(@startColor: #555, @endColor: #333, @deg: 45deg) { |
3113 | - background-color: @endColor; |
3114 | - background-repeat: repeat-x; |
3115 | - background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+ |
3116 | - background-image: -webkit-linear-gradient(@deg, @startColor, @endColor); // Safari 5.1+, Chrome 10+ |
3117 | - background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10 |
3118 | - background-image: linear-gradient(@deg, @startColor, @endColor); // Standard, IE10 |
3119 | - } |
3120 | - .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) { |
3121 | - background-color: mix(@midColor, @endColor, 80%); |
3122 | - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor)); |
3123 | - background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor); |
3124 | - background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor); |
3125 | - background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor); |
3126 | - background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor); |
3127 | - background-repeat: no-repeat; |
3128 | - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback |
3129 | - } |
3130 | - .radial(@innerColor: #555, @outerColor: #333) { |
3131 | - background-color: @outerColor; |
3132 | - background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor)); |
3133 | - background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor); |
3134 | - background-image: -moz-radial-gradient(circle, @innerColor, @outerColor); |
3135 | - background-image: -o-radial-gradient(circle, @innerColor, @outerColor); |
3136 | - background-repeat: no-repeat; |
3137 | - } |
3138 | - .striped(@color: #555, @angle: 45deg) { |
3139 | - background-color: @color; |
3140 | - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent)); |
3141 | - background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); |
3142 | - background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); |
3143 | - background-image: -o-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); |
3144 | - background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); |
3145 | - } |
3146 | -} |
3147 | -// Reset filters for IE |
3148 | -.reset-filter() { |
3149 | - filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)")); |
3150 | -} |
3151 | - |
3152 | - |
3153 | - |
3154 | -// COMPONENT MIXINS |
3155 | -// -------------------------------------------------- |
3156 | - |
3157 | -// Horizontal dividers |
3158 | -// ------------------------- |
3159 | -// Dividers (basically an hr) within dropdowns and nav lists |
3160 | -.nav-divider(@top: #e5e5e5, @bottom: @white) { |
3161 | - // IE7 needs a set width since we gave a height. Restricting just |
3162 | - // to IE7 to keep the 1px left/right space in other browsers. |
3163 | - // It is unclear where IE is getting the extra space that we need |
3164 | - // to negative-margin away, but so it goes. |
3165 | - *width: 100%; |
3166 | - height: 1px; |
3167 | - margin: ((@baseLineHeight / 2) - 1) 1px; // 8px 1px |
3168 | - *margin: -5px 0 5px; |
3169 | - overflow: hidden; |
3170 | - background-color: @top; |
3171 | - border-bottom: 1px solid @bottom; |
3172 | -} |
3173 | - |
3174 | -// Button backgrounds |
3175 | -// ------------------ |
3176 | -.buttonBackground(@startColor, @endColor, @textColor: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) { |
3177 | - // gradientBar will set the background to a pleasing blend of these, to support IE<=9 |
3178 | - .gradientBar(@startColor, @endColor, @textColor, @textShadow); |
3179 | - *background-color: @endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ |
3180 | - .reset-filter(); |
3181 | - |
3182 | - // in these cases the gradient won't cover the background, so we override |
3183 | - &:hover, &:active, &.active, &.disabled, &[disabled] { |
3184 | - color: @textColor; |
3185 | - background-color: @endColor; |
3186 | - *background-color: darken(@endColor, 5%); |
3187 | - } |
3188 | - |
3189 | - // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves |
3190 | - &:active, |
3191 | - &.active { |
3192 | - background-color: darken(@endColor, 10%) e("\9"); |
3193 | - } |
3194 | -} |
3195 | - |
3196 | -// Navbar vertical align |
3197 | -// ------------------------- |
3198 | -// Vertically center elements in the navbar. |
3199 | -// Example: an element has a height of 30px, so write out `.navbarVerticalAlign(30px);` to calculate the appropriate top margin. |
3200 | -.navbarVerticalAlign(@elementHeight) { |
3201 | - margin-top: (@navbarHeight - @elementHeight) / 2; |
3202 | -} |
3203 | - |
3204 | - |
3205 | - |
3206 | -// Grid System |
3207 | -// ----------- |
3208 | - |
3209 | -// Centered container element |
3210 | -.container-fixed() { |
3211 | - margin-right: auto; |
3212 | - margin-left: auto; |
3213 | - .clearfix(); |
3214 | -} |
3215 | - |
3216 | -// Table columns |
3217 | -.tableColumns(@columnSpan: 1) { |
3218 | - float: none; // undo default grid column styles |
3219 | - width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 16; // 16 is total padding on left and right of table cells |
3220 | - margin-left: 0; // undo default grid column styles |
3221 | -} |
3222 | - |
3223 | -// Make a Grid |
3224 | -// Use .makeRow and .makeColumn to assign semantic layouts grid system behavior |
3225 | -.makeRow() { |
3226 | - margin-left: @gridGutterWidth * -1; |
3227 | - .clearfix(); |
3228 | -} |
3229 | -.makeColumn(@columns: 1, @offset: 0) { |
3230 | - float: left; |
3231 | - margin-left: (@gridColumnWidth * @offset) + (@gridGutterWidth * (@offset - 1)) + (@gridGutterWidth * 2); |
3232 | - width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); |
3233 | -} |
3234 | - |
3235 | -// The Grid |
3236 | -#grid { |
3237 | - |
3238 | - .core (@gridColumnWidth, @gridGutterWidth) { |
3239 | - |
3240 | - .spanX (@index) when (@index > 0) { |
3241 | - (~".span@{index}") { .span(@index); } |
3242 | - .spanX(@index - 1); |
3243 | - } |
3244 | - .spanX (0) {} |
3245 | - |
3246 | - .offsetX (@index) when (@index > 0) { |
3247 | - (~".offset@{index}") { .offset(@index); } |
3248 | - .offsetX(@index - 1); |
3249 | - } |
3250 | - .offsetX (0) {} |
3251 | - |
3252 | - .offset (@columns) { |
3253 | - margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns + 1)); |
3254 | - } |
3255 | - |
3256 | - .span (@columns) { |
3257 | - width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); |
3258 | - } |
3259 | - |
3260 | - .row { |
3261 | - margin-left: @gridGutterWidth * -1; |
3262 | - .clearfix(); |
3263 | - } |
3264 | - |
3265 | - [class*="span"] { |
3266 | - float: left; |
3267 | - min-height: 1px; // prevent collapsing columns |
3268 | - margin-left: @gridGutterWidth; |
3269 | - } |
3270 | - |
3271 | - // Set the container width, and override it for fixed navbars in media queries |
3272 | - .container, |
3273 | - .navbar-static-top .container, |
3274 | - .navbar-fixed-top .container, |
3275 | - .navbar-fixed-bottom .container { .span(@gridColumns); } |
3276 | - |
3277 | - // generate .spanX and .offsetX |
3278 | - .spanX (@gridColumns); |
3279 | - .offsetX (@gridColumns); |
3280 | - |
3281 | - } |
3282 | - |
3283 | - .fluid (@fluidGridColumnWidth, @fluidGridGutterWidth) { |
3284 | - |
3285 | - .spanX (@index) when (@index > 0) { |
3286 | - (~".span@{index}") { .span(@index); } |
3287 | - .spanX(@index - 1); |
3288 | - } |
3289 | - .spanX (0) {} |
3290 | - |
3291 | - .offsetX (@index) when (@index > 0) { |
3292 | - (~'.offset@{index}') { .offset(@index); } |
3293 | - (~'.offset@{index}:first-child') { .offsetFirstChild(@index); } |
3294 | - .offsetX(@index - 1); |
3295 | - } |
3296 | - .offsetX (0) {} |
3297 | - |
3298 | - .offset (@columns) { |
3299 | - margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth*2); |
3300 | - *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + (@fluidGridGutterWidth*2) - (.5 / @gridRowWidth * 100 * 1%); |
3301 | - } |
3302 | - |
3303 | - .offsetFirstChild (@columns) { |
3304 | - margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth); |
3305 | - *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%); |
3306 | - } |
3307 | - |
3308 | - .span (@columns) { |
3309 | - width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)); |
3310 | - *width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%); |
3311 | - } |
3312 | - |
3313 | - .row-fluid { |
3314 | - width: 100%; |
3315 | - .clearfix(); |
3316 | - [class*="span"] { |
3317 | - .input-block-level(); |
3318 | - float: left; |
3319 | - margin-left: @fluidGridGutterWidth; |
3320 | - *margin-left: @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%); |
3321 | - } |
3322 | - [class*="span"]:first-child { |
3323 | - margin-left: 0; |
3324 | - } |
3325 | - |
3326 | - // Space grid-sized controls properly if multiple per line |
3327 | - .controls-row [class*="span"] + [class*="span"] { |
3328 | - margin-left: @fluidGridGutterWidth; |
3329 | - } |
3330 | - |
3331 | - // generate .spanX and .offsetX |
3332 | - .spanX (@gridColumns); |
3333 | - .offsetX (@gridColumns); |
3334 | - } |
3335 | - |
3336 | - } |
3337 | - |
3338 | - .input(@gridColumnWidth, @gridGutterWidth) { |
3339 | - |
3340 | - .spanX (@index) when (@index > 0) { |
3341 | - (~"input.span@{index}, textarea.span@{index}, .uneditable-input.span@{index}") { .span(@index); } |
3342 | - .spanX(@index - 1); |
3343 | - } |
3344 | - .spanX (0) {} |
3345 | - |
3346 | - .span(@columns) { |
3347 | - width: ((@gridColumnWidth) * @columns) + (@gridGutterWidth * (@columns - 1)) - 14; |
3348 | - } |
3349 | - |
3350 | - input, |
3351 | - textarea, |
3352 | - .uneditable-input { |
3353 | - margin-left: 0; // override margin-left from core grid system |
3354 | - } |
3355 | - |
3356 | - // Space grid-sized controls properly if multiple per line |
3357 | - .controls-row [class*="span"] + [class*="span"] { |
3358 | - margin-left: @gridGutterWidth; |
3359 | - } |
3360 | - |
3361 | - // generate .spanX |
3362 | - .spanX (@gridColumns); |
3363 | - |
3364 | - } |
3365 | - |
3366 | -} |
3367 | |
3368 | === removed file 'charmworld/static/css/bootstrap/modals.less' |
3369 | --- charmworld/static/css/bootstrap/modals.less 2013-01-21 13:40:18 +0000 |
3370 | +++ charmworld/static/css/bootstrap/modals.less 1970-01-01 00:00:00 +0000 |
3371 | @@ -1,95 +0,0 @@ |
3372 | -// |
3373 | -// Modals |
3374 | -// -------------------------------------------------- |
3375 | - |
3376 | -// Background |
3377 | -.modal-backdrop { |
3378 | - position: fixed; |
3379 | - top: 0; |
3380 | - right: 0; |
3381 | - bottom: 0; |
3382 | - left: 0; |
3383 | - z-index: @zindexModalBackdrop; |
3384 | - background-color: @black; |
3385 | - // Fade for backdrop |
3386 | - &.fade { opacity: 0; } |
3387 | -} |
3388 | - |
3389 | -.modal-backdrop, |
3390 | -.modal-backdrop.fade.in { |
3391 | - .opacity(80); |
3392 | -} |
3393 | - |
3394 | -// Base modal |
3395 | -.modal { |
3396 | - position: fixed; |
3397 | - top: 10%; |
3398 | - left: 50%; |
3399 | - z-index: @zindexModal; |
3400 | - width: 560px; |
3401 | - margin-left: -280px; |
3402 | - background-color: @white; |
3403 | - border: 1px solid #999; |
3404 | - border: 1px solid rgba(0,0,0,.3); |
3405 | - *border: 1px solid #999; /* IE6-7 */ |
3406 | - .border-radius(6px); |
3407 | - .box-shadow(0 3px 7px rgba(0,0,0,0.3)); |
3408 | - .background-clip(padding-box); |
3409 | - // Remove focus outline from opened modal |
3410 | - outline: none; |
3411 | - |
3412 | - &.fade { |
3413 | - .transition(e('opacity .3s linear, top .3s ease-out')); |
3414 | - top: -25%; |
3415 | - } |
3416 | - &.fade.in { top: 10%; } |
3417 | -} |
3418 | -.modal-header { |
3419 | - padding: 9px 15px; |
3420 | - border-bottom: 1px solid #eee; |
3421 | - // Close icon |
3422 | - .close { margin-top: 2px; } |
3423 | - // Heading |
3424 | - h3 { |
3425 | - margin: 0; |
3426 | - line-height: 30px; |
3427 | - } |
3428 | -} |
3429 | - |
3430 | -// Body (where all modal content resides) |
3431 | -.modal-body { |
3432 | - position: relative; |
3433 | - overflow-y: auto; |
3434 | - max-height: 400px; |
3435 | - padding: 15px; |
3436 | -} |
3437 | -// Remove bottom margin if need be |
3438 | -.modal-form { |
3439 | - margin-bottom: 0; |
3440 | -} |
3441 | - |
3442 | -// Footer (for actions) |
3443 | -.modal-footer { |
3444 | - padding: 14px 15px 15px; |
3445 | - margin-bottom: 0; |
3446 | - text-align: right; // right align buttons |
3447 | - background-color: #f5f5f5; |
3448 | - border-top: 1px solid #ddd; |
3449 | - .border-radius(0 0 6px 6px); |
3450 | - .box-shadow(inset 0 1px 0 @white); |
3451 | - .clearfix(); // clear it in case folks use .pull-* classes on buttons |
3452 | - |
3453 | - // Properly space out buttons |
3454 | - .btn + .btn { |
3455 | - margin-left: 5px; |
3456 | - margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs |
3457 | - } |
3458 | - // but override that for button groups |
3459 | - .btn-group .btn + .btn { |
3460 | - margin-left: -1px; |
3461 | - } |
3462 | - // and override it for block buttons as well |
3463 | - .btn-block + .btn-block { |
3464 | - margin-left: 0; |
3465 | - } |
3466 | -} |
3467 | |
3468 | === removed file 'charmworld/static/css/bootstrap/navbar.less' |
3469 | --- charmworld/static/css/bootstrap/navbar.less 2013-01-21 13:40:18 +0000 |
3470 | +++ charmworld/static/css/bootstrap/navbar.less 1970-01-01 00:00:00 +0000 |
3471 | @@ -1,490 +0,0 @@ |
3472 | -// |
3473 | -// Navbars (Redux) |
3474 | -// -------------------------------------------------- |
3475 | - |
3476 | - |
3477 | -// COMMON STYLES |
3478 | -// ------------- |
3479 | - |
3480 | -// Base class and wrapper |
3481 | -.navbar { |
3482 | - overflow: visible; |
3483 | - margin-bottom: @baseLineHeight; |
3484 | - |
3485 | - // Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar |
3486 | - *position: relative; |
3487 | - *z-index: 2; |
3488 | -} |
3489 | - |
3490 | -// Inner for background effects |
3491 | -// Gradient is applied to its own element because overflow visible is not honored by IE when filter is present |
3492 | -.navbar-inner { |
3493 | - min-height: @navbarHeight; |
3494 | - padding-left: 20px; |
3495 | - padding-right: 20px; |
3496 | - #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground); |
3497 | - border: 1px solid @navbarBorder; |
3498 | - .border-radius(@baseBorderRadius); |
3499 | - .box-shadow(0 1px 4px rgba(0,0,0,.065)); |
3500 | - |
3501 | - // Prevent floats from breaking the navbar |
3502 | - .clearfix(); |
3503 | -} |
3504 | - |
3505 | -// Set width to auto for default container |
3506 | -// We then reset it for fixed navbars in the #gridSystem mixin |
3507 | -.navbar .container { |
3508 | - width: auto; |
3509 | -} |
3510 | - |
3511 | -// Override the default collapsed state |
3512 | -.nav-collapse.collapse { |
3513 | - height: auto; |
3514 | - overflow: visible; |
3515 | -} |
3516 | - |
3517 | - |
3518 | -// Brand: website or project name |
3519 | -// ------------------------- |
3520 | -.navbar .brand { |
3521 | - float: left; |
3522 | - display: block; |
3523 | - // Vertically center the text given @navbarHeight |
3524 | - padding: ((@navbarHeight - @baseLineHeight) / 2) 20px ((@navbarHeight - @baseLineHeight) / 2); |
3525 | - margin-left: -20px; // negative indent to left-align the text down the page |
3526 | - font-size: 20px; |
3527 | - font-weight: 200; |
3528 | - color: @navbarBrandColor; |
3529 | - text-shadow: 0 1px 0 @navbarBackgroundHighlight; |
3530 | - &:hover { |
3531 | - text-decoration: none; |
3532 | - } |
3533 | -} |
3534 | - |
3535 | -// Plain text in topbar |
3536 | -// ------------------------- |
3537 | -.navbar-text { |
3538 | - margin-bottom: 0; |
3539 | - line-height: @navbarHeight; |
3540 | - color: @navbarText; |
3541 | -} |
3542 | - |
3543 | -// Janky solution for now to account for links outside the .nav |
3544 | -// ------------------------- |
3545 | -.navbar-link { |
3546 | - color: @navbarLinkColor; |
3547 | - &:hover { |
3548 | - color: @navbarLinkColorHover; |
3549 | - } |
3550 | -} |
3551 | - |
3552 | -// Dividers in navbar |
3553 | -// ------------------------- |
3554 | -.navbar .divider-vertical { |
3555 | - height: @navbarHeight; |
3556 | - margin: 0 9px; |
3557 | - border-left: 1px solid @navbarBackground; |
3558 | - border-right: 1px solid @navbarBackgroundHighlight; |
3559 | -} |
3560 | - |
3561 | -// Buttons in navbar |
3562 | -// ------------------------- |
3563 | -.navbar .btn, |
3564 | -.navbar .btn-group { |
3565 | - .navbarVerticalAlign(30px); // Vertically center in navbar |
3566 | -} |
3567 | -.navbar .btn-group .btn, |
3568 | -.navbar .input-prepend .btn, |
3569 | -.navbar .input-append .btn { |
3570 | - margin-top: 0; // then undo the margin here so we don't accidentally double it |
3571 | -} |
3572 | - |
3573 | -// Navbar forms |
3574 | -// ------------------------- |
3575 | -.navbar-form { |
3576 | - margin-bottom: 0; // remove default bottom margin |
3577 | - .clearfix(); |
3578 | - input, |
3579 | - select, |
3580 | - .radio, |
3581 | - .checkbox { |
3582 | - .navbarVerticalAlign(30px); // Vertically center in navbar |
3583 | - } |
3584 | - input, |
3585 | - select, |
3586 | - .btn { |
3587 | - display: inline-block; |
3588 | - margin-bottom: 0; |
3589 | - } |
3590 | - input[type="image"], |
3591 | - input[type="checkbox"], |
3592 | - input[type="radio"] { |
3593 | - margin-top: 3px; |
3594 | - } |
3595 | - .input-append, |
3596 | - .input-prepend { |
3597 | - margin-top: 5px; |
3598 | - white-space: nowrap; // preven two items from separating within a .navbar-form that has .pull-left |
3599 | - input { |
3600 | - margin-top: 0; // remove the margin on top since it's on the parent |
3601 | - } |
3602 | - } |
3603 | -} |
3604 | - |
3605 | -// Navbar search |
3606 | -// ------------------------- |
3607 | -.navbar-search { |
3608 | - position: relative; |
3609 | - float: left; |
3610 | - .navbarVerticalAlign(30px); // Vertically center in navbar |
3611 | - margin-bottom: 0; |
3612 | - .search-query { |
3613 | - margin-bottom: 0; |
3614 | - padding: 4px 14px; |
3615 | - #font > .sans-serif(13px, normal, 1); |
3616 | - .border-radius(15px); // redeclare because of specificity of the type attribute |
3617 | - } |
3618 | -} |
3619 | - |
3620 | - |
3621 | - |
3622 | -// Static navbar |
3623 | -// ------------------------- |
3624 | - |
3625 | -.navbar-static-top { |
3626 | - position: static; |
3627 | - margin-bottom: 0; // remove 18px margin for default navbar |
3628 | - .navbar-inner { |
3629 | - .border-radius(0); |
3630 | - } |
3631 | -} |
3632 | - |
3633 | - |
3634 | - |
3635 | -// Fixed navbar |
3636 | -// ------------------------- |
3637 | - |
3638 | -// Shared (top/bottom) styles |
3639 | -.navbar-fixed-top, |
3640 | -.navbar-fixed-bottom { |
3641 | - position: fixed; |
3642 | - right: 0; |
3643 | - left: 0; |
3644 | - z-index: @zindexFixedNavbar; |
3645 | - margin-bottom: 0; // remove 18px margin for default navbar |
3646 | -} |
3647 | -.navbar-fixed-top .navbar-inner, |
3648 | -.navbar-static-top .navbar-inner { |
3649 | - border-width: 0 0 1px; |
3650 | -} |
3651 | -.navbar-fixed-bottom .navbar-inner { |
3652 | - border-width: 1px 0 0; |
3653 | -} |
3654 | -.navbar-fixed-top .navbar-inner, |
3655 | -.navbar-fixed-bottom .navbar-inner { |
3656 | - padding-left: 0; |
3657 | - padding-right: 0; |
3658 | - .border-radius(0); |
3659 | -} |
3660 | - |
3661 | -// Reset container width |
3662 | -// Required here as we reset the width earlier on and the grid mixins don't override early enough |
3663 | -.navbar-static-top .container, |
3664 | -.navbar-fixed-top .container, |
3665 | -.navbar-fixed-bottom .container { |
3666 | - #grid > .core > .span(@gridColumns); |
3667 | -} |
3668 | - |
3669 | -// Fixed to top |
3670 | -.navbar-fixed-top { |
3671 | - top: 0; |
3672 | -} |
3673 | -.navbar-fixed-top, |
3674 | -.navbar-static-top { |
3675 | - .navbar-inner { |
3676 | - .box-shadow(~"0 1px 10px rgba(0,0,0,.1)"); |
3677 | - } |
3678 | -} |
3679 | - |
3680 | -// Fixed to bottom |
3681 | -.navbar-fixed-bottom { |
3682 | - bottom: 0; |
3683 | - .navbar-inner { |
3684 | - .box-shadow(~"0 -1px 10px rgba(0,0,0,.1)"); |
3685 | - } |
3686 | -} |
3687 | - |
3688 | - |
3689 | - |
3690 | -// NAVIGATION |
3691 | -// ---------- |
3692 | - |
3693 | -.navbar .nav { |
3694 | - position: relative; |
3695 | - left: 0; |
3696 | - display: block; |
3697 | - float: left; |
3698 | - margin: 0 10px 0 0; |
3699 | -} |
3700 | -.navbar .nav.pull-right { |
3701 | - float: right; // redeclare due to specificity |
3702 | - margin-right: 0; // remove margin on float right nav |
3703 | -} |
3704 | -.navbar .nav > li { |
3705 | - float: left; |
3706 | -} |
3707 | - |
3708 | -// Links |
3709 | -.navbar .nav > li > a { |
3710 | - float: none; |
3711 | - // Vertically center the text given @navbarHeight |
3712 | - padding: ((@navbarHeight - @baseLineHeight) / 2) 15px ((@navbarHeight - @baseLineHeight) / 2); |
3713 | - color: @navbarLinkColor; |
3714 | - text-decoration: none; |
3715 | - text-shadow: 0 1px 0 @navbarBackgroundHighlight; |
3716 | -} |
3717 | -.navbar .nav .dropdown-toggle .caret { |
3718 | - margin-top: 8px; |
3719 | - |
3720 | -} |
3721 | - |
3722 | -// Hover |
3723 | -.navbar .nav > li > a:focus, |
3724 | -.navbar .nav > li > a:hover { |
3725 | - background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active |
3726 | - color: @navbarLinkColorHover; |
3727 | - text-decoration: none; |
3728 | -} |
3729 | - |
3730 | -// Active nav items |
3731 | -.navbar .nav > .active > a, |
3732 | -.navbar .nav > .active > a:hover, |
3733 | -.navbar .nav > .active > a:focus { |
3734 | - color: @navbarLinkColorActive; |
3735 | - text-decoration: none; |
3736 | - background-color: @navbarLinkBackgroundActive; |
3737 | - .box-shadow(inset 0 3px 8px rgba(0,0,0,.125)); |
3738 | -} |
3739 | - |
3740 | -// Navbar button for toggling navbar items in responsive layouts |
3741 | -// These definitions need to come after '.navbar .btn' |
3742 | -.navbar .btn-navbar { |
3743 | - display: none; |
3744 | - float: right; |
3745 | - padding: 7px 10px; |
3746 | - margin-left: 5px; |
3747 | - margin-right: 5px; |
3748 | - .buttonBackground(darken(@navbarBackgroundHighlight, 5%), darken(@navbarBackground, 5%)); |
3749 | - .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)"); |
3750 | -} |
3751 | -.navbar .btn-navbar .icon-bar { |
3752 | - display: block; |
3753 | - width: 18px; |
3754 | - height: 2px; |
3755 | - background-color: #f5f5f5; |
3756 | - .border-radius(1px); |
3757 | - .box-shadow(0 1px 0 rgba(0,0,0,.25)); |
3758 | -} |
3759 | -.btn-navbar .icon-bar + .icon-bar { |
3760 | - margin-top: 3px; |
3761 | -} |
3762 | - |
3763 | - |
3764 | - |
3765 | -// Dropdown menus |
3766 | -// -------------- |
3767 | - |
3768 | -// Menu position and menu carets |
3769 | -.navbar .nav > li > .dropdown-menu { |
3770 | - &:before { |
3771 | - content: ''; |
3772 | - display: inline-block; |
3773 | - border-left: 7px solid transparent; |
3774 | - border-right: 7px solid transparent; |
3775 | - border-bottom: 7px solid #ccc; |
3776 | - border-bottom-color: @dropdownBorder; |
3777 | - position: absolute; |
3778 | - top: -7px; |
3779 | - left: 9px; |
3780 | - } |
3781 | - &:after { |
3782 | - content: ''; |
3783 | - display: inline-block; |
3784 | - border-left: 6px solid transparent; |
3785 | - border-right: 6px solid transparent; |
3786 | - border-bottom: 6px solid @dropdownBackground; |
3787 | - position: absolute; |
3788 | - top: -6px; |
3789 | - left: 10px; |
3790 | - } |
3791 | -} |
3792 | -// Menu position and menu caret support for dropups via extra dropup class |
3793 | -.navbar-fixed-bottom .nav > li > .dropdown-menu { |
3794 | - &:before { |
3795 | - border-top: 7px solid #ccc; |
3796 | - border-top-color: @dropdownBorder; |
3797 | - border-bottom: 0; |
3798 | - bottom: -7px; |
3799 | - top: auto; |
3800 | - } |
3801 | - &:after { |
3802 | - border-top: 6px solid @dropdownBackground; |
3803 | - border-bottom: 0; |
3804 | - bottom: -6px; |
3805 | - top: auto; |
3806 | - } |
3807 | -} |
3808 | - |
3809 | -// Caret should match text color on hover |
3810 | -.navbar .nav li.dropdown > a:hover .caret { |
3811 | - border-top-color: @navbarLinkColorActive; |
3812 | - border-bottom-color: @navbarLinkColorActive; |
3813 | -} |
3814 | - |
3815 | -// Remove background color from open dropdown |
3816 | -.navbar .nav li.dropdown.open > .dropdown-toggle, |
3817 | -.navbar .nav li.dropdown.active > .dropdown-toggle, |
3818 | -.navbar .nav li.dropdown.open.active > .dropdown-toggle { |
3819 | - background-color: @navbarLinkBackgroundActive; |
3820 | - color: @navbarLinkColorActive; |
3821 | -} |
3822 | -.navbar .nav li.dropdown > .dropdown-toggle .caret { |
3823 | - border-top-color: @navbarLinkColor; |
3824 | - border-bottom-color: @navbarLinkColor; |
3825 | -} |
3826 | -.navbar .nav li.dropdown.open > .dropdown-toggle .caret, |
3827 | -.navbar .nav li.dropdown.active > .dropdown-toggle .caret, |
3828 | -.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { |
3829 | - border-top-color: @navbarLinkColorActive; |
3830 | - border-bottom-color: @navbarLinkColorActive; |
3831 | -} |
3832 | - |
3833 | -// Right aligned menus need alt position |
3834 | -.navbar .pull-right > li > .dropdown-menu, |
3835 | -.navbar .nav > li > .dropdown-menu.pull-right { |
3836 | - left: auto; |
3837 | - right: 0; |
3838 | - &:before { |
3839 | - left: auto; |
3840 | - right: 12px; |
3841 | - } |
3842 | - &:after { |
3843 | - left: auto; |
3844 | - right: 13px; |
3845 | - } |
3846 | - .dropdown-menu { |
3847 | - left: auto; |
3848 | - right: 100%; |
3849 | - margin-left: 0; |
3850 | - margin-right: -1px; |
3851 | - .border-radius(6px 0 6px 6px); |
3852 | - } |
3853 | -} |
3854 | - |
3855 | - |
3856 | -// Inverted navbar |
3857 | -// ------------------------- |
3858 | - |
3859 | -.navbar-inverse { |
3860 | - |
3861 | - .navbar-inner { |
3862 | - #gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground); |
3863 | - border-color: @navbarInverseBorder; |
3864 | - } |
3865 | - |
3866 | - .brand, |
3867 | - .nav > li > a { |
3868 | - color: @navbarInverseLinkColor; |
3869 | - text-shadow: 0 -1px 0 rgba(0,0,0,.25); |
3870 | - &:hover { |
3871 | - color: @navbarInverseLinkColorHover; |
3872 | - } |
3873 | - } |
3874 | - |
3875 | - .brand { |
3876 | - color: @navbarInverseBrandColor; |
3877 | - } |
3878 | - |
3879 | - .navbar-text { |
3880 | - color: @navbarInverseText; |
3881 | - } |
3882 | - |
3883 | - .nav > li > a:focus, |
3884 | - .nav > li > a:hover { |
3885 | - background-color: @navbarInverseLinkBackgroundHover; |
3886 | - color: @navbarInverseLinkColorHover; |
3887 | - } |
3888 | - |
3889 | - .nav .active > a, |
3890 | - .nav .active > a:hover, |
3891 | - .nav .active > a:focus { |
3892 | - color: @navbarInverseLinkColorActive; |
3893 | - background-color: @navbarInverseLinkBackgroundActive; |
3894 | - } |
3895 | - |
3896 | - // Inline text links |
3897 | - .navbar-link { |
3898 | - color: @navbarInverseLinkColor; |
3899 | - &:hover { |
3900 | - color: @navbarInverseLinkColorHover; |
3901 | - } |
3902 | - } |
3903 | - |
3904 | - // Dividers in navbar |
3905 | - .divider-vertical { |
3906 | - border-left-color: @navbarInverseBackground; |
3907 | - border-right-color: @navbarInverseBackgroundHighlight; |
3908 | - } |
3909 | - |
3910 | - // Dropdowns |
3911 | - .nav li.dropdown.open > .dropdown-toggle, |
3912 | - .nav li.dropdown.active > .dropdown-toggle, |
3913 | - .nav li.dropdown.open.active > .dropdown-toggle { |
3914 | - background-color: @navbarInverseLinkBackgroundActive; |
3915 | - color: @navbarInverseLinkColorActive; |
3916 | - } |
3917 | - .nav li.dropdown > a:hover .caret { |
3918 | - border-top-color: @navbarInverseLinkColorActive; |
3919 | - border-bottom-color: @navbarInverseLinkColorActive; |
3920 | - } |
3921 | - .nav li.dropdown > .dropdown-toggle .caret { |
3922 | - border-top-color: @navbarInverseLinkColor; |
3923 | - border-bottom-color: @navbarInverseLinkColor; |
3924 | - } |
3925 | - .nav li.dropdown.open > .dropdown-toggle .caret, |
3926 | - .nav li.dropdown.active > .dropdown-toggle .caret, |
3927 | - .nav li.dropdown.open.active > .dropdown-toggle .caret { |
3928 | - border-top-color: @navbarInverseLinkColorActive; |
3929 | - border-bottom-color: @navbarInverseLinkColorActive; |
3930 | - } |
3931 | - |
3932 | - // Navbar search |
3933 | - .navbar-search { |
3934 | - .search-query { |
3935 | - color: @white; |
3936 | - background-color: @navbarInverseSearchBackground; |
3937 | - border-color: @navbarInverseSearchBorder; |
3938 | - .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)"); |
3939 | - .transition(none); |
3940 | - .placeholder(@navbarInverseSearchPlaceholderColor); |
3941 | - |
3942 | - // Focus states (we use .focused since IE7-8 and down doesn't support :focus) |
3943 | - &:focus, |
3944 | - &.focused { |
3945 | - padding: 5px 15px; |
3946 | - color: @grayDark; |
3947 | - text-shadow: 0 1px 0 @white; |
3948 | - background-color: @navbarInverseSearchBackgroundFocus; |
3949 | - border: 0; |
3950 | - .box-shadow(0 0 3px rgba(0,0,0,.15)); |
3951 | - outline: 0; |
3952 | - } |
3953 | - } |
3954 | - } |
3955 | - |
3956 | - // Navbar collapse button |
3957 | - .btn-navbar { |
3958 | - .buttonBackground(darken(@navbarInverseBackgroundHighlight, 5%), darken(@navbarInverseBackground, 5%)); |
3959 | - } |
3960 | - |
3961 | -} |
3962 | |
3963 | === removed file 'charmworld/static/css/bootstrap/navs.less' |
3964 | --- charmworld/static/css/bootstrap/navs.less 2013-01-21 13:40:18 +0000 |
3965 | +++ charmworld/static/css/bootstrap/navs.less 1970-01-01 00:00:00 +0000 |
3966 | @@ -1,391 +0,0 @@ |
3967 | -// |
3968 | -// Navs |
3969 | -// -------------------------------------------------- |
3970 | - |
3971 | - |
3972 | -// BASE CLASS |
3973 | -// ---------- |
3974 | - |
3975 | -.nav { |
3976 | - margin-left: 0; |
3977 | - margin-bottom: @baseLineHeight; |
3978 | - list-style: none; |
3979 | -} |
3980 | - |
3981 | -// Make links block level |
3982 | -.nav > li > a { |
3983 | - display: block; |
3984 | -} |
3985 | -.nav > li > a:hover { |
3986 | - text-decoration: none; |
3987 | - background-color: @grayLighter; |
3988 | -} |
3989 | - |
3990 | -// Prevent IE8 from misplacing imgs |
3991 | -// See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989 |
3992 | -.nav > li > a > img { |
3993 | - max-width: none; |
3994 | -} |
3995 | - |
3996 | -// Redeclare pull classes because of specifity |
3997 | -.nav > .pull-right { |
3998 | - float: right; |
3999 | -} |
4000 | - |
4001 | -// Nav headers (for dropdowns and lists) |
4002 | -.nav-header { |
4003 | - display: block; |
4004 | - padding: 3px 15px; |
4005 | - font-size: 11px; |
4006 | - font-weight: bold; |
4007 | - line-height: @baseLineHeight; |
4008 | - color: @grayLight; |
4009 | - text-shadow: 0 1px 0 rgba(255,255,255,.5); |
4010 | - text-transform: uppercase; |
4011 | -} |
4012 | -// Space them out when they follow another list item (link) |
4013 | -.nav li + .nav-header { |
4014 | - margin-top: 9px; |
4015 | -} |
4016 | - |
4017 | - |
4018 | - |
4019 | -// NAV LIST |
4020 | -// -------- |
4021 | - |
4022 | -.nav-list { |
4023 | - padding-left: 15px; |
4024 | - padding-right: 15px; |
4025 | - margin-bottom: 0; |
4026 | -} |
4027 | -.nav-list > li > a, |
4028 | -.nav-list .nav-header { |
4029 | - margin-left: -15px; |
4030 | - margin-right: -15px; |
4031 | - text-shadow: 0 1px 0 rgba(255,255,255,.5); |
4032 | -} |
4033 | -.nav-list > li > a { |
4034 | - padding: 3px 15px; |
4035 | -} |
4036 | -.nav-list > .active > a, |
4037 | -.nav-list > .active > a:hover { |
4038 | - color: @white; |
4039 | - text-shadow: 0 -1px 0 rgba(0,0,0,.2); |
4040 | - background-color: @linkColor; |
4041 | -} |
4042 | -.nav-list [class^="icon-"], |
4043 | -.nav-list [class*=" icon-"] { |
4044 | - margin-right: 2px; |
4045 | -} |
4046 | -// Dividers (basically an hr) within the dropdown |
4047 | -.nav-list .divider { |
4048 | - .nav-divider(); |
4049 | -} |
4050 | - |
4051 | - |
4052 | - |
4053 | -// TABS AND PILLS |
4054 | -// ------------- |
4055 | - |
4056 | -// Common styles |
4057 | -.nav-tabs, |
4058 | -.nav-pills { |
4059 | - .clearfix(); |
4060 | -} |
4061 | -.nav-tabs > li, |
4062 | -.nav-pills > li { |
4063 | - float: left; |
4064 | -} |
4065 | -.nav-tabs > li > a, |
4066 | -.nav-pills > li > a { |
4067 | - padding-right: 12px; |
4068 | - padding-left: 12px; |
4069 | - margin-right: 2px; |
4070 | - line-height: 14px; // keeps the overall height an even number |
4071 | -} |
4072 | - |
4073 | -// TABS |
4074 | -// ---- |
4075 | - |
4076 | -// Give the tabs something to sit on |
4077 | -.nav-tabs { |
4078 | - border-bottom: 1px solid #ddd; |
4079 | -} |
4080 | -// Make the list-items overlay the bottom border |
4081 | -.nav-tabs > li { |
4082 | - margin-bottom: -1px; |
4083 | -} |
4084 | -// Actual tabs (as links) |
4085 | -.nav-tabs > li > a { |
4086 | - padding-top: 8px; |
4087 | - padding-bottom: 8px; |
4088 | - line-height: @baseLineHeight; |
4089 | - border: 1px solid transparent; |
4090 | - .border-radius(4px 4px 0 0); |
4091 | - &:hover { |
4092 | - border-color: @grayLighter @grayLighter #ddd; |
4093 | - } |
4094 | -} |
4095 | -// Active state, and it's :hover to override normal :hover |
4096 | -.nav-tabs > .active > a, |
4097 | -.nav-tabs > .active > a:hover { |
4098 | - color: @gray; |
4099 | - background-color: @bodyBackground; |
4100 | - border: 1px solid #ddd; |
4101 | - border-bottom-color: transparent; |
4102 | - cursor: default; |
4103 | -} |
4104 | - |
4105 | - |
4106 | -// PILLS |
4107 | -// ----- |
4108 | - |
4109 | -// Links rendered as pills |
4110 | -.nav-pills > li > a { |
4111 | - padding-top: 8px; |
4112 | - padding-bottom: 8px; |
4113 | - margin-top: 2px; |
4114 | - margin-bottom: 2px; |
4115 | - .border-radius(5px); |
4116 | -} |
4117 | - |
4118 | -// Active state |
4119 | -.nav-pills > .active > a, |
4120 | -.nav-pills > .active > a:hover { |
4121 | - color: @white; |
4122 | - background-color: @linkColor; |
4123 | -} |
4124 | - |
4125 | - |
4126 | - |
4127 | -// STACKED NAV |
4128 | -// ----------- |
4129 | - |
4130 | -// Stacked tabs and pills |
4131 | -.nav-stacked > li { |
4132 | - float: none; |
4133 | -} |
4134 | -.nav-stacked > li > a { |
4135 | - margin-right: 0; // no need for the gap between nav items |
4136 | -} |
4137 | - |
4138 | -// Tabs |
4139 | -.nav-tabs.nav-stacked { |
4140 | - border-bottom: 0; |
4141 | -} |
4142 | -.nav-tabs.nav-stacked > li > a { |
4143 | - border: 1px solid #ddd; |
4144 | - .border-radius(0); |
4145 | -} |
4146 | -.nav-tabs.nav-stacked > li:first-child > a { |
4147 | - .border-top-radius(4px); |
4148 | -} |
4149 | -.nav-tabs.nav-stacked > li:last-child > a { |
4150 | - .border-bottom-radius(4px); |
4151 | -} |
4152 | -.nav-tabs.nav-stacked > li > a:hover { |
4153 | - border-color: #ddd; |
4154 | - z-index: 2; |
4155 | -} |
4156 | - |
4157 | -// Pills |
4158 | -.nav-pills.nav-stacked > li > a { |
4159 | - margin-bottom: 3px; |
4160 | -} |
4161 | -.nav-pills.nav-stacked > li:last-child > a { |
4162 | - margin-bottom: 1px; // decrease margin to match sizing of stacked tabs |
4163 | -} |
4164 | - |
4165 | - |
4166 | - |
4167 | -// DROPDOWNS |
4168 | -// --------- |
4169 | - |
4170 | -.nav-tabs .dropdown-menu { |
4171 | - .border-radius(0 0 6px 6px); // remove the top rounded corners here since there is a hard edge above the menu |
4172 | -} |
4173 | -.nav-pills .dropdown-menu { |
4174 | - .border-radius(6px); // make rounded corners match the pills |
4175 | -} |
4176 | - |
4177 | -// Default dropdown links |
4178 | -// ------------------------- |
4179 | -// Make carets use linkColor to start |
4180 | -.nav .dropdown-toggle .caret { |
4181 | - border-top-color: @linkColor; |
4182 | - border-bottom-color: @linkColor; |
4183 | - margin-top: 6px; |
4184 | -} |
4185 | -.nav .dropdown-toggle:hover .caret { |
4186 | - border-top-color: @linkColorHover; |
4187 | - border-bottom-color: @linkColorHover; |
4188 | -} |
4189 | -/* move down carets for tabs */ |
4190 | -.nav-tabs .dropdown-toggle .caret { |
4191 | - margin-top: 8px; |
4192 | -} |
4193 | - |
4194 | -// Active dropdown links |
4195 | -// ------------------------- |
4196 | -.nav .active .dropdown-toggle .caret { |
4197 | - border-top-color: #fff; |
4198 | - border-bottom-color: #fff; |
4199 | -} |
4200 | -.nav-tabs .active .dropdown-toggle .caret { |
4201 | - border-top-color: @gray; |
4202 | - border-bottom-color: @gray; |
4203 | -} |
4204 | - |
4205 | -// Active:hover dropdown links |
4206 | -// ------------------------- |
4207 | -.nav > .dropdown.active > a:hover { |
4208 | - cursor: pointer; |
4209 | -} |
4210 | - |
4211 | -// Open dropdowns |
4212 | -// ------------------------- |
4213 | -.nav-tabs .open .dropdown-toggle, |
4214 | -.nav-pills .open .dropdown-toggle, |
4215 | -.nav > li.dropdown.open.active > a:hover { |
4216 | - color: @white; |
4217 | - background-color: @grayLight; |
4218 | - border-color: @grayLight; |
4219 | -} |
4220 | -.nav li.dropdown.open .caret, |
4221 | -.nav li.dropdown.open.active .caret, |
4222 | -.nav li.dropdown.open a:hover .caret { |
4223 | - border-top-color: @white; |
4224 | - border-bottom-color: @white; |
4225 | - .opacity(100); |
4226 | -} |
4227 | - |
4228 | -// Dropdowns in stacked tabs |
4229 | -.tabs-stacked .open > a:hover { |
4230 | - border-color: @grayLight; |
4231 | -} |
4232 | - |
4233 | - |
4234 | - |
4235 | -// TABBABLE |
4236 | -// -------- |
4237 | - |
4238 | - |
4239 | -// COMMON STYLES |
4240 | -// ------------- |
4241 | - |
4242 | -// Clear any floats |
4243 | -.tabbable { |
4244 | - .clearfix(); |
4245 | -} |
4246 | -.tab-content { |
4247 | - overflow: auto; // prevent content from running below tabs |
4248 | -} |
4249 | - |
4250 | -// Remove border on bottom, left, right |
4251 | -.tabs-below > .nav-tabs, |
4252 | -.tabs-right > .nav-tabs, |
4253 | -.tabs-left > .nav-tabs { |
4254 | - border-bottom: 0; |
4255 | -} |
4256 | - |
4257 | -// Show/hide tabbable areas |
4258 | -.tab-content > .tab-pane, |
4259 | -.pill-content > .pill-pane { |
4260 | - display: none; |
4261 | -} |
4262 | -.tab-content > .active, |
4263 | -.pill-content > .active { |
4264 | - display: block; |
4265 | -} |
4266 | - |
4267 | - |
4268 | -// BOTTOM |
4269 | -// ------ |
4270 | - |
4271 | -.tabs-below > .nav-tabs { |
4272 | - border-top: 1px solid #ddd; |
4273 | -} |
4274 | -.tabs-below > .nav-tabs > li { |
4275 | - margin-top: -1px; |
4276 | - margin-bottom: 0; |
4277 | -} |
4278 | -.tabs-below > .nav-tabs > li > a { |
4279 | - .border-radius(0 0 4px 4px); |
4280 | - &:hover { |
4281 | - border-bottom-color: transparent; |
4282 | - border-top-color: #ddd; |
4283 | - } |
4284 | -} |
4285 | -.tabs-below > .nav-tabs > .active > a, |
4286 | -.tabs-below > .nav-tabs > .active > a:hover { |
4287 | - border-color: transparent #ddd #ddd #ddd; |
4288 | -} |
4289 | - |
4290 | -// LEFT & RIGHT |
4291 | -// ------------ |
4292 | - |
4293 | -// Common styles |
4294 | -.tabs-left > .nav-tabs > li, |
4295 | -.tabs-right > .nav-tabs > li { |
4296 | - float: none; |
4297 | -} |
4298 | -.tabs-left > .nav-tabs > li > a, |
4299 | -.tabs-right > .nav-tabs > li > a { |
4300 | - min-width: 74px; |
4301 | - margin-right: 0; |
4302 | - margin-bottom: 3px; |
4303 | -} |
4304 | - |
4305 | -// Tabs on the left |
4306 | -.tabs-left > .nav-tabs { |
4307 | - float: left; |
4308 | - margin-right: 19px; |
4309 | - border-right: 1px solid #ddd; |
4310 | -} |
4311 | -.tabs-left > .nav-tabs > li > a { |
4312 | - margin-right: -1px; |
4313 | - .border-radius(4px 0 0 4px); |
4314 | -} |
4315 | -.tabs-left > .nav-tabs > li > a:hover { |
4316 | - border-color: @grayLighter #ddd @grayLighter @grayLighter; |
4317 | -} |
4318 | -.tabs-left > .nav-tabs .active > a, |
4319 | -.tabs-left > .nav-tabs .active > a:hover { |
4320 | - border-color: #ddd transparent #ddd #ddd; |
4321 | - *border-right-color: @white; |
4322 | -} |
4323 | - |
4324 | -// Tabs on the right |
4325 | -.tabs-right > .nav-tabs { |
4326 | - float: right; |
4327 | - margin-left: 19px; |
4328 | - border-left: 1px solid #ddd; |
4329 | -} |
4330 | -.tabs-right > .nav-tabs > li > a { |
4331 | - margin-left: -1px; |
4332 | - .border-radius(0 4px 4px 0); |
4333 | -} |
4334 | -.tabs-right > .nav-tabs > li > a:hover { |
4335 | - border-color: @grayLighter @grayLighter @grayLighter #ddd; |
4336 | -} |
4337 | -.tabs-right > .nav-tabs .active > a, |
4338 | -.tabs-right > .nav-tabs .active > a:hover { |
4339 | - border-color: #ddd #ddd #ddd transparent; |
4340 | - *border-left-color: @white; |
4341 | -} |
4342 | - |
4343 | - |
4344 | - |
4345 | -// DISABLED STATES |
4346 | -// --------------- |
4347 | - |
4348 | -// Gray out text |
4349 | -.nav > .disabled > a { |
4350 | - color: @grayLight; |
4351 | -} |
4352 | -// Nuke hover effects |
4353 | -.nav > .disabled > a:hover { |
4354 | - text-decoration: none; |
4355 | - background-color: transparent; |
4356 | - cursor: default; |
4357 | -} |
4358 | |
4359 | === removed file 'charmworld/static/css/bootstrap/pager.less' |
4360 | --- charmworld/static/css/bootstrap/pager.less 2013-01-21 13:40:18 +0000 |
4361 | +++ charmworld/static/css/bootstrap/pager.less 1970-01-01 00:00:00 +0000 |
4362 | @@ -1,41 +0,0 @@ |
4363 | -// |
4364 | -// Pager pagination |
4365 | -// -------------------------------------------------- |
4366 | - |
4367 | - |
4368 | -.pager { |
4369 | - margin: @baseLineHeight 0; |
4370 | - list-style: none; |
4371 | - text-align: center; |
4372 | - .clearfix(); |
4373 | -} |
4374 | -.pager li { |
4375 | - display: inline; |
4376 | -} |
4377 | -.pager li > a, |
4378 | -.pager li > span { |
4379 | - display: inline-block; |
4380 | - padding: 5px 14px; |
4381 | - background-color: #fff; |
4382 | - border: 1px solid #ddd; |
4383 | - .border-radius(15px); |
4384 | -} |
4385 | -.pager li > a:hover { |
4386 | - text-decoration: none; |
4387 | - background-color: #f5f5f5; |
4388 | -} |
4389 | -.pager .next > a, |
4390 | -.pager .next > span { |
4391 | - float: right; |
4392 | -} |
4393 | -.pager .previous > a, |
4394 | -.pager .previous > span { |
4395 | - float: left; |
4396 | -} |
4397 | -.pager .disabled > a, |
4398 | -.pager .disabled > a:hover, |
4399 | -.pager .disabled > span { |
4400 | - color: @grayLight; |
4401 | - background-color: #fff; |
4402 | - cursor: default; |
4403 | -} |
4404 | \ No newline at end of file |
4405 | |
4406 | === removed file 'charmworld/static/css/bootstrap/pagination.less' |
4407 | --- charmworld/static/css/bootstrap/pagination.less 2013-01-21 13:40:18 +0000 |
4408 | +++ charmworld/static/css/bootstrap/pagination.less 1970-01-01 00:00:00 +0000 |
4409 | @@ -1,121 +0,0 @@ |
4410 | -// |
4411 | -// Pagination (multiple pages) |
4412 | -// -------------------------------------------------- |
4413 | - |
4414 | -// Space out pagination from surrounding content |
4415 | -.pagination { |
4416 | - margin: @baseLineHeight 0; |
4417 | -} |
4418 | - |
4419 | -.pagination ul { |
4420 | - // Allow for text-based alignment |
4421 | - display: inline-block; |
4422 | - .ie7-inline-block(); |
4423 | - // Reset default ul styles |
4424 | - margin-left: 0; |
4425 | - margin-bottom: 0; |
4426 | - // Visuals |
4427 | - .border-radius(@baseBorderRadius); |
4428 | - .box-shadow(0 1px 2px rgba(0,0,0,.05)); |
4429 | -} |
4430 | -.pagination ul > li { |
4431 | - display: inline; // Remove list-style and block-level defaults |
4432 | -} |
4433 | -.pagination ul > li > a, |
4434 | -.pagination ul > li > span { |
4435 | - float: left; // Collapse white-space |
4436 | - padding: 4px 12px; |
4437 | - line-height: @baseLineHeight; |
4438 | - text-decoration: none; |
4439 | - background-color: @paginationBackground; |
4440 | - border: 1px solid @paginationBorder; |
4441 | - border-left-width: 0; |
4442 | -} |
4443 | -.pagination ul > li > a:hover, |
4444 | -.pagination ul > .active > a, |
4445 | -.pagination ul > .active > span { |
4446 | - background-color: @paginationActiveBackground; |
4447 | -} |
4448 | -.pagination ul > .active > a, |
4449 | -.pagination ul > .active > span { |
4450 | - color: @grayLight; |
4451 | - cursor: default; |
4452 | -} |
4453 | -.pagination ul > .disabled > span, |
4454 | -.pagination ul > .disabled > a, |
4455 | -.pagination ul > .disabled > a:hover { |
4456 | - color: @grayLight; |
4457 | - background-color: transparent; |
4458 | - cursor: default; |
4459 | -} |
4460 | -.pagination ul > li:first-child > a, |
4461 | -.pagination ul > li:first-child > span { |
4462 | - border-left-width: 1px; |
4463 | - .border-left-radius(@baseBorderRadius); |
4464 | -} |
4465 | -.pagination ul > li:last-child > a, |
4466 | -.pagination ul > li:last-child > span { |
4467 | - .border-right-radius(@baseBorderRadius); |
4468 | -} |
4469 | - |
4470 | - |
4471 | -// Alignment |
4472 | -// -------------------------------------------------- |
4473 | - |
4474 | -.pagination-centered { |
4475 | - text-align: center; |
4476 | -} |
4477 | -.pagination-right { |
4478 | - text-align: right; |
4479 | -} |
4480 | - |
4481 | - |
4482 | -// Sizing |
4483 | -// -------------------------------------------------- |
4484 | - |
4485 | -// Large |
4486 | -.pagination-large { |
4487 | - ul > li > a, |
4488 | - ul > li > span { |
4489 | - padding: @paddingLarge; |
4490 | - font-size: @fontSizeLarge; |
4491 | - } |
4492 | - ul > li:first-child > a, |
4493 | - ul > li:first-child > span { |
4494 | - .border-left-radius(@borderRadiusLarge); |
4495 | - } |
4496 | - ul > li:last-child > a, |
4497 | - ul > li:last-child > span { |
4498 | - .border-right-radius(@borderRadiusLarge); |
4499 | - } |
4500 | -} |
4501 | - |
4502 | -// Small and mini |
4503 | -.pagination-mini, |
4504 | -.pagination-small { |
4505 | - ul > li:first-child > a, |
4506 | - ul > li:first-child > span { |
4507 | - .border-left-radius(@borderRadiusSmall); |
4508 | - } |
4509 | - ul > li:last-child > a, |
4510 | - ul > li:last-child > span { |
4511 | - .border-right-radius(@borderRadiusSmall); |
4512 | - } |
4513 | -} |
4514 | - |
4515 | -// Small |
4516 | -.pagination-small { |
4517 | - ul > li > a, |
4518 | - ul > li > span { |
4519 | - padding: @paddingSmall; |
4520 | - font-size: @fontSizeSmall; |
4521 | - } |
4522 | -} |
4523 | -// Mini |
4524 | -.pagination-mini { |
4525 | - ul > li > a, |
4526 | - ul > li > span { |
4527 | - padding: @paddingMini; |
4528 | - font-size: @fontSizeMini; |
4529 | - } |
4530 | -} |
4531 | |
4532 | === removed file 'charmworld/static/css/bootstrap/popovers.less' |
4533 | --- charmworld/static/css/bootstrap/popovers.less 2013-01-21 13:40:18 +0000 |
4534 | +++ charmworld/static/css/bootstrap/popovers.less 1970-01-01 00:00:00 +0000 |
4535 | @@ -1,129 +0,0 @@ |
4536 | -// |
4537 | -// Popovers |
4538 | -// -------------------------------------------------- |
4539 | - |
4540 | - |
4541 | -.popover { |
4542 | - position: absolute; |
4543 | - top: 0; |
4544 | - left: 0; |
4545 | - z-index: @zindexPopover; |
4546 | - display: none; |
4547 | - width: 236px; |
4548 | - padding: 1px; |
4549 | - text-align: left; // Reset given new insertion method |
4550 | - background-color: @popoverBackground; |
4551 | - -webkit-background-clip: padding-box; |
4552 | - -moz-background-clip: padding; |
4553 | - background-clip: padding-box; |
4554 | - border: 1px solid #ccc; |
4555 | - border: 1px solid rgba(0,0,0,.2); |
4556 | - .border-radius(6px); |
4557 | - .box-shadow(0 5px 10px rgba(0,0,0,.2)); |
4558 | - |
4559 | - // Overrides for proper insertion |
4560 | - white-space: normal; |
4561 | - |
4562 | - // Offset the popover to account for the popover arrow |
4563 | - &.top { margin-top: -10px; } |
4564 | - &.right { margin-left: 10px; } |
4565 | - &.bottom { margin-top: 10px; } |
4566 | - &.left { margin-left: -10px; } |
4567 | -} |
4568 | - |
4569 | -.popover-title { |
4570 | - margin: 0; // reset heading margin |
4571 | - padding: 8px 14px; |
4572 | - font-size: 14px; |
4573 | - font-weight: normal; |
4574 | - line-height: 18px; |
4575 | - background-color: @popoverTitleBackground; |
4576 | - border-bottom: 1px solid darken(@popoverTitleBackground, 5%); |
4577 | - .border-radius(5px 5px 0 0); |
4578 | -} |
4579 | - |
4580 | -.popover-content { |
4581 | - padding: 9px 14px; |
4582 | -} |
4583 | - |
4584 | -// Arrows |
4585 | -// |
4586 | -// .arrow is outer, .arrow:after is inner |
4587 | - |
4588 | -.popover .arrow, |
4589 | -.popover .arrow:after { |
4590 | - position: absolute; |
4591 | - display: block; |
4592 | - width: 0; |
4593 | - height: 0; |
4594 | - border-color: transparent; |
4595 | - border-style: solid; |
4596 | -} |
4597 | -.popover .arrow { |
4598 | - border-width: @popoverArrowOuterWidth; |
4599 | -} |
4600 | -.popover .arrow:after { |
4601 | - border-width: @popoverArrowWidth; |
4602 | - content: ""; |
4603 | -} |
4604 | - |
4605 | -.popover { |
4606 | - &.top .arrow { |
4607 | - left: 50%; |
4608 | - margin-left: -@popoverArrowOuterWidth; |
4609 | - border-bottom-width: 0; |
4610 | - border-top-color: #999; // IE8 fallback |
4611 | - border-top-color: @popoverArrowOuterColor; |
4612 | - bottom: -@popoverArrowOuterWidth; |
4613 | - &:after { |
4614 | - bottom: 1px; |
4615 | - margin-left: -@popoverArrowWidth; |
4616 | - border-bottom-width: 0; |
4617 | - border-top-color: @popoverArrowColor; |
4618 | - } |
4619 | - } |
4620 | - &.right .arrow { |
4621 | - top: 50%; |
4622 | - left: -@popoverArrowOuterWidth; |
4623 | - margin-top: -@popoverArrowOuterWidth; |
4624 | - border-left-width: 0; |
4625 | - border-right-color: #999; // IE8 fallback |
4626 | - border-right-color: @popoverArrowOuterColor; |
4627 | - &:after { |
4628 | - left: 1px; |
4629 | - bottom: -@popoverArrowWidth; |
4630 | - border-left-width: 0; |
4631 | - border-right-color: @popoverArrowColor; |
4632 | - } |
4633 | - } |
4634 | - &.bottom .arrow { |
4635 | - left: 50%; |
4636 | - margin-left: -@popoverArrowOuterWidth; |
4637 | - border-top-width: 0; |
4638 | - border-bottom-color: #999; // IE8 fallback |
4639 | - border-bottom-color: @popoverArrowOuterColor; |
4640 | - top: -@popoverArrowOuterWidth; |
4641 | - &:after { |
4642 | - top: 1px; |
4643 | - margin-left: -@popoverArrowWidth; |
4644 | - border-top-width: 0; |
4645 | - border-bottom-color: @popoverArrowColor; |
4646 | - } |
4647 | - } |
4648 | - |
4649 | - &.left .arrow { |
4650 | - top: 50%; |
4651 | - right: -@popoverArrowOuterWidth; |
4652 | - margin-top: -@popoverArrowOuterWidth; |
4653 | - border-right-width: 0; |
4654 | - border-left-color: #999; // IE8 fallback |
4655 | - border-left-color: @popoverArrowOuterColor; |
4656 | - &:after { |
4657 | - right: 1px; |
4658 | - border-right-width: 0; |
4659 | - border-left-color: @popoverArrowColor; |
4660 | - bottom: -@popoverArrowWidth; |
4661 | - } |
4662 | - } |
4663 | - |
4664 | -} |
4665 | |
4666 | === removed file 'charmworld/static/css/bootstrap/progress-bars.less' |
4667 | --- charmworld/static/css/bootstrap/progress-bars.less 2013-01-21 13:40:18 +0000 |
4668 | +++ charmworld/static/css/bootstrap/progress-bars.less 1970-01-01 00:00:00 +0000 |
4669 | @@ -1,122 +0,0 @@ |
4670 | -// |
4671 | -// Progress bars |
4672 | -// -------------------------------------------------- |
4673 | - |
4674 | - |
4675 | -// ANIMATIONS |
4676 | -// ---------- |
4677 | - |
4678 | -// Webkit |
4679 | -@-webkit-keyframes progress-bar-stripes { |
4680 | - from { background-position: 40px 0; } |
4681 | - to { background-position: 0 0; } |
4682 | -} |
4683 | - |
4684 | -// Firefox |
4685 | -@-moz-keyframes progress-bar-stripes { |
4686 | - from { background-position: 40px 0; } |
4687 | - to { background-position: 0 0; } |
4688 | -} |
4689 | - |
4690 | -// IE9 |
4691 | -@-ms-keyframes progress-bar-stripes { |
4692 | - from { background-position: 40px 0; } |
4693 | - to { background-position: 0 0; } |
4694 | -} |
4695 | - |
4696 | -// Opera |
4697 | -@-o-keyframes progress-bar-stripes { |
4698 | - from { background-position: 0 0; } |
4699 | - to { background-position: 40px 0; } |
4700 | -} |
4701 | - |
4702 | -// Spec |
4703 | -@keyframes progress-bar-stripes { |
4704 | - from { background-position: 40px 0; } |
4705 | - to { background-position: 0 0; } |
4706 | -} |
4707 | - |
4708 | - |
4709 | - |
4710 | -// THE BARS |
4711 | -// -------- |
4712 | - |
4713 | -// Outer container |
4714 | -.progress { |
4715 | - overflow: hidden; |
4716 | - height: @baseLineHeight; |
4717 | - margin-bottom: @baseLineHeight; |
4718 | - #gradient > .vertical(#f5f5f5, #f9f9f9); |
4719 | - .box-shadow(inset 0 1px 2px rgba(0,0,0,.1)); |
4720 | - .border-radius(@baseBorderRadius); |
4721 | -} |
4722 | - |
4723 | -// Bar of progress |
4724 | -.progress .bar { |
4725 | - width: 0%; |
4726 | - height: 100%; |
4727 | - color: @white; |
4728 | - float: left; |
4729 | - font-size: 12px; |
4730 | - text-align: center; |
4731 | - text-shadow: 0 -1px 0 rgba(0,0,0,.25); |
4732 | - #gradient > .vertical(#149bdf, #0480be); |
4733 | - .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15)); |
4734 | - .box-sizing(border-box); |
4735 | - .transition(width .6s ease); |
4736 | -} |
4737 | -.progress .bar + .bar { |
4738 | - .box-shadow(~"inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)"); |
4739 | -} |
4740 | - |
4741 | -// Striped bars |
4742 | -.progress-striped .bar { |
4743 | - #gradient > .striped(#149bdf); |
4744 | - .background-size(40px 40px); |
4745 | -} |
4746 | - |
4747 | -// Call animation for the active one |
4748 | -.progress.active .bar { |
4749 | - -webkit-animation: progress-bar-stripes 2s linear infinite; |
4750 | - -moz-animation: progress-bar-stripes 2s linear infinite; |
4751 | - -ms-animation: progress-bar-stripes 2s linear infinite; |
4752 | - -o-animation: progress-bar-stripes 2s linear infinite; |
4753 | - animation: progress-bar-stripes 2s linear infinite; |
4754 | -} |
4755 | - |
4756 | - |
4757 | - |
4758 | -// COLORS |
4759 | -// ------ |
4760 | - |
4761 | -// Danger (red) |
4762 | -.progress-danger .bar, .progress .bar-danger { |
4763 | - #gradient > .vertical(#ee5f5b, #c43c35); |
4764 | -} |
4765 | -.progress-danger.progress-striped .bar, .progress-striped .bar-danger { |
4766 | - #gradient > .striped(#ee5f5b); |
4767 | -} |
4768 | - |
4769 | -// Success (green) |
4770 | -.progress-success .bar, .progress .bar-success { |
4771 | - #gradient > .vertical(#62c462, #57a957); |
4772 | -} |
4773 | -.progress-success.progress-striped .bar, .progress-striped .bar-success { |
4774 | - #gradient > .striped(#62c462); |
4775 | -} |
4776 | - |
4777 | -// Info (teal) |
4778 | -.progress-info .bar, .progress .bar-info { |
4779 | - #gradient > .vertical(#5bc0de, #339bb9); |
4780 | -} |
4781 | -.progress-info.progress-striped .bar, .progress-striped .bar-info { |
4782 | - #gradient > .striped(#5bc0de); |
4783 | -} |
4784 | - |
4785 | -// Warning (orange) |
4786 | -.progress-warning .bar, .progress .bar-warning { |
4787 | - #gradient > .vertical(lighten(@orange, 15%), @orange); |
4788 | -} |
4789 | -.progress-warning.progress-striped .bar, .progress-striped .bar-warning { |
4790 | - #gradient > .striped(lighten(@orange, 15%)); |
4791 | -} |
4792 | |
4793 | === removed file 'charmworld/static/css/bootstrap/reset.less' |
4794 | --- charmworld/static/css/bootstrap/reset.less 2013-01-21 13:40:18 +0000 |
4795 | +++ charmworld/static/css/bootstrap/reset.less 1970-01-01 00:00:00 +0000 |
4796 | @@ -1,216 +0,0 @@ |
4797 | -// |
4798 | -// Reset CSS |
4799 | -// Adapted from http://github.com/necolas/normalize.css |
4800 | -// -------------------------------------------------- |
4801 | - |
4802 | - |
4803 | -// Display in IE6-9 and FF3 |
4804 | -// ------------------------- |
4805 | - |
4806 | -article, |
4807 | -aside, |
4808 | -details, |
4809 | -figcaption, |
4810 | -figure, |
4811 | -footer, |
4812 | -header, |
4813 | -hgroup, |
4814 | -nav, |
4815 | -section { |
4816 | - display: block; |
4817 | -} |
4818 | - |
4819 | -// Display block in IE6-9 and FF3 |
4820 | -// ------------------------- |
4821 | - |
4822 | -audio, |
4823 | -canvas, |
4824 | -video { |
4825 | - display: inline-block; |
4826 | - *display: inline; |
4827 | - *zoom: 1; |
4828 | -} |
4829 | - |
4830 | -// Prevents modern browsers from displaying 'audio' without controls |
4831 | -// ------------------------- |
4832 | - |
4833 | -audio:not([controls]) { |
4834 | - display: none; |
4835 | -} |
4836 | - |
4837 | -// Base settings |
4838 | -// ------------------------- |
4839 | - |
4840 | -html { |
4841 | - font-size: 100%; |
4842 | - -webkit-text-size-adjust: 100%; |
4843 | - -ms-text-size-adjust: 100%; |
4844 | -} |
4845 | -// Focus states |
4846 | -a:focus { |
4847 | - .tab-focus(); |
4848 | -} |
4849 | -// Hover & Active |
4850 | -a:hover, |
4851 | -a:active { |
4852 | - outline: 0; |
4853 | -} |
4854 | - |
4855 | -// Prevents sub and sup affecting line-height in all browsers |
4856 | -// ------------------------- |
4857 | - |
4858 | -sub, |
4859 | -sup { |
4860 | - position: relative; |
4861 | - font-size: 75%; |
4862 | - line-height: 0; |
4863 | - vertical-align: baseline; |
4864 | -} |
4865 | -sup { |
4866 | - top: -0.5em; |
4867 | -} |
4868 | -sub { |
4869 | - bottom: -0.25em; |
4870 | -} |
4871 | - |
4872 | -// Img border in a's and image quality |
4873 | -// ------------------------- |
4874 | - |
4875 | -img { |
4876 | - /* Responsive images (ensure images don't scale beyond their parents) */ |
4877 | - max-width: 100%; /* Part 1: Set a maxium relative to the parent */ |
4878 | - width: auto\9; /* IE7-8 need help adjusting responsive images */ |
4879 | - height: auto; /* Part 2: Scale the height according to the width, otherwise you get stretching */ |
4880 | - |
4881 | - vertical-align: middle; |
4882 | - border: 0; |
4883 | - -ms-interpolation-mode: bicubic; |
4884 | -} |
4885 | - |
4886 | -// Prevent max-width from affecting Google Maps |
4887 | -#map_canvas img, |
4888 | -.google-maps img { |
4889 | - max-width: none; |
4890 | -} |
4891 | - |
4892 | -// Forms |
4893 | -// ------------------------- |
4894 | - |
4895 | -// Font size in all browsers, margin changes, misc consistency |
4896 | -button, |
4897 | -input, |
4898 | -select, |
4899 | -textarea { |
4900 | - margin: 0; |
4901 | - font-size: 100%; |
4902 | - vertical-align: middle; |
4903 | -} |
4904 | -button, |
4905 | -input { |
4906 | - *overflow: visible; // Inner spacing ie IE6/7 |
4907 | - line-height: normal; // FF3/4 have !important on line-height in UA stylesheet |
4908 | -} |
4909 | -button::-moz-focus-inner, |
4910 | -input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 |
4911 | - padding: 0; |
4912 | - border: 0; |
4913 | -} |
4914 | -button, |
4915 | -html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. |
4916 | -input[type="reset"], |
4917 | -input[type="submit"] { |
4918 | - -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS. |
4919 | - cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. |
4920 | -} |
4921 | -label, |
4922 | -select, |
4923 | -button, |
4924 | -input[type="button"], |
4925 | -input[type="reset"], |
4926 | -input[type="submit"], |
4927 | -input[type="radio"], |
4928 | -input[type="checkbox"] { |
4929 | - cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. |
4930 | -} |
4931 | -input[type="search"] { // Appearance in Safari/Chrome |
4932 | - .box-sizing(content-box); |
4933 | - -webkit-appearance: textfield; |
4934 | -} |
4935 | -input[type="search"]::-webkit-search-decoration, |
4936 | -input[type="search"]::-webkit-search-cancel-button { |
4937 | - -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5 |
4938 | -} |
4939 | -textarea { |
4940 | - overflow: auto; // Remove vertical scrollbar in IE6-9 |
4941 | - vertical-align: top; // Readability and alignment cross-browser |
4942 | -} |
4943 | - |
4944 | - |
4945 | -// Printing |
4946 | -// ------------------------- |
4947 | -// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css |
4948 | - |
4949 | -@media print { |
4950 | - |
4951 | - * { |
4952 | - text-shadow: none !important; |
4953 | - color: #000 !important; // Black prints faster: h5bp.com/s |
4954 | - background: transparent !important; |
4955 | - box-shadow: none !important; |
4956 | - } |
4957 | - |
4958 | - a, |
4959 | - a:visited { |
4960 | - text-decoration: underline; |
4961 | - } |
4962 | - |
4963 | - a[href]:after { |
4964 | - content: " (" attr(href) ")"; |
4965 | - } |
4966 | - |
4967 | - abbr[title]:after { |
4968 | - content: " (" attr(title) ")"; |
4969 | - } |
4970 | - |
4971 | - // Don't show links for images, or javascript/internal links |
4972 | - .ir a:after, |
4973 | - a[href^="javascript:"]:after, |
4974 | - a[href^="#"]:after { |
4975 | - content: ""; |
4976 | - } |
4977 | - |
4978 | - pre, |
4979 | - blockquote { |
4980 | - border: 1px solid #999; |
4981 | - page-break-inside: avoid; |
4982 | - } |
4983 | - |
4984 | - thead { |
4985 | - display: table-header-group; // h5bp.com/t |
4986 | - } |
4987 | - |
4988 | - tr, |
4989 | - img { |
4990 | - page-break-inside: avoid; |
4991 | - } |
4992 | - |
4993 | - img { |
4994 | - max-width: 100% !important; |
4995 | - } |
4996 | - |
4997 | - @page { |
4998 | - margin: 0.5cm; |
4999 | - } |
5000 | - |
This branch looks great. The new styling is nice and the code is an improvement over what we had before. I didn't find any show-stoppers, but had a few thoughts as I read through the code and QAed the new look:
This comment (from charmworld/ static/ css/base. css) could use a little elaboration:
/* Fixes display issue */
Note that the "block" in "<metal:block>" is just a custom. You can use a more descriptive element name, like "<metal:header>" if it makes the markup clearer.
The README is wrapping lines less than 80 characters. See /charms/ precise/ appflower for an example.
I'm confused as to why the "Tools" drop-down was removed. Having to click through a page seems like a step backwards.
[Insert complaint about having a little ">" after every... single... link, then disregard complaint because it's how ubuntu.com does it and we're trying to fit the mold.]
Re. ">" thingies, couldn't we do that with CSS and not have to inject them into the templates?