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