Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

This commit is contained in:
redmatrix 2016-06-11 15:29:25 -07:00
commit 1789c3242a
6 changed files with 12726 additions and 12729 deletions

View file

@ -59,7 +59,7 @@ aside .nav-pills > li > a,
padding: 6px 10px;
}
.dropdown-menu {
.wall-item-tools .dropdown-menu {
min-width: auto;
}

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -117,15 +117,6 @@ code {
color: #000;
}
.inline-code {
font-size: 1em;
padding: 0;
border: 0;
background: #FFF;
display: inline;
color: #000;
}
pre {
background: #F5F5F5;
color: #333;