Mark Otto
|
e24bd40b4a
|
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
|
2012-01-25 11:27:29 -08:00 |
|
Mark Otto
|
b851156863
|
change form fields back to inline-block to allow for inline-help text in default form markup
|
2012-01-25 11:26:45 -08:00 |
|
Jacob Thornton
|
25519bacd5
|
rebuild + add spy to template
|
2012-01-25 11:25:35 -08:00 |
|
Mark Otto
|
d3c5dd4e6a
|
updated comments in forms.less and added uneditable-textarea class to extend uneditable-input
|
2012-01-25 11:21:44 -08:00 |
|
Mark Otto
|
cfa925cab6
|
remake after merging large button group fix
|
2012-01-25 11:15:48 -08:00 |
|
Mark Otto
|
10cb7c02f9
|
Merge pull request #1135 from kevva/patch
2.0-wip: Remove specific top value from large btn-dropdown.
|
2012-01-25 11:15:17 -08:00 |
|
Mark Otto
|
fd3c6733a2
|
missing icon class in code example
|
2012-01-25 11:11:22 -08:00 |
|
Mark Otto
|
603aaa01ef
|
remake after updating variables from @lookfirst
|
2012-01-25 11:05:23 -08:00 |
|
Mark Otto
|
66f6535579
|
Merge pull request #1212 from lookfirst/white
2.0-wip: s/#fff/@white/
|
2012-01-25 11:04:35 -08:00 |
|
Jon Stevens
|
0b2dd16e72
|
missed a white
|
2012-01-25 11:02:28 -08:00 |
|
Jon Stevens
|
6cbf2f4024
|
s/#fff/@white/
|
2012-01-25 10:59:45 -08:00 |
|
Mark Otto
|
e49e49ff95
|
fix mention of old vertical forms class'
|
2012-01-25 10:51:26 -08:00 |
|
Mark Otto
|
97bad784b5
|
update remaining icons in docs
|
2012-01-25 10:50:08 -08:00 |
|
Mark Otto
|
4a3ad1aa89
|
update responsive to use latest grid mixins
|
2012-01-25 10:48:08 -08:00 |
|
Mark Otto
|
324ebb5990
|
spec'ed out an examples overview page with links to current examples; examples still need work themselves though
|
2012-01-25 10:47:08 -08:00 |
|
Mark Otto
|
1fa3eab20c
|
fix location of favicon
|
2012-01-25 10:19:29 -08:00 |
|
Mark Otto
|
9380ff8a06
|
clean up the updated container app layout a bit
|
2012-01-25 10:09:26 -08:00 |
|
Mark Otto
|
e93c536df1
|
Merge pull request #1196 from OpenGrid/2.0-wip
Fixed span sum to 10 to display properly. Grid has 12 columns.
|
2012-01-25 10:07:57 -08:00 |
|
Mark Otto
|
9553b1e3e9
|
update docs to include separate responsive css, update docs to highlight proper file name, updated makefile to build responsive separately
|
2012-01-25 10:02:52 -08:00 |
|
Mark Otto
|
c381199968
|
fix media queries in scaffolding
|
2012-01-25 09:57:40 -08:00 |
|
Mark Otto
|
29b4ba0fc5
|
fix modal examples on js page, update modal close button positioning
|
2012-01-25 09:53:53 -08:00 |
|
Mark Otto
|
b01de5fc56
|
updated icons to require a base class .icon
|
2012-01-25 09:51:03 -08:00 |
|
Mark Otto
|
d8041f7c8f
|
fix margin on input buttons in modals
|
2012-01-25 08:34:20 -08:00 |
|
Lech Wilczynski
|
2193866bf0
|
fixed columns to 7+3 for better proportions
|
2012-01-25 16:26:51 +01:00 |
|
Lech Wilczynski
|
eb3440b56a
|
fixed span sum to 10 to display properly. Grid has 12 columns.
|
2012-01-25 15:20:01 +01:00 |
|
Mark Otto
|
de4ada3b88
|
spec out all mixins on less page
|
2012-01-25 01:45:15 -08:00 |
|
Mark Otto
|
bd36e2a163
|
remove checkboxes from js docs page overview, they'll be on the download page instead
|
2012-01-25 01:25:15 -08:00 |
|
Mark Otto
|
f4f7296fa8
|
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
docs/less.html
docs/templates/pages/less.mustache
|
2012-01-25 01:23:50 -08:00 |
|
Mark Otto
|
b8fa6cfacf
|
move css builder and downloader to dedicated page, start to update remaining sections on LESS docs page
|
2012-01-25 01:22:29 -08:00 |
|
Mark Otto
|
c5103d0ad1
|
Merge pull request #1181 from jwieland/updatelessdoc
Minor doc changes about less.js version
|
2012-01-25 00:41:05 -08:00 |
|
Jason Wieland
|
64f85e0371
|
caught another old reference to 1.1.3
|
2012-01-25 00:02:37 -08:00 |
|
Mark Otto
|
b0fb31be5e
|
fix js link on chop shop
|
2012-01-24 23:45:48 -08:00 |
|
Mark Otto
|
ae70d2a8b6
|
refine spacing on fixed subnav
|
2012-01-24 23:44:59 -08:00 |
|
Mark Otto
|
e555f38ae4
|
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
docs/less.html
|
2012-01-24 23:36:39 -08:00 |
|
Mark Otto
|
6ab56051fd
|
fix up docs css for responsive and subnav, fix forms error states
|
2012-01-24 23:35:34 -08:00 |
|
Jason Wieland
|
6be91368c0
|
minor doc updates to inform user they need the current less.js 1.2.1 or they will be hit by this bug #952
|
2012-01-24 23:24:46 -08:00 |
|
Jacob Thornton
|
5d3175e84b
|
fix sub navs fer the otherrzz
|
2012-01-24 22:48:30 -08:00 |
|
Jacob Thornton
|
5a54a98925
|
subnav spy scrolls blaawerh
|
2012-01-24 22:37:35 -08:00 |
|
Jacob Thornton
|
5e5e87fbd0
|
scrollspy working for sub navs
|
2012-01-24 22:33:33 -08:00 |
|
Mark Otto
|
f2fe2b1798
|
remove top margin from alert close, chance close line height to 18px (baseLineHeight)
|
2012-01-24 21:11:20 -08:00 |
|
Mark Otto
|
9602248ad5
|
Merge branch 'fix-alert-close-line-height' of https://github.com/pokonski/bootstrap into pokonski-fix-alert-close-line-height
|
2012-01-24 21:09:28 -08:00 |
|
Mark Otto
|
a5c1d1f182
|
adding actual images to carousel to ensure you can see things are animating; updated styles of carousel controls to work on light and dark backgrounds and use opacity for effects
|
2012-01-24 20:45:38 -08:00 |
|
Mark Otto
|
aa59f123c0
|
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
|
2012-01-24 20:30:39 -08:00 |
|
Mark Otto
|
a03fbc18cb
|
allow for text in progress bars
|
2012-01-24 20:30:26 -08:00 |
|
Mark Otto
|
731821b78f
|
updated docs css to fix subnav on iOS
|
2012-01-24 20:26:54 -08:00 |
|
Mark Otto
|
8ce9b3a676
|
Merge pull request #1175 from Xaro/2.0-wip
Typo in pre type section
|
2012-01-24 20:16:33 -08:00 |
|
Roberto Poo
|
74b5dc8d3b
|
Fixed typo
|
2012-01-25 02:06:50 -02:00 |
|
Mark Otto
|
c1dd1f586d
|
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
|
2012-01-24 19:57:48 -08:00 |
|
Mark Otto
|
c6d5dcd872
|
remove link from transitions on js page
|
2012-01-24 19:50:18 -08:00 |
|
Mark Otto
|
da1906b037
|
Merge pull request #1140 from mchung/patch-1
Fixed typo in Makefile
|
2012-01-24 19:49:39 -08:00 |
|