friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge develop into 0502_vier_dark 

Conflicts:
	view/theme/vier/dark.css
This commit is contained in:
rabuzarus 2016-02-06 13:09:41 +01:00
parent 0bccfea596 99c3db98a7
commit 95819684c2
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
view/theme/vier/dark.css
View File

@ -69,6 +69,10 @@ li :hover {
background-color: #343434;
}
table.smiley-preview{
background-color: #252C33 !important;
}
/* ACL permission popup */
.acl-list-item.groupshow {
border-color: #9ade00 !important;

2
view/theme/vier/shadow.css
View File

@ -24,7 +24,7 @@ nav .nav-notify {
padding: 1px 3px;
border-radius: 5px 5px 5px 5px;
}
// -----
nav .nav-menu-icon .nav-notify {
top: 0px;
}

9
view/theme/vier/style.css
View File

@ -2024,6 +2024,15 @@ section.minimal {
cursor: pointer;
margin-top: 3px;
height: 10px;
display: inline-block;
}
#smileybutton {
position: absolute;
z-index: 99;
}
table.smiley-preview{
background-color: #FFF;
box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
}
#jot-perms-icon {
float: right;