Skip to content

Commit c7c5ce8

Browse files
fatfat
committed
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
2 parents aa43239 + 427a001 commit c7c5ce8

File tree

6 files changed

+149
-13
lines changed

6 files changed

+149
-13
lines changed

‎Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
VERSION=1.2.0
12
DATE=$(shell DATE)
23
BOOTSTRAP = ./bootstrap.css
34
BOOTSTRAP_MIN = ./bootstrap.min.css
@@ -7,10 +8,10 @@ WATCHR ?= `which watchr`
78

89
build:
910
@@if test ! -z ${LESS_COMPESSOR}; then \
10-
sed 's/@DATE/'"${DATE}"'/' ${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp && \
11-
lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP} && \
12-
lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress && \
13-
rm -f ${BOOTSTRAP_LESS}.tmp && \
11+
sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"${DATE}"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \
12+
lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \
13+
lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \
14+
rm -f ${BOOTSTRAP_LESS}.tmp; \
1415
echo "Bootstrap successfully built! - `date`"; \
1516
else \
1617
echo "You must have the LESS compiler installed in order to build Bootstrap."; \

‎README.md

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,16 @@ You can use Twitter Bootstrap in one of two ways: just drop the compiled CSS int
1313

1414
Here's what the LESS version looks like:
1515

16-
<link rel="stylesheet/less" type="text/css" href="lib/bootstrap.less">
17-
<script src="less.js" type="text/javascript"></script>
16+
``` html
17+
<link rel="stylesheet/less" type="text/css" href="lib/bootstrap.less">
18+
<script src="less.js" type="text/javascript"></script>
19+
```
1820

1921
Or if you prefer, the standard css way:
2022

23+
``` html
2124
<link rel="stylesheet" type="text/css" href="bootstrap.css">
25+
```
2226

2327
For more info, refer to the docs!
2428

@@ -41,15 +45,21 @@ And constructed with the following guidelines:
4145
For more information on SemVer, please visit http://semver.org/.
4246

4347

44-
Bug Tracker
48+
Bug tracker
4549
-----------
4650

4751
Have a bug? Please create an issue here on GitHub!
4852

4953
https://github.com/twitter/bootstrap/issues
5054

5155

52-
Mailing List
56+
Twitter account
57+
---------------
58+
59+
Keep up to date on announcements and more by following Bootstrap on Twitter, <a href="http://twitter.com/TwBootstrap">@TwBootstrap</a>.
60+
61+
62+
Mailing list
5363
------------
5464

5565
Have a question? Ask on our mailing list!
@@ -73,7 +83,7 @@ This is a convenience method for watching your less files and automatically buil
7383
Watchr is required for this command to run.
7484

7585

76-
AUTHORS
86+
Authors
7787
-------
7888

7989
**Mark Otto**
@@ -87,7 +97,7 @@ AUTHORS
8797
+ http://github.com/fat
8898

8999

90-
Copyright and License
100+
Copyright and license
91101
---------------------
92102

93103
Copyright 2011 Twitter, Inc.
@@ -102,4 +112,4 @@ Unless required by applicable law or agreed to in writing, software
102112
distributed under the License is distributed on an "AS IS" BASIS,
103113
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
104114
See the License for the specific language governing permissions and
105-
limitations under the License.
115+
limitations under the License.

‎bootstrap.css

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
* http://www.apache.org/licenses/LICENSE-2.0
77
*
88
* Designed and built with all the love in the world @twitter by @mdo and @fat.
9+
<<<<<<< HEAD:bootstrap.css
910
* Date: Fri Sep 16 10:51:22 PDT 2011
11+
=======
12+
* Date: Mon Sep 12 09:25:40 PDT 2011
13+
>>>>>>> 427a001c476569684027567e5a7cec89058185ad:bootstrap-1.2.0.css
1014
*/
1115
/* Reset.less
1216
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -266,7 +270,11 @@ a:hover {
266270
.row:after {
267271
clear: both;
268272
}
273+
<<<<<<< HEAD:bootstrap.css
269274
[class*="span"] {
275+
=======
276+
.row [class*="span"] {
277+
>>>>>>> 427a001c476569684027567e5a7cec89058185ad:bootstrap-1.2.0.css
270278
display: inline;
271279
float: left;
272280
margin-left: 20px;
@@ -391,6 +399,54 @@ a:hover {
391399
.offset-two-thirds {
392400
margin-left: 660px;
393401
}
402+
<<<<<<< HEAD:bootstrap.css
403+
=======
404+
html, body {
405+
background-color: #fff;
406+
}
407+
body {
408+
margin: 0;
409+
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
410+
font-size: 13px;
411+
font-weight: normal;
412+
line-height: 18px;
413+
color: #808080;
414+
}
415+
.container {
416+
width: 940px;
417+
margin: 0 auto;
418+
}
419+
.container-fluid {
420+
padding: 0 20px;
421+
zoom: 1;
422+
}
423+
.container-fluid:before, .container-fluid:after {
424+
display: table;
425+
content: "";
426+
}
427+
.container-fluid:after {
428+
clear: both;
429+
}
430+
.container-fluid > .sidebar {
431+
float: left;
432+
width: 220px;
433+
}
434+
.container-fluid > .content {
435+
min-width: 700px;
436+
max-width: 1180px;
437+
margin-left: 240px;
438+
}
439+
a {
440+
color: #0069d6;
441+
text-decoration: none;
442+
line-height: inherit;
443+
font-weight: inherit;
444+
}
445+
a:hover {
446+
color: #0050a3;
447+
text-decoration: underline;
448+
}
449+
>>>>>>> 427a001c476569684027567e5a7cec89058185ad:bootstrap-1.2.0.css
394450
/* Typography.less
395451
* Headings, body text, lists, code, and more for a versatile and durable typography system
396452
* ---------------------------------------------------------------------------------------- */

‎bootstrap.min.css

Lines changed: 69 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/bootstrap.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Bootstrap v1.3.0
2+
* Bootstrap @VERSION
33
*
44
* Copyright 2011 Twitter, Inc
55
* Licensed under the Apache License v2.0

‎lib/scaffolding.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,4 @@ a {
134134
.span-one-third { width: 300px; }
135135
.span-two-thirds { width: 620px; }
136136
.offset-one-third { margin-left: 340px; }
137-
.offset-two-thirds { margin-left: 660px; }
137+
.offset-two-thirds { margin-left: 660px; }

0 commit comments

Comments
 (0)