Skip to content

Commit bcfa6f4

Browse files
committed
Merged in the bootstrap facelift from personal/henrik/facelift-r9116@9452.
- Legacy-Id: 9466
2 parents 39ed53e + 8b634f7 commit bcfa6f4

972 files changed

Lines changed: 56364 additions & 20514 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
This is the "facelift" datatracker branch that uses Twitter Bootstrap for
2+
the UI.
3+
4+
You need to install a few new django extensions:
5+
https://pypi.python.org/pypi/django-widget-tweaks
6+
https://pypi.python.org/pypi/django-bootstrap3
7+
https://pypi.python.org/pypi/django-typogrify
8+
9+
The meta goal of this effort is: *** NO CHANGES TO THE PYTHON CODE ***
10+
11+
Whenever changes to the python code are made, they can only fix HTML bugs,
12+
or add comments (tagged with "FACELIFT") about functionality that can be
13+
removed once the facelift templates become default. Or they need to add
14+
functionality that is only called from the new facelift templates.
15+
16+
Javascript that is only used on one template goes into that template.
17+
Javascript that is used by more than one template goes into ietf.js.
18+
19+
CSS that is only used on one template goes into that template.
20+
CSS that is used by more than one template goes into ietf.css. No CSS in the
21+
templates or - god forbid - style tags! (And no CSS or HTML styling in
22+
python code!!)
23+
24+
Templates that use jquery or bootstrap plugins include the css in the pagehead
25+
block, and the js in the js block.

TODO

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Major pieces not facelifted: milestone editing, liaison editing, WG workflow customization
2+
3+
Use affix for navigation on active_wgs.html
4+
5+
Figure out why {% if debug %} does not work in the text templates under ietf/templates_facelift/community/public.
6+
7+
Make django generate HTML5 date inputs or use a js-based datepicker.
8+
9+
Deferring ballots does not work. (Seems to be an upstream bug.)
10+
11+
Make tables that are too wide to usefully work on small screens responsive. See http://getbootstrap.com/css/#tables-responsive

bootstrap/.editorconfig

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# editorconfig.org
2+
3+
root = true
4+
5+
[*]
6+
charset = utf-8
7+
end_of_line = lf
8+
indent_size = 2
9+
indent_style = space
10+
insert_final_newline = true
11+
trim_trailing_whitespace = true
12+
13+
[*.py]
14+
indent_size = 4

bootstrap/.gitattributes

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Enforce Unix newlines
2+
*.css text eol=lf
3+
*.html text eol=lf
4+
*.js text eol=lf
5+
*.json text eol=lf
6+
*.less text eol=lf
7+
*.md text eol=lf
8+
*.svg text eol=lf
9+
*.yml text eol=lf
10+
# Don't diff or textually merge source maps
11+
*.map binary
12+
13+
bootstrap-theme.css linguist-vendored=false
14+
bootstrap.css linguist-vendored=false
15+
bootstrap.js linguist-vendored=false

bootstrap/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/README-DATATRACKER.pdf
2+
/dist
3+
/node_modules

bootstrap/.travis.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
language: node_js
2+
git:
3+
depth: 10
4+
node_js:
5+
- "0.12"
6+
before_install:
7+
- travis_retry sudo pip install -r test-infra/requirements.txt
8+
- rvm use 1.9.3 --fuzzy
9+
- export GEMDIR=$(rvm gemdir)
10+
- if [ "$TWBS_TEST" = validate-html ]; then echo "ruby=$(basename $GEMDIR) jekyll=$JEKYLL_VERSION rouge=$ROUGE_VERSION" > pseudo_Gemfile.lock; fi
11+
- "export TRAVIS_COMMIT_MSG=\"$(git log --format=%B --no-merges -n 1)\""
12+
- echo "$TRAVIS_COMMIT_MSG" | grep '\[skip validator\]'; export TWBS_DO_VALIDATOR=$?; true
13+
- echo "$TRAVIS_COMMIT_MSG" | grep '\[skip sauce\]'; export TWBS_DO_SAUCE=$?; true
14+
- if [ "$TRAVIS_REPO_SLUG" = twbs-savage/bootstrap ]; then export TWBS_DO_VALIDATOR=0; fi
15+
install:
16+
- npm install -g grunt-cli
17+
- ./test-infra/s3_cache.py download npm-modules
18+
- if [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py download rubygems; fi
19+
after_script:
20+
- if [ "$TRAVIS_REPO_SLUG" != twbs-savage/bootstrap ] && [ "$TWBS_TEST" = core ]; then ./test-infra/s3_cache.py upload npm-modules; fi
21+
- if [ "$TRAVIS_REPO_SLUG" != twbs-savage/bootstrap ] && [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py upload rubygems; fi
22+
env:
23+
global:
24+
- JEKYLL_VERSION="2.5.3"
25+
- ROUGE_VERSION="1.8.0"
26+
- SAUCE_USERNAME="bootstrap"
27+
- secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ="
28+
- secure: "gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY="
29+
- secure: "Gghh/e3Gsbj1+4RR9Lh2aR/xJl35HWiHqlPIeSUqE9D7uDCVTAwNce/dGL3Ew7uJPfJ6Pgr70wD3zgu3stw0Zmzayax0hiDtGwcQCxVIER08wqGANK9C2Q7PYJkNTNtiTo6ehKWbdV4Z+/U+TEYyQfpQTDbAFYk/vVpsdjp0Lmc="
30+
- secure: "RTbRdx4G/2OTLfrZtP1VbRljxEmd6A1F3GqXboeQTldsnAlwpsES65es5CE3ub/rmixLApOY9ot7OPmNixFgC2Y8xOsV7lNCC62QVpmqQEDyGFFQKb3yO6/dmwQxdsCqGfzf9Np6Wh5V22QFvr50ZLKLd7Uhd9oXMDIk/z1MJ3o="
31+
- secure: "RKWpS+P20b4tG9tawzCMJSmQftoonmC7tJzyGYiHuEM1TcpHALLBcnzKlr/+DiPTfzDJWY4kS8pxfhK4uXOe8OHnhpMNub7LEWtFPePlZIervOJcsOydaQocTKqVVWD6OUubMeQmQ+tZmvmpjoJ1uPPEbFs9ciF7+dv3U5tLUZ0="
32+
- secure: "XswSKBY0HJ/aO9VOBeWlvGpqSFF/DsJmNKz7o5RkJMJX340qe44J929uUNwwOwlv9YrgptzC2W6l8bpmZQV+p6IYs99SoSA8CCaUfIJaqeU9x/UiT5vIHgqaNax+vFJwvzHLpF5v/ggFqFEKCd54gCDasePLTztHeC4oL104iaQ="
33+
- secure: "Dv1HX5dzyTh8gA2YsLI+yWEgh9lnGKPpRDDEYYvm42fjBFziUYfcpvA9g8GXQuU9srY3mhfsZkCDHN0x5n1gliOai5TSjmd5Hh+9UyhvNWE+D8HoUpcFXWoQXvy/if2r25m+ZWi3cqgXkkBOcal3W1ePMtU4ln18NcWyIZ0tEFo="
34+
- secure: "PabpUdG2dE40hHUkMCdxk1e9Ak3BOo0h7Y5/uekosLKOz5N60Xmn/ooyrSkvicLthXO4cfONFhO3/xSVRKQOxlUw4on5i0VuNK+QSqxJk0IDaRSZnTCcC8J7083K0YL+FvMdGQwcYwMY9LiwS8aS014IRkSQjsa+mjo3owP+dOU="
35+
- secure: "G4/f4PVyVi9o6UbZMqw9YFmDu7cHqe9iymiXYd1RcnPXwhWAePX12m0PWMhUj5itJ180PTEddVip8PNOgBdqyrDxEPKkcgAW2EElVAPIKJXVfvDW64UjQ0H7NS7XvF7iLQUJp/XfmR7NJ7tT393AQdh8SGmuQpJhgYbwIWbES/k="
36+
matrix:
37+
- TWBS_TEST=core
38+
- TWBS_TEST=validate-html
39+
- TWBS_TEST=sauce-js-unit
40+
matrix:
41+
fast_finish: true
42+
notifications:
43+
slack: heybb:iz4wwosL0N0EdaX1gvgkU0NH
44+
webhooks:
45+
- http://savage.twbsapps.com/savage/travis

bootstrap/CNAME

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
getbootstrap.com

bootstrap/CONTRIBUTING.md

Lines changed: 249 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,249 @@
1+
# Contributing to Bootstrap
2+
3+
Looking to contribute something to Bootstrap? **Here's how you can help.**
4+
5+
Please take a moment to review this document in order to make the contribution
6+
process easy and effective for everyone involved.
7+
8+
Following these guidelines helps to communicate that you respect the time of
9+
the developers managing and developing this open source project. In return,
10+
they should reciprocate that respect in addressing your issue or assessing
11+
patches and features.
12+
13+
14+
## Using the issue tracker
15+
16+
The [issue tracker](https://github.com/twbs/bootstrap/issues) is
17+
the preferred channel for [bug reports](#bug-reports), [features requests](#feature-requests)
18+
and [submitting pull requests](#pull-requests), but please respect the following
19+
restrictions:
20+
21+
* Please **do not** use the issue tracker for personal support requests. Stack
22+
Overflow ([`twitter-bootstrap-3`](http://stackoverflow.com/questions/tagged/twitter-bootstrap-3) tag) or [IRC](README.md#community) are better places to get help.
23+
24+
* Please **do not** derail or troll issues. Keep the discussion on topic and
25+
respect the opinions of others.
26+
27+
* Please **do not** open issues or pull requests regarding the code in
28+
[`Normalize`](https://github.com/necolas/normalize.css) (open them in
29+
their respective repositories).
30+
31+
32+
## Issues and labels
33+
34+
Our bug tracker utilizes several labels to help organize and identify issues. Here's what they represent and how we use them:
35+
36+
- `browser bug` - Issues that are reported to us, but actually are the result of a browser-specific bug. These are diagnosed with reduced test cases and result in an issue opened on that browser's own bug tracker.
37+
- `confirmed` - Issues that have been confirmed with a reduced test case and identify a bug in Bootstrap.
38+
- `css` - Issues stemming from our compiled CSS or source Less files.
39+
- `customizer` - Issues with our web-based Customizer.
40+
- `docs` - Issues for improving or updating our documentation.
41+
- `examples` - Issues involving the example templates included in our docs.
42+
- `feature` - Issues asking for a new feature to be added, or an existing one to be extended or modified. New features require a minor version bump (e.g., `v3.0.0` to `v3.1.0`).
43+
- `grunt` - Issues with our included JavaScript-based Gruntfile, which is used to run all our tests, concatenate and compile source files, and more.
44+
- `help wanted` - Issues we need or would love help from the community to resolve.
45+
- `js` - Issues stemming from our compiled or source JavaScript files.
46+
- `meta` - Issues with the project itself or our GitHub repository.
47+
48+
For a complete look at our labels, see the [project labels page](https://github.com/twbs/bootstrap/labels).
49+
50+
51+
## Bug reports
52+
53+
A bug is a _demonstrable problem_ that is caused by the code in the repository.
54+
Good bug reports are extremely helpful, so thanks!
55+
56+
Guidelines for bug reports:
57+
58+
0. **Validate and lint your code** — [validate your HTML](http://html5.validator.nu)
59+
and [lint your HTML](https://github.com/twbs/bootlint) to ensure your
60+
problem isn't caused by a simple error in your own code.
61+
62+
1. **Use the GitHub issue search** — check if the issue has already been
63+
reported.
64+
65+
2. **Check if the issue has been fixed** — try to reproduce it using the
66+
latest `master` or development branch in the repository.
67+
68+
3. **Isolate the problem** — ideally create a [reduced test
69+
case](http://css-tricks.com/6263-reduced-test-cases/) and a live example.
70+
[This JS Bin](http://jsbin.com/lefey/1/edit?html,output) is a helpful template.
71+
72+
73+
A good bug report shouldn't leave others needing to chase you up for more
74+
information. Please try to be as detailed as possible in your report. What is
75+
your environment? What steps will reproduce the issue? What browser(s) and OS
76+
experience the problem? Do other browsers show the bug differently? What
77+
would you expect to be the outcome? All these details will help people to fix
78+
any potential bugs.
79+
80+
Example:
81+
82+
> Short and descriptive example bug report title
83+
>
84+
> A summary of the issue and the browser/OS environment in which it occurs. If
85+
> suitable, include the steps required to reproduce the bug.
86+
>
87+
> 1. This is the first step
88+
> 2. This is the second step
89+
> 3. Further steps, etc.
90+
>
91+
> `<url>` - a link to the reduced test case
92+
>
93+
> Any other information you want to share that is relevant to the issue being
94+
> reported. This might include the lines of code that you have identified as
95+
> causing the bug, and potential solutions (and your opinions on their
96+
> merits).
97+
98+
### Reporting upstream browser bugs
99+
100+
Sometimes bugs reported to us are actually caused by bugs in the browser(s) themselves, not bugs in Bootstrap per se.
101+
When feasible, we aim to report such upstream bugs to the relevant browser vendor(s), and then list them on our [Wall of Browser Bugs](http://getbootstrap.com/browser-bugs/) and [document them in MDN](https://developer.mozilla.org/en-US/docs/Web).
102+
103+
| Vendor(s) | Browser(s) | Rendering engine | Bug reporting website(s) | Notes |
104+
| ------------- | ---------------------------- | ---------------- | ------------------------------------------------------------------------------------- | -------------------------------------------------------- |
105+
| Mozilla | Firefox | Gecko | https://bugzilla.mozilla.org/enter_bug.cgi | "Core" is normally the right product option to choose. |
106+
| Apple | Safari | WebKit | https://bugs.webkit.org/enter_bug.cgi?product=WebKit <br> https://bugreport.apple.com | In Apple's bug reporter, choose "Safari" as the product. |
107+
| Google, Opera | Chrome, Chromium, Opera v15+ | Blink | https://code.google.com/p/chromium/issues/list | Click the "New issue" button. |
108+
| Microsoft | Internet Explorer | Trident | https://connect.microsoft.com/IE/feedback/LoadSubmitFeedbackForm | |
109+
110+
### Issues bots
111+
112+
[@twbs-lmvtfy](https://github.com/twbs-lmvtfy) is a Bootstrap bot that hangs out in our GitHub issue tracker and automatically checks for HTML validation errors in live examples (e.g. jsFiddles, JS Bins, Bootplys, Plunks, CodePens, etc.) posted in issue comments. If it finds any errors, it will post a follow-up comment on the issue and point out the errors. If this happens with an example you've posted, please fix the errors and post an updated live example. If you opened a bug report, please check whether the bug still occurs with your revised, valid live example. If the bug no longer occurs, it was probably due to your invalid HTML rather than something in Bootstrap and we'd appreciate it if you could close out the GitHub issue.
113+
114+
115+
## Feature requests
116+
117+
Feature requests are welcome. But take a moment to find out whether your idea
118+
fits with the scope and aims of the project. It's up to *you* to make a strong
119+
case to convince the project's developers of the merits of this feature. Please
120+
provide as much detail and context as possible.
121+
122+
123+
## Pull requests
124+
125+
Good pull requests—patches, improvements, new features—are a fantastic
126+
help. They should remain focused in scope and avoid containing unrelated
127+
commits.
128+
129+
**Please ask first** before embarking on any significant pull request (e.g.
130+
implementing features, refactoring code, porting to a different language),
131+
otherwise you risk spending a lot of time working on something that the
132+
project's developers might not want to merge into the project.
133+
134+
Please adhere to the [coding guidelines](#code-guidelines) used throughout the
135+
project (indentation, accurate comments, etc.) and any other requirements
136+
(such as test coverage).
137+
138+
**Do not edit `bootstrap.css`, `bootstrap-theme.css`, or `bootstrap.js`
139+
directly!** Those files are automatically generated. You should edit the
140+
source files in [`/bootstrap/less/`](https://github.com/twbs/bootstrap/tree/master/less)
141+
and/or [`/bootstrap/js/`](https://github.com/twbs/bootstrap/tree/master/js) instead.
142+
143+
Similarly, when contributing to Bootstrap's documentation, you should edit the
144+
documentation source files in
145+
[the `/bootstrap/docs/` directory of the `master` branch](https://github.com/twbs/bootstrap/tree/master/docs).
146+
**Do not edit the `gh-pages` branch.** That branch is generated from the
147+
documentation source files and is managed separately by the Bootstrap Core Team.
148+
149+
Adhering to the following process is the best way to get your work
150+
included in the project:
151+
152+
1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork,
153+
and configure the remotes:
154+
155+
```bash
156+
# Clone your fork of the repo into the current directory
157+
git clone https://github.com/<your-username>/bootstrap.git
158+
# Navigate to the newly cloned directory
159+
cd bootstrap
160+
# Assign the original repo to a remote called "upstream"
161+
git remote add upstream https://github.com/twbs/bootstrap.git
162+
```
163+
164+
2. If you cloned a while ago, get the latest changes from upstream:
165+
166+
```bash
167+
git checkout master
168+
git pull upstream master
169+
```
170+
171+
3. Create a new topic branch (off the main project development branch) to
172+
contain your feature, change, or fix:
173+
174+
```bash
175+
git checkout -b <topic-branch-name>
176+
```
177+
178+
4. Commit your changes in logical chunks. Please adhere to these [git commit
179+
message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
180+
or your code is unlikely be merged into the main project. Use Git's
181+
[interactive rebase](https://help.github.com/articles/interactive-rebase)
182+
feature to tidy up your commits before making them public.
183+
184+
5. Locally merge (or rebase) the upstream development branch into your topic branch:
185+
186+
```bash
187+
git pull [--rebase] upstream master
188+
```
189+
190+
6. Push your topic branch up to your fork:
191+
192+
```bash
193+
git push origin <topic-branch-name>
194+
```
195+
196+
7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
197+
with a clear title and description against the `master` branch.
198+
199+
**IMPORTANT**: By submitting a patch, you agree to allow the project owners to
200+
license your work under the terms of the [MIT License](LICENSE) (if it
201+
includes code changes) and under the terms of the
202+
[Creative Commons Attribution 3.0 Unported License](docs/LICENSE)
203+
(if it includes documentation changes).
204+
205+
### Pull request bots
206+
207+
[@twbs-rorschach](https://github.com/twbs-rorschach) is a Bootstrap bot that hangs out in our GitHub issue tracker and automatically checks all pull requests for a few simple common mistakes. It's possible that Rorschach might leave a comment on your pull request and then close it. If that happens, simply fix the problem(s) mentioned in the comment (there should be link(s) in the comment explaining the problem(s) in detail) and then either:
208+
209+
* Push the revised version to your pull request's branch and post a comment on the pull request saying that you've fixed the problem(s). One of the Bootstrap Core Team members will then come along and reopen your pull request.
210+
* Or you can just open a new pull request for your revised version.
211+
212+
[@twbs-savage](https://github.com/twbs-savage) is a Bootstrap bot that automatically runs cross-browser tests (via [Sauce](https://saucelabs.com) and Travis CI) on JavaScript pull requests. Savage will leave a comment on pull requests stating whether cross-browser JS tests passed or failed, with a link to the full Travis build details. If your pull request fails, check the Travis log to see which browser + OS combinations failed. Each browser test in the Travis log includes a link to a Sauce page with details about the test. On those details pages, you can watch a screencast of the test run to see exactly which unit tests failed.
213+
214+
215+
## Code guidelines
216+
217+
### HTML
218+
219+
[Adhere to the Code Guide.](http://codeguide.co/#html)
220+
221+
- Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags).
222+
- Use CDNs and HTTPS for third-party JS when possible. We don't use protocol-relative URLs in this case because they break when viewing the page locally via `file://`.
223+
- Use [WAI-ARIA](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA) attributes in documentation examples to promote accessibility.
224+
225+
### CSS
226+
227+
[Adhere to the Code Guide.](http://codeguide.co/#css)
228+
229+
- When feasible, default color palettes should comply with [WCAG color contrast guidelines](http://www.w3.org/TR/WCAG20/#visual-audio-contrast).
230+
- Except in rare cases, don't remove default `:focus` styles (via e.g. `outline: none;`) without providing alternative styles. See [this A11Y Project post](http://a11yproject.com/posts/never-remove-css-outlines/) for more details.
231+
232+
### JS
233+
234+
- No semicolons (in client-side JS)
235+
- 2 spaces (no tabs)
236+
- strict mode
237+
- "Attractive"
238+
239+
### Checking coding style
240+
241+
Run `grunt test` before committing to ensure your changes follow our coding standards.
242+
243+
244+
## License
245+
246+
By contributing your code, you agree to license your contribution under the [MIT License](LICENSE).
247+
By contributing to the documentation, you agree to license your contribution under the [Creative Commons Attribution 3.0 Unported License](docs/LICENSE).
248+
249+
Prior to v3.1.0, Bootstrap's code was released under the Apache License v2.0.

0 commit comments

Comments
 (0)