diff options
author | Mark Otto <otto@github.com> | 2014-01-06 11:19:34 +0400 |
---|---|---|
committer | Mark Otto <otto@github.com> | 2014-01-06 11:19:34 +0400 |
commit | 3e54be9ae61aa95dae7aa5719f38d6dc0216c7b1 (patch) | |
tree | 00abaf00528eeb98617071bd7fb0eda600491b06 /docs/css.html | |
parent | 12dacee313e49ff421fc81d5e0a6a70111c3a4af (diff) | |
parent | 422bdc50f9a2bd1f6ec72ebb113af1a485d3465d (diff) |
Merge branch 'master' into docs_derp
Conflicts:
docs/components.html
Diffstat (limited to 'docs/css.html')
-rw-r--r-- | docs/css.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/css.html b/docs/css.html index 4241457766..b4132de925 100644 --- a/docs/css.html +++ b/docs/css.html @@ -2414,7 +2414,6 @@ For example, <code><section></code> should be wrapped as inline. <p class="bg-danger">Donec ullamcorper nulla non metus auctor fringilla.</p> </div> {% highlight html %} -<p class="bg-muted">...</p> <p class="bg-primary">...</p> <p class="bg-success">...</p> <p class="bg-info">...</p> |