diff options
author | redmatrix <git@macgirvin.com> | 2016-04-30 15:02:45 -0700 |
---|---|---|
committer | redmatrix <git@macgirvin.com> | 2016-04-30 15:02:45 -0700 |
commit | 84d93cca6e2ac0b552a6f5c570fbcfce766200a1 (patch) | |
tree | a8a9c46ee6f70dd4b8824499a49b1e39e2980dc6 /view/css | |
parent | 45512e6aba602604143e946cca49c363ae88aa1e (diff) | |
parent | 9446d0cbb463af6a256efebf97e10618469f1193 (diff) | |
download | volse-hubzilla-84d93cca6e2ac0b552a6f5c570fbcfce766200a1.tar.gz volse-hubzilla-84d93cca6e2ac0b552a6f5c570fbcfce766200a1.tar.bz2 volse-hubzilla-84d93cca6e2ac0b552a6f5c570fbcfce766200a1.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/css')
-rw-r--r-- | view/css/bootstrap-red.css | 7 | ||||
-rw-r--r-- | view/css/conversation.css | 2 | ||||
-rw-r--r-- | view/css/mod_profile.css | 13 |
3 files changed, 5 insertions, 17 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 777bf69eb..73d77bb93 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -21,7 +21,8 @@ nav .badge { } } -nav i { +#navbar-collapse-1 i, +.navbar-header i { font-size: 14px; } @@ -50,10 +51,6 @@ nav .navbar-collapse .navbar-right { float: right; } -nav .navbar-toggle { - margin-bottom: 7px; -} - /* nav overrides end */ diff --git a/view/css/conversation.css b/view/css/conversation.css index e5eb575bf..9b99efba4 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -124,7 +124,7 @@ a.wall-item-name-link { text-overflow: ellipsis; } -.wall-item-ago .icon-ok { +.wall-item-ago .fa-check { cursor: pointer; } diff --git a/view/css/mod_profile.css b/view/css/mod_profile.css index e1ceae7f7..35016d10b 100644 --- a/view/css/mod_profile.css +++ b/view/css/mod_profile.css @@ -1,16 +1,7 @@ -.aprofile dt { - font-weight: bold; -} - .profile-thing-list { list-style-type: none; } -.profile-thing-list img { - margin-bottom: 5px; +.profile-thing-img { + margin: 7px 0px; } - -.profile-thing-list > li { - margin-bottom: 15px; -} - |