Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Indicator updates #5603

Closed
wants to merge 77 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
562a0e0
removed the docs folder for the twitter bootstrap site
biyeun Feb 10, 2012
df5a694
modified the makefile and the readme to work specifically with core-hq
biyeun Feb 10, 2012
b50a71c
reports sidebar nav looks good
biyeun Feb 15, 2012
bac2d70
data tables styled
biyeun Feb 16, 2012
d3fa747
filters styled
biyeun Feb 17, 2012
205c2d1
updated some styles for report forms
biyeun Feb 17, 2012
345335a
upgraded all relevant files to Twitter Bootstrap 2.0.1
biyeun Feb 17, 2012
1378b50
included twitter's bug fix for the 2.0.1 issue with buttons
biyeun Feb 22, 2012
cd0b524
less is done for reports, for the most part
biyeun Feb 23, 2012
26a811d
making some changes to the makefile to pickup old files. updating the…
biyeun Feb 23, 2012
3e64c1f
checking the formatting of readme
biyeun Feb 23, 2012
2e1a585
removed the CommCare HQ readme test text
biyeun Feb 23, 2012
7e4fa6c
modified readmy for better instructions to install uglify-js
biyeun Feb 23, 2012
ef1b045
made changes to the less file to take account with conflicts with rub…
biyeun Feb 23, 2012
d250994
some minor changes
biyeun Feb 28, 2012
1701b7a
updated the readme to clear up issues with the two different versions…
biyeun Feb 28, 2012
07c750b
some last minute style changes to the celery download view
biyeun Feb 28, 2012
77700af
stupid typo
biyeun Feb 28, 2012
9257c78
added formdesigner styles to hq-bootstrap as an interim before a comp…
biyeun Feb 28, 2012
adc6dcf
oops
biyeun Feb 28, 2012
8ddee16
add windows installation notes
czue Feb 28, 2012
2553ed8
Update README.md
dannyroberts Feb 29, 2012
2ca1c34
Update README.md
dannyroberts Feb 29, 2012
e1d73bc
removed the makefile. use the management command make_bootstrap instead
biyeun Feb 29, 2012
6c5010a
added instructions for building bootstrap for reals
biyeun Feb 29, 2012
95e76ec
i can't type, apparently
biyeun Feb 29, 2012
b6aeb1d
added a better way of installing uglify-js in the README
biyeun Feb 29, 2012
155eec6
some changes for styling the new user sign up
biyeun Mar 8, 2012
ca9940d
add table styles for active rows
czue Mar 12, 2012
e1e9fae
core.less warning style interfering with warning style in forms
biyeun Mar 14, 2012
39de0b6
Merge branch 'master' of github.com:dimagi/hq-bootstrap
biyeun Mar 14, 2012
a400b00
updates to how the search box is displayed on pages without advanced …
biyeun Mar 19, 2012
1bae771
added generic styling for datatable like tables called table-hq
biyeun Mar 19, 2012
664e5db
changes to the little breadcrub separators in page title
biyeun Mar 19, 2012
0a35fe2
moved over to twitter bootstrap 2.0.2
biyeun Mar 26, 2012
745a185
just adding some padding where there should be some
biyeun Mar 27, 2012
0e0ff63
more slight layout modifications...mostly related to whitespace
biyeun Mar 29, 2012
2e128ee
modified the way forms look inside of tables
biyeun Mar 30, 2012
4a0c4c5
some more spacing issues
biyeun Apr 2, 2012
5a7945a
made tab-content not the default universal wrapper...that was a bit a…
biyeun Apr 2, 2012
6b0e183
yeah, tables don't like padding
biyeun Apr 2, 2012
feb9d45
make vellum a little squatter
czue Apr 6, 2012
9055c9a
fix vellum expression builder alignment
czue Apr 6, 2012
58ee728
vertically centered table cell style
biyeun Apr 10, 2012
d5854cc
made some modifications to our custom accordion based on changes intr…
biyeun Apr 16, 2012
8ce6e81
fixed some display issues in firefox
biyeun Apr 19, 2012
cf5643a
modified typeahead to allow a custom function for changing the output…
biyeun May 16, 2012
2009eba
little visual annoyance in the filter accordion that i just had to fix
biyeun May 17, 2012
29ffc58
add sup styling to breadcrumbs
czue May 28, 2012
b9597ea
slightly smaller tabs to temporarily handle more tab bars (a better f…
biyeun May 31, 2012
aac75d9
loading modal
biyeun Jun 5, 2012
73cbdd6
more loading styles
biyeun Jun 6, 2012
058701a
modified behaviour of submit button to have an additional, non-loadin…
biyeun Jun 6, 2012
e15afc4
added a combobox
biyeun Jun 7, 2012
0bdbf56
some design tweaks
biyeun Jun 7, 2012
c9e6b8b
changes to the filters accordion
biyeun Jun 15, 2012
53abe4a
removed datatables from here and put it into hqwebapp
biyeun Jun 21, 2012
8279e78
Merge branch 'master' of github.com:dimagi/hq-bootstrap into datatabl…
biyeun Jun 21, 2012
ce2188a
adding a margin to wells for flushed content
biyeun Jul 28, 2012
503cabd
nicer styling for wells in flushed content reports
biyeun Aug 1, 2012
8e6e241
some updates to fieldset and added an alert style for snapshots, inst…
biyeun Aug 13, 2012
807b05e
some small css changes for adm
biyeun Sep 13, 2012
6981e01
add missing paren
dannyroberts Sep 14, 2012
2687907
added some stylin for mvp
biyeun Sep 22, 2012
fccd076
upgrade javascript
biyeun Sep 22, 2012
98fea76
upgrade css
biyeun Sep 22, 2012
fd7654e
bootstrap updated, some new styles for MVP
biyeun Sep 22, 2012
6e54f5a
changes to mvp table styling
biyeun Oct 2, 2012
8778c4f
pagination bug fix
biyeun Oct 5, 2012
5cb3a69
pagination no longer white on white
biyeun Oct 8, 2012
00dbad8
nice little select bug thanks to the upgrade.
biyeun Oct 9, 2012
d92f4c3
change vellum styling (goes with recent vellum change)
dannyroberts Oct 10, 2012
e9de2c1
Merge pull request #1 from dimagi/remove-sidebar
biyeun Oct 11, 2012
b866afb
update vellum less
dannyroberts Oct 11, 2012
9b515c9
fixed layout so xpath expression builder lines fit in one line
dannyroberts Oct 11, 2012
a447873
Merge pull request #2 from dimagi/remove-sidebar
biyeun Oct 11, 2012
16f845b
additional styles in hq-tables for sideways text and striped columns …
biyeun Oct 22, 2012
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,6 @@ nbproject
.hg
.svn
.CVS
.idea
.idea

./less/*.css
59 changes: 0 additions & 59 deletions Makefile

This file was deleted.

79 changes: 42 additions & 37 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,69 +1,73 @@
TWITTER BOOTSTRAP
=================
CommCareHQ Bootstrap, forked from Twitter Bootstrap
===================================================

Bootstrap is Twitter's toolkit for kickstarting CSS for websites, apps, and more. It includes base CSS styles for typography, forms, buttons, tables, grids, navigation, alerts, and more.
HQ Bootstrap is a flavor of Twitter Bootstrap designed to work specifically with [CommCare HQ](https://github.com/dimagi/commcare-hq).
It provides all of the styling and basic javascript for HQ's user interface.

To get started -- checkout http://twitter.github.com/bootstrap!
HQ Bootstrap Requirements
-------------------------

The following instructions are for *nix users. For windows installation, skip ahead to the bottom of this section.

Versioning
----------
### nodejs

For transparency and insight into our release cycle, and for striving to maintain backward compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible.
Both lessc and uglify-js below need nodejs to run. [How to install nodejs](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager).

Releases will be numbered with the follow format:
### lessc

`<major>.<minor>.<patch>`
The LESS CSS compiler is required to compile all the .less files from hq-boostrap.

And constructed with the following guidelines:
Do the following to install `lessc`.

* Breaking backward compatibility bumps the major
* New additions without breaking backward compatibility bumps the minor
* Bug fixes and misc changes bump the patch
+ `sudo git clone https://github.com/cloudhead/less.js.git /opt/lessc`
+ add `alias lessc='nodejs /opt/lessc/bin/lessc'` to your bash profile

For more information on SemVer, please visit http://semver.org/.
**Note to OSX users:**

Instead of adding the lessc alias, on Mac OS X you should put the lessc executable on the path, e.g. by adding `/opt/lessc/bin/` to the path.

Bug tracker
-----------
This [LESS app](http://incident57.com/less/) is super useful for working with LESS.
It's highly recommended that you use this when making changes to the .less files. Use this along side the `make extra` command described below for updating changes to javascript or image files.

Have a bug? Please create an issue here on GitHub!
### uglify-js

https://github.com/twitter/bootstrap/issues
Install [npm](http://npmjs.org/).

Then do the following

Twitter account
---------------
npm install uglify-js -g

Keep up to date on announcements and more by following Bootstrap on Twitter, <a href="http://twitter.com/TwBootstrap">@TwBootstrap</a>.
You may have to run `npm link uglify-js`.

### Installation for Windows Users

Mailing list
------------
Installing the prerequisites on windows is actually quite painless. Install node.js via the latest .msi installer. Then install the dependencies using:

Have a question? Ask on our mailing list!
+ npm install less
+ npm install uglify-js

twitter-bootstrap@googlegroups.com
After you're done just update your PATH environment variable to include the bin/ directories containing the lessc and uglifyjs commands.

http://groups.google.com/group/twitter-bootstrap

Building Bootstrap
------------------

Developers
----------
From the root directory of [commcare-hq](https://github.com/dimagi/commcare-hq) run:

We have included a makefile with convenience methods for working with the Bootstrap library.
python manage.py make_bootstrap

+ **build** - `make`
This will run the less compiler on the bootstrap lib and regenerate the docs dir.
The lessc compiler is required for this command to run.

+ **watch** - `make watch`
This is a convenience method for watching your less files and automatically building them whenever you save.
Watchr is required for this command to run.
### Having some aliasing issues?

The following arguments to this management command may help:

Authors
-------
+ `direct-lessc` - runs `lessc` directly from `/opt/lessc`

+ `node` - used in addition to `direct-lessc` for when your OSX install of nodejs is for some reason accessed using `node` instead of `nodejs`.


Authors of Twitter Bootstrap
----------------------------

**Mark Otto**

Expand Down Expand Up @@ -92,3 +96,4 @@ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

File renamed without changes.
Loading