root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity
524 Commits 104 Branches 92 Tags 678 MiB
Commit Graph

57 Commits

Author SHA1 Message Date
Jacob Thornton c7c5ce8dcd Merge branch 'master' of github.com:twitter/bootstrap into 1.3-wip 
Conflicts:
	Makefile
	README.md
	bootstrap.css
	bootstrap.min.css
	lib/bootstrap.less
	lib/scaffolding.less
 2011-09-16 11:24:07 -07:00
Mark Otto b188c0da8b updated table styles a bit and floated the fluid columns to clear the row dropping problem we were having 2011-09-16 09:41:58 -07:00
Mark Otto 5249483850 comment out box-shadow on masthead and footer in docs.css because Opera sucks at inset box-shadow :" 2011-09-12 22:19:28 -07:00
Mark Otto 206334ba70 remove theme.less and split preboot.less to mixins.less and variables.less to isolate customization from function 2011-09-12 20:07:26 -07:00
Mark Otto 53812bc2d8 remove qualifying tags in .span selectors for built in grid so that we can use .span-n classes in form styles 2011-09-11 18:44:25 -07:00
Mark Otto 00b7dff359 overhaul docs CSS since it was scalable, converted docs mastheads and footers to classes and HTML5 elements, add masthead to js docs page but make it slate so it looks cool and stands out 2011-09-10 21:05:23 -07:00
Mark Otto 99ede580cf adding code and .label sections to type section 2011-09-10 15:29:38 -07:00
Mark Otto a40690a17c fix the grid before 1.3.0 drops soon 2011-09-09 20:48:45 -07:00
Mark Otto 1c03a07591 bump css to 1.3.0, update makefile to reflect that, update form css to prepend form to the .clearfix to prevent some bullshit, small tweaks elsewhere 2011-09-08 10:36:56 -07:00
Mark Otto 7882f0f64b adding temp theme file to help with customization; still needs work 2011-09-03 22:53:21 -07:00
Mark Otto 4dbd2334bd updated hero example, added fluid example, resolved issue with tabs and fluid nav 2011-09-02 23:01:38 -07:00
Mark Otto 6d118411e1 resolve conflict 2011-09-02 22:09:49 -07:00
Mark Otto 5c3f0e32e6 updated container mixin to be fixed-container instead so we can keep the .container in scaffolding while removing the repeated code 2011-09-02 22:08:38 -07:00
Jacob Thornton 3c9c85b1ed Merge branch 'js-examples' into 1.3-wip 
Conflicts:
	bootstrap-1.2.0.css
 2011-09-02 21:06:49 -07:00
Jacob Thornton 0e13f8dca1 Merge branch 'master' of github.com:twitter/bootstrap into js-examples 
Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
	lib/patterns.less
	lib/scaffolding.less
 2011-09-02 21:04:25 -07:00
Mark Otto c4481b54a8 improve CSS properties for centering content, the container, and fluid container so as to not override properties where possible 2011-09-02 21:00:01 -07:00
Mark Otto a4dc2c8955 merge in master after merging a pull request, add comment 2011-09-02 09:52:33 -07:00
pthrasher 5960afc349 incorporated idea from @markdotto in #138 2011-09-02 12:45:03 -04:00
Mark Otto 02abdd6037 remove inset shadow from disabled buttons 2011-09-02 00:02:44 -07:00
Mark Otto 0cb6804b69 merging in remote and recompiling 2011-08-31 16:27:28 -07:00
Jacob Thornton 90d174a34d Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip 
Conflicts:
	README.md
	bootstrap-1.2.0.css
 2011-08-30 23:37:46 -07:00
Mark Otto 7070d44aed adding more grid docs 2011-08-29 21:41:32 -07:00
Jacob Thornton 589204803b remove duplicate defined btn class O_O 2011-08-29 21:41:12 -07:00
Mark Otto f17fc367f7 le merging conflicts 2011-08-29 21:26:53 -07:00
Mark Otto 650251228b redefine the grid to use attribute selectors with css regex, make previously fixed grid values use variables we use elsewhere 2011-08-27 15:30:18 -07:00
Jacob Thornton 11721f376d add boostrap-twipsy and bootstrap-alerts 2011-08-27 13:03:06 -07:00
Jacob Thornton df8b65445c small typo in offset generation 2011-08-26 19:31:50 -07:00
Jacob Thornton a63fb4d234 Merge branch '1.1.1-wip' 2011-08-26 15:21:20 -07:00
Mark Otto 8c2df3ac3a resolve conflicts in merging in other branch 2011-08-25 23:12:29 -07:00
Igor Bozato 9a00619d6e .sidebar and .content in fluid layouts don't need to be divs 2011-08-26 03:17:38 -03:00
Mark Otto 7d821f18ac resolve issue #87 in this branch 2011-08-25 22:44:23 -07:00
Jacob Thornton 0e9d7c1c4d update alert and button styling aproach 2011-08-25 13:31:46 -07:00
Mark Otto 50f484eed6 big update to change the alerts, normal and block level, to have simpler css and new colors independent of the base color scheme 2011-08-25 02:00:07 -07:00
Mark Otto 2d99e3f8a6 base import of normalize into the reset css, tweaks to selector specificity across the board 2011-08-25 00:13:40 -07:00
Jacob Thornton 0739583a46 optimize btn for outputted code + line-height: normal for firefox with adjusted padding 2011-08-24 15:55:08 -07:00
Jacob Thornton 7d7156bff9 optimized grid system from @necolas 2011-08-23 20:16:39 -07:00
Jacob Thornton 0bfce13983 add delete button + give .btn cursor:pointer 2011-08-22 23:53:02 -07:00
Jacob Thornton 899c6f8d12 remake 2011-08-22 21:47:34 -07:00
Mark Otto 16064bed2d Bugfix and copy changes 2011-08-22 12:34:55 -07:00
Mark Otto a98d2cccb8 merge in master, resolve conflicts 2011-08-21 20:47:24 -07:00
Mark Otto 254e70550e remove 60px top margin on body and tweak a few other things 2011-08-21 17:06:37 -07:00
Mark Otto 4512cc5652 updated compiled and minified, fix bug where links didn't inherit font weight 2011-08-20 23:45:01 -07:00
Mark Otto 72899a4ee8 updated docs to fix inconsistent display of code elements, update scaffolding to fix padding issue on fluid containers, add placeholder hero unit in patterns for future use, continue to refactor some rgba to hex values 2011-08-20 18:58:12 -07:00
Jacob Thornton 6d0b083b7d update whitspace and comment styles 2011-08-16 22:58:01 -07:00
Mark Otto 460a84a926 Updated offset columns, fix app.js bug, misc tweaks to copy 2011-06-30 15:56:25 -07:00
Mark Otto 588b2da937 updated docs, fixed language, added copy-code js for selecting text on focus 2011-06-30 10:40:28 -07:00
Mark Otto 9e33ab20ab clean up commented out css, slightly updated docs again 2011-06-30 00:15:37 -07:00
Jacob Thornton 1561b20f7c Merge branch 'master' of http://git.local.twitter.com/bootstrap 2011-06-29 15:41:33 -07:00
Jacob Thornton e72283ccaf fix comments up for non minified built file 2011-06-29 15:40:52 -07:00
Mark Otto 025f74ef93 form bug fix with new baseline, updated docs to fix topbar bug, tweaks to scaffolding for buttons 2011-06-29 13:48:08 -07:00