Commit d637db1a authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

parents e493f7fc 7095d181
Showing with 4 additions and 4 deletions
+4 -4
...@@ -345,13 +345,13 @@ ...@@ -345,13 +345,13 @@
<tbody> <tbody>
<tr> <tr>
<td class="span3"><code>@warningText</code></td> <td class="span3"><code>@warningText</code></td>
<td>#f3edd2</td> <td>#c09853</td>
<td class="swatch-col"><span class="swatch" style="background-color: #f3edd2;"></span></td> <td class="swatch-col"><span class="swatch" style="background-color: #c09853;"></span></td>
</tr> </tr>
<tr> <tr>
<td><code>@warningBackground</code></td> <td><code>@warningBackground</code></td>
<td>#c09853</td> <td>#f3edd2</td>
<td><span class="swatch" style="background-color: #c09853;"></span></td> <td><span class="swatch" style="background-color: #f3edd2;"></span></td>
</tr> </tr>
<tr> <tr>
<td><code>@errorText</code></td> <td><code>@errorText</code></td>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment