diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-11-17 15:04:04 -0800 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-11-17 15:04:04 -0800 |
commit | a089064588352b60bebf27c94a51d480f8062368 (patch) | |
tree | 796fc893c37ecc3a19c469b2a067fcb2765a698d /view/css | |
parent | a06f7fbe2e78de428489d824c1329ef29c4d1f42 (diff) | |
parent | 7c4d9519c89aed59e9253a19203fb13394571929 (diff) | |
download | volse-hubzilla-a089064588352b60bebf27c94a51d480f8062368.tar.gz volse-hubzilla-a089064588352b60bebf27c94a51d480f8062368.tar.bz2 volse-hubzilla-a089064588352b60bebf27c94a51d480f8062368.zip |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/css')
-rw-r--r-- | view/css/bootstrap-red.css | 11 | ||||
-rw-r--r-- | view/css/conversation.css | 6 |
2 files changed, 1 insertions, 16 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index abffe2f78..19796679a 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -29,7 +29,7 @@ nav ul li { max-height: 50px; } -nav img { +nav .navbar-header img { height: 49px; width: 49px; margin-top: 1px; @@ -61,18 +61,9 @@ aside .nav-pills > li > a { padding: 6px 10px; } -.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 { diff --git a/view/css/conversation.css b/view/css/conversation.css index dc74dbbeb..6f1d4b899 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -246,9 +246,3 @@ a.wall-item-name-link { color: #FF0000; font-size: 1em !important; } - -.response-photo { - height: 18px !important; - width: 18px !important; -} - |