Mark Otto
00d9258194
revert to negative margin on grid row
2012-01-23 11:35:39 -08:00
Mark Otto
22fa371259
Merge branch 'normalize' of https://github.com/necolas/bootstrap into necolas-normalize
...
Conflicts:
bootstrap.css
bootstrap.min.css
lib/type.less
2012-01-23 11:25:16 -08:00
Jacob Thornton
36d56fb1ba
don't use negative margin - use first child to set to 0
2012-01-22 20:12:26 -08:00
Olivier Laviale
a583f055b3
Using variables rather than numeric values
2012-01-22 22:32:16 +01:00
Nicolas Gallagher
782c994060
Remove global reset in favour of contextual reset.
...
Rather than having a partial reset with individual elements having
their styles built back up, only elements without replacement
styles have specific properties 'reset'.
This commit also includes: a correction to the font mixin arguments
used on forms (the output is now valid CSS); the removal of
`overflow-y:scroll` from the `html` element which is now known to
cause some problems for jQuery modal plugins in Firefox.
2012-01-20 21:21:59 +00:00
Mark Otto
eaa8220d70
add utilities.less file for generic classes
2012-01-08 15:38:57 -08:00
Mark Otto
cb9be7bd0c
clean up dup css in responsive, fix navbar dropdown caret
2012-01-08 13:21:44 -08:00
Mark Otto
33dad13014
update fluid layout to use variable for sidebar width
2012-01-07 03:53:20 -08:00
Mark Otto
5fb2c666ac
update the fluid examples to use new classes and clear the floats properly from sidebar
2012-01-07 01:59:53 -08:00
Mark Otto
20add59de3
breaking out patterns.less even more, removing unnecessary div from checkbox and radio lists--now just labels and inputs
2012-01-05 10:01:42 -08:00
Jacob Thornton
3157de8d1d
clean up comments for better built files
2011-11-25 21:34:55 -08:00
Mark Otto
4e6275d0fe
update property order and do some misc cleanup
2011-11-17 01:28:42 -08:00
Mark Otto
2764cfda6d
remove html from body background
2011-10-28 18:38:06 -07:00
Mark Otto
e7d2218b20
few tweaks to responsive stuff, updated docs for grid system (still needs copy editing)
2011-10-16 23:04:31 -07:00
Mark Otto
9e9109469e
biiiiiig update coming for responsiveness
2011-10-16 03:00:58 -07:00
Mark Otto
f61fe3c474
refactor fluid layout to be more specific to not interfere with modal content while adding right sidebar option
2011-10-09 21:13:26 -07:00
Mark Otto
96dd7a2903
update variables to inlude @baseFontSize, @baseFontFamily, @baseLineHeight for easier customization; added placeholder for @primaryButtonColor, but didn't implement
2011-10-04 00:20:38 -07:00
Mark Otto
732ff9ed1c
fix fluid example
2011-09-16 14:07:18 -07:00
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