0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

255 Commits

Author SHA1 Message Date
Mark Otto
8c2df3ac3a resolve conflicts in merging in other branch 2011-08-25 23:12:29 -07:00
Mark Otto
dd4bb95c2d updated docs for b/i tags based on issue #62 2011-08-25 23:10:18 -07:00
Mark Otto
0758f64045 updated classnames in the docs for the alerts, updated colors on error and info alerts/buttons 2011-08-25 22:52:21 -07:00
Mark Otto
7d821f18ac resolve issue #87 in this branch 2011-08-25 22:44:23 -07:00
Mark Otto
ce615d016a merged in my pending changes from 1.2-wip branch, resolve diffs as best as i could, update docs and alerts to use original classes, updated docs to include smaller section for layouts 2011-08-25 22:41:45 -07:00
Jacob Thornton
04b8e667d0 clean up btn selectors a bit 2011-08-25 13:52:04 -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
8368cfd523 add opera to browser support 2011-08-24 19:55:11 -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
411b90e4ff comment out button method with // so less doesn't compile it into source 2011-08-22 22:02:31 -07:00
Jacob Thornton
40aba9ca1d append checkbox to password input #36 2011-08-22 21:51:17 -07:00
Jacob Thornton
899c6f8d12 remake 2011-08-22 21:47:34 -07:00
Jacob Thornton
8a27d281a9 goodbye -ms-filter. 2011-08-22 21:31:30 -07:00
Jacob Thornton
9a91614882 remove templates 2011-08-22 13:14:54 -07:00
Jacob Thornton
2575547b15 rename examples dir 2011-08-22 13:12:37 -07:00
Mark Otto
d324a24268 adding first template to the repo for a generic website page 2011-08-22 12:50:30 -07:00
Mark Otto
16064bed2d Bugfix and copy changes 2011-08-22 12:34:55 -07:00
Jacob Thornton
112f7eff8a remake 2011-08-22 11:29:01 -07:00
Jacob Thornton
8497d935ad Merge branch 'master' of github.com:twitter/bootstrap 2011-08-22 11:27:21 -07:00
Jacob Thornton
621f358dc0 fix copy for ie in docs 2011-08-22 11:26:04 -07:00
Mark Otto
ee6402b6c8 Merge pull request #51 from Tigraine/master
Fixed syntax error in patterns.less
2011-08-22 09:35:09 -07:00
Mark Otto
ebec320395 Merge pull request #58 from sankage/master
fixed #10: color-stop() function removed, @colorStop fixed for moz to be unitless
2011-08-22 09:34:39 -07:00
sankage
6145fd2931 changed @colorStop to be unitless 2011-08-22 18:19:39 -03:00
sankage
e45dbf52de fixed color-stop for opera, ie10, w3c, new webkit 2011-08-22 18:01:11 -03:00
Daniel Hoelbling
96ec9ee083 Fixed a syntax error preventing less compilation with dotless 2011-08-22 09:36:35 +02:00
Jacob Thornton
fef3672ad3 update copy for browser support 2011-08-21 22:48:01 -07:00
Jacob Thornton
3ef86aa703 v1.1.0 2011-08-21 22:30:39 -07:00
Jacob Thornton
109027433d finish cleaning up ie 7-8 support 2011-08-21 22:26:54 -07:00
Jacob Thornton
f408f5c29b update few things for ie 2011-08-21 22:13:35 -07:00
Jacob Thornton
b62b15c5e3 link docs to correct css 2011-08-21 22:05:49 -07:00
Jacob Thornton
25e21bab96 fix crappy merge 2011-08-21 22:05:07 -07:00
Jacob Thornton
e11c49cc48 Merge branch 'master' of github.com:twitter/bootstrap
Conflicts:
	bootstrap-1.0.0.css
	bootstrap-1.0.0.min.css
	docs/index.html
2011-08-21 21:42:56 -07:00
Jacob Thornton
b54dc13535 Merge branch 'misc_css_fixes'
Conflicts:
	bootstrap-1.0.0.css
	lib/patterns.less
2011-08-21 21:42:10 -07:00
Jacob Thornton
985ee6455a remake 2011-08-21 21:30:41 -07:00
Jacob Thornton
b39a9a680d go with greyed out next 2011-08-21 21:30:19 -07:00
Jacob Thornton
dd92f4e6e2 hide overflow for ie 7 2011-08-21 21:26:15 -07:00
Jacob Thornton
d8d12e20b4 fix border for popover ie6-7 2011-08-21 21:20:51 -07:00
Jacob Thornton
d90136b585 remove ie8 hack 2011-08-21 21:18:36 -07:00
Jacob Thornton
8ebdf4483f ie-6/7 hack for border colors 2011-08-21 21:09:54 -07:00
Jacob Thornton
1db73edc5f fix conflict 2011-08-21 21:06:09 -07:00
Jacob Thornton
17f9aca698 1 more space for disabled 2011-08-21 20:57:09 -07:00
Mark Otto
f169c99f72 more tweaks to resolve some missed conflicts 2011-08-21 20:56:06 -07:00
Jacob Thornton
c6b162f6ca nonbreaking spaces for ie7 after buttons :/ 2011-08-21 20:53:54 -07:00
Mark Otto
0df17f06d8 re-add div to error class 2011-08-21 20:53:52 -07:00
Mark Otto
5668723db2 resolve conflicts again and rebuild 2011-08-21 20:51:25 -07:00
Mark Otto
23ec21d049 resolve conflicts 2011-08-21 20:51:13 -07:00