diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-08-24 15:29:09 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-08-24 15:29:09 +0200 |
| commit | 07444280d1a03daa7880c1539bde3a6e80945dab (patch) | |
| tree | c328a11f59e07d12e624576ed86b11ada1b9d198 /p/themes/base-theme/base.css | |
| parent | 1d2527b8bc2a125cc8b8508402417f60d314e330 (diff) | |
| parent | d1f79fee69a3667913f419cd9726ffb11f410bd0 (diff) | |
Merge branch 'dev' into beta
Conflicts:
README.md
Diffstat (limited to 'p/themes/base-theme/base.css')
| -rw-r--r-- | p/themes/base-theme/base.css | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css index c45b1812e..76ac37933 100644 --- a/p/themes/base-theme/base.css +++ b/p/themes/base-theme/base.css @@ -390,16 +390,18 @@ a.btn { /*=== Aside main page (feeds) */ .categories .feeds .item.active { } -.categories .feeds .item.active .feed { -} -.categories .feeds .item.empty .feed { -} .categories .feeds .item.empty.active { } -.categories .feeds .item.empty.active .feed { +.categories .feeds .item.error.active { +} +.categories .feeds .item.empty .feed { } .categories .feeds .item.error .feed { } +.categories .feeds .item.active .feed, +.categories .feeds .item.empty.active .feed, +.categories .feeds .item.error.active .feed { +} .categories .feeds .item .feed { margin: 0; width: 165px; |