diff --git a/bootstrap/README-DATATRACKER.rst b/bootstrap/README-DATATRACKER.rst index c85a22d1c..4a86b173a 100644 --- a/bootstrap/README-DATATRACKER.rst +++ b/bootstrap/README-DATATRACKER.rst @@ -10,19 +10,32 @@ a cumbersome way to customize bootsrap, but as of the time of writing this within the distributed build environment without either editing files in place, or copying and modifying parts of the build environment. +Bootstrap 3.3.4 was added in [9374], see the changes with:: + + $ svn diff -r 9374:9894 bootstrap/less/ + +Bootstrap 3.3.5 was added in [9894] and [9895], see the changes since then with:: + + $ svn diff -r 9895 bootstrap/less/ + Modifications done:: less/variables.less # modified with our datatracker-specific changes + less/buttons.less # added .btn-pass + less/labels.less # added .label-pass + less/panels.less # added .panel-pass + less/mixins/forms.less # modified inline label background-color Setup ===== -In order to set up things to build new static/css/bootstrap* files, do the -following (copied from http://getbootstrap.com/getting-started/#grunt) - Bootstrap uses Grunt for its build system, with convenient methods for working with the framework. It's how we compile our code, run tests, and more. +In order to set up things to build new ``static/lib/bootstrap/**`` files, do the +following (copied from http://getbootstrap.com/getting-started/#grunt): + + Installing Grunt ---------------- @@ -54,8 +67,10 @@ Available Grunt commands grunt dist # (Just compile CSS and JavaScript) -Regenerates the /dist/ directory with compiled and minified CSS and JavaScript -files. As a Bootstrap user, this is normally the command you want. +Regenerates the ``dist/`` directory with compiled and minified CSS and JavaScript +files. As a Bootstrap user, this is normally the command you want. Changes to +the ``dist/`` directory will be picked up by ``manage.py collectstatic`` as part +of ``bin/mkrelease``. :: @@ -66,7 +81,7 @@ whenever you save a change. :: - grunt test (Run tests) + grunt test # (Run tests) Runs JSHint and runs the QUnit tests headlessly in PhantomJS.