diff options
| author | friendica <info@friendica.com> | 2015-01-20 14:05:22 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-20 14:05:22 -0800 |
| commit | 70fb47248b6579beabc81287750bc18aab2a7ddd (patch) | |
| tree | a403865fe2760b73952d5fadf061d4b1d0c0c28d /view/css | |
| parent | 7875b79f2f87bef0fc2ebddd3cee0ef952def5d4 (diff) | |
| parent | 43326a26b742430674b92347eb1e4ad8e1a16538 (diff) | |
| download | volse-hubzilla-70fb47248b6579beabc81287750bc18aab2a7ddd.tar.gz volse-hubzilla-70fb47248b6579beabc81287750bc18aab2a7ddd.tar.bz2 volse-hubzilla-70fb47248b6579beabc81287750bc18aab2a7ddd.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/css')
| -rw-r--r-- | view/css/bootstrap-red.css | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 5d9bb6e90..a645b13d2 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -32,26 +32,6 @@ nav .dropdown-menu { margin-top: 0px; } -nav .dropdown-menu .contactname { - padding-top: 2px; - font-weight: bold; - display: block; -} - -nav .dropdown-menu img { - float: left; - margin-right: 5px; - width: 32px; - height: 32px; -} - -nav .dropdown-menu li a { - overflow: hidden; - text-overflow: ellipsis; - line-height: 1em; - padding: 5px 10px; -} - nav .navbar-collapse .navbar-left { float: left; } @@ -67,11 +47,19 @@ nav .navbar-toggle { /* nav overrides end */ .dropdown-menu img { + float: left; width: 32px; height: 32px; margin-right: 5px; } +.dropdown-menu li a { + overflow: hidden; + text-overflow: ellipsis; + line-height: 1em; + padding: 5px 10px; +} + .nav-tabs.nav-justified > li { white-space: nowrap; } |