Skip to content

Commit

Permalink
Don't preserve line breaks in inline code
Browse files Browse the repository at this point in the history 
Closes #19323.
  • Loading branch information
@lambda-fairy
lambda-fairy committed Dec 11, 2014
1 parent c38e73f commit 1e77e29
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/doc/rust.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2013 The Rust Project Developers. See the COPYRIGHT
* Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
* file at the top-level directory of this distribution and at
* http://rust-lang.org/COPYRIGHT.
* With elements taken from Bootstrap v3.0.2 (MIT licensed).
Expand Down Expand Up @@ -209,7 +209,6 @@ pre {
code {
padding: 0 2px;
color: #8D1A38;
white-space: pre-wrap;
}
pre code {
padding: 0;
Expand Down

5 comments on commit 1e77e29

@bors
Copy link
Contributor

@bors bors commented on 1e77e29 Dec 19, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at https://github.com/lfairy/rust/commit/1e77e29d2896017e522ed3fc85dca07c1bd466b9

@bors
Copy link
Contributor

@bors bors commented on 1e77e29 Dec 19, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging 19 batched pull requests into batch

@bors
Copy link
Contributor

@bors bors commented on 1e77e29 Dec 19, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

status: {"merge_sha": "f53a30e256eb5fc969967548f5ddb1f66ae857c7", "rollup_pulls": [[19727, "1e77e29d2896017e522ed3fc85dca07c1bd466b9"], [19758, "9f4ba244f1b63769c12de8f17fa9039f3bb9783a"], [19838, "1afa8acca8d9c548da99ef30d3a13c0d086203f3"], [19932, "c910252769370a1bc039ec25ed918d81669d28ad"], [19944, "6875eb574802c4ea7da5b83bfc690bd1118be364"], [19957, "bada7df64b8ca85a1708336db896e52d9b4ce626"], [19961, "8605ce2096eb32b8c89e392e5d2a53e0bbc1254c"], [19967, "01aa4ca7d8da7e2dabc91aa3de4616109c93a9d2"], [19973, "6746b94f78b8a0f97fe2f75059d4de49c5481d77"], [19974, "85196bfca82bbed163b3ab539af0ebe8c3ee2b1d"], [19977, "0e9b12b9cc7d2b005c07b12313c6008ba667d3d6"], [19979, "3bb91aa28fd36173a87dd9dd47e120d5223042e2"], [19980, "d729c966bb8f1a0fe06f432e5c9c9aa2f03c4820"], [19983, "3d6babee9de8448823f99879e951d379b70a8a34"], [19989, "15d54549d7311893eacd43d7d6cb527ac2acf944"], [19994, "5806519bd49e1ebcd78ee5370bd6c9ffad236577"], [19996, "edb39b8b336278ca8b437c974d2da25d68e9e549"]]}

@bors
Copy link
Contributor

@bors bors commented on 1e77e29 Dec 19, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Testing rollup candidate = f53a30e

Successful merges:

Failed merges:

Please sign in to comment.