Merge https://github.com/friendica/friendica into pull
This commit is contained in:
commit
e356920e14
4 changed files with 14 additions and 10 deletions
|
@ -20,6 +20,7 @@
|
||||||
|
|
||||||
<ul class='admin linklist'>
|
<ul class='admin linklist'>
|
||||||
<li class='admin link button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
|
<li class='admin link button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
|
||||||
|
<li class='admin link button $admin.update.2'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1431,7 +1431,7 @@ transition: all 0.2s ease-in-out;
|
||||||
|
|
||||||
.wall-item-comment-wrapper {
|
.wall-item-comment-wrapper {
|
||||||
margin: 1px 5px 5px 80px;
|
margin: 1px 5px 5px 80px;
|
||||||
background-color: #fff;
|
background-color: #444;
|
||||||
width: 500px;
|
width: 500px;
|
||||||
}
|
}
|
||||||
.wall-item-comment-wrapper .comment-edit-photo {
|
.wall-item-comment-wrapper .comment-edit-photo {
|
||||||
|
@ -1442,14 +1442,14 @@ transition: all 0.2s ease-in-out;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
font-size: 10px;
|
font-size: 10px;
|
||||||
color: #999999;
|
color: #999999;
|
||||||
border: 1px solid #DDD;
|
border: 1px solid #2e2e2f;
|
||||||
padding: 0.3em;
|
padding: 0.3em;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
}
|
}
|
||||||
.wall-item-comment-wrapper .comment-edit-text-full {
|
.wall-item-comment-wrapper .comment-edit-text-full {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
height: 4em;
|
height: 4em;
|
||||||
color: #2e2f2e;
|
color: #eec;
|
||||||
border: 1px solid #2e2f2e;
|
border: 1px solid #2e2f2e;
|
||||||
}
|
}
|
||||||
.comment-edit-preview {
|
.comment-edit-preview {
|
||||||
|
@ -1596,8 +1596,8 @@ transition: all 0.2s ease-in-out;
|
||||||
height: 2.0em;
|
height: 2.0em;
|
||||||
width: 99%;
|
width: 99%;
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
color: #999999;
|
color: #eec;
|
||||||
border: 1px solid #DDD;
|
border: 1px solid #444;
|
||||||
padding: 0.3em;
|
padding: 0.3em;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
}
|
}
|
||||||
|
|
|
@ -540,7 +540,7 @@ header #banner a:active,
|
||||||
header #banner a:visited,
|
header #banner a:visited,
|
||||||
header #banner a:link,
|
header #banner a:link,
|
||||||
header #banner a:hover {
|
header #banner a:hover {
|
||||||
color: #2e2f2e;
|
color: #eec;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
outline: none;
|
outline: none;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
|
@ -661,7 +661,7 @@ nav .nav-menu-icon {
|
||||||
border-radius: 5px 5px 0 0;
|
border-radius: 5px 5px 0 0;
|
||||||
}
|
}
|
||||||
nav .nav-menu-icon:hover {
|
nav .nav-menu-icon:hover {
|
||||||
background-color: #eec;
|
background-color: #308dbf;
|
||||||
position: relative;
|
position: relative;
|
||||||
height: 22px;
|
height: 22px;
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
|
@ -776,7 +776,7 @@ nav #nav-apps-link.selected {
|
||||||
}
|
}
|
||||||
|
|
||||||
.notify-seen {
|
.notify-seen {
|
||||||
background: none repeat scroll 0 0 #DDDDDD;
|
background: none repeat scroll 0 0 #666;
|
||||||
}
|
}
|
||||||
|
|
||||||
ul.menu-popup {
|
ul.menu-popup {
|
||||||
|
@ -1424,7 +1424,7 @@ transition: all 0.2s ease-in-out;
|
||||||
.wall-item-comment-wrapper .comment-edit-text-full {
|
.wall-item-comment-wrapper .comment-edit-text-full {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
height: 4em;
|
height: 4em;
|
||||||
color: #2e302;
|
color: #eec;
|
||||||
border: 1px solid #2e302;
|
border: 1px solid #2e302;
|
||||||
}
|
}
|
||||||
.comment-edit-preview {
|
.comment-edit-preview {
|
||||||
|
@ -1571,10 +1571,11 @@ transition: all 0.2s ease-in-out;
|
||||||
height: 2.0em;
|
height: 2.0em;
|
||||||
width: 99%;
|
width: 99%;
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
color: #999999;
|
color: #eec;
|
||||||
border: 1px solid #DDD;
|
border: 1px solid #DDD;
|
||||||
padding: 0.3em;
|
padding: 0.3em;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
|
background: #444;
|
||||||
}
|
}
|
||||||
.grey
|
.grey
|
||||||
{
|
{
|
||||||
|
@ -1667,6 +1668,7 @@ transition: all 0.2s ease-in-out;
|
||||||
margin: 0 0 5px;
|
margin: 0 0 5px;
|
||||||
width: 60%;
|
width: 60%;
|
||||||
border: 1px solid #d2d2d2;
|
border: 1px solid #d2d2d2;
|
||||||
|
background: #444;
|
||||||
}
|
}
|
||||||
#profile-jot-form #jot-title:-webkit-input-placeholder {
|
#profile-jot-form #jot-title:-webkit-input-placeholder {
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
|
|
|
@ -1671,6 +1671,7 @@ body .pageheader{
|
||||||
height: 2.0em;
|
height: 2.0em;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
font-size: 10px;
|
font-size: 10px;
|
||||||
|
background: #444;
|
||||||
color: #999999;
|
color: #999999;
|
||||||
border: 1px solid #DDD;
|
border: 1px solid #DDD;
|
||||||
padding: 0.3em;
|
padding: 0.3em;
|
||||||
|
|
Loading…
Reference in a new issue