diff options
| author | friendica <info@friendica.com> | 2015-03-15 15:37:53 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-03-15 15:37:53 -0700 |
| commit | 4e457723c9865ee98eb00f56d37c70e8d1e8fc2d (patch) | |
| tree | e0979e8ade768dbd98adc93ecba3924da5ccd3f9 | |
| parent | 6537a65053f456870e6f03cdb5bca9a9907426eb (diff) | |
| parent | fdcbb61bcb61a980a7a9171432498a9cac6e0965 (diff) | |
| download | volse-hubzilla-4e457723c9865ee98eb00f56d37c70e8d1e8fc2d.tar.gz volse-hubzilla-4e457723c9865ee98eb00f56d37c70e8d1e8fc2d.tar.bz2 volse-hubzilla-4e457723c9865ee98eb00f56d37c70e8d1e8fc2d.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rw-r--r-- | view/css/bootstrap-red.css | 14 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 5 |
2 files changed, 12 insertions, 7 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index cb26910b0..ffc288962 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -4,13 +4,23 @@ nav .badge { position: relative; - top: -48px; + top: -49px; float: left; font-size: 10px; - padding: 2px 6px; + line-height: 20px; + padding: 0px 5px; + height: 20px; + min-width: 20px; + border-radius: 10px; cursor: pointer; } +@media screen and (max-width: 767px) { + nav .badge { + top: -46px; + } +} + nav i { font-size: 14px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b01e03636..da75cf3f8 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2001,11 +2001,6 @@ blockquote { border-radius: $radiuspx; } -nav .badge { - padding: 5px 6px; - border-radius: 9px; -} - nav .badge:hover { background-color: #999; } |