mirror of
https://github.com/friendica/friendica
synced 2024-12-23 23:20:16 +00:00
Merge https://github.com/friendica/friendica into pull
This commit is contained in:
commit
9885be256e
8 changed files with 45 additions and 12 deletions
|
@ -1,5 +1,6 @@
|
|||
|
||||
<script>
|
||||
var none = "none"; // ugly hack: $editselect shouldn't be a string if TinyMCE is enabled, but should if it isn't
|
||||
window.editSelect = $editselect;
|
||||
window.isPublic = "$ispublic";
|
||||
window.nickname = "$nickname";
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
* Name: Frost--mobile version
|
||||
* Description: Like frosted glass
|
||||
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
|
||||
* Version: Version 0.2.1
|
||||
* Version: Version 0.2.2
|
||||
* Author: Zach P <windforest@f.shmuz.in>
|
||||
* Maintainer: Zach P <windforest@f.shmuz.in>
|
||||
*/
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
|
||||
<script>
|
||||
var none = "none"; // ugly hack: $editselect shouldn't be a string if TinyMCE is enabled, but should if it isn't
|
||||
window.editSelect = $editselect;
|
||||
window.isPublic = "$ispublic";
|
||||
window.nickname = "$nickname";
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
* Name: Frost
|
||||
* Description: Like frosted glass
|
||||
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
|
||||
* Version: Version 0.2.1
|
||||
* Version: Version 0.2.2
|
||||
* Author: Zach P <windforest@f.shmuz.in>
|
||||
* Maintainer: Zach P <windforest@f.shmuz.in>
|
||||
*/
|
||||
|
|
|
@ -341,11 +341,6 @@
|
|||
height: 16px;
|
||||
background-position: 0px 0px;
|
||||
}
|
||||
|
||||
.sparkle {
|
||||
cursor: url('icons/lock.cur'), pointer;
|
||||
}
|
||||
|
||||
/* global */
|
||||
body {
|
||||
font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
|
||||
|
@ -904,6 +899,9 @@ section {
|
|||
width: 770px;
|
||||
padding: 0px 20px 0px 10px;
|
||||
}
|
||||
.sparkle {
|
||||
cursor: url('icons/lock.cur'), pointer;
|
||||
}
|
||||
/* wall item */
|
||||
.tread-wrapper {
|
||||
background-color: #eff0f1;
|
||||
|
@ -1141,6 +1139,16 @@ section {
|
|||
width: 25px;
|
||||
height: 25px;
|
||||
}
|
||||
span[id^="showmore-teaser"] {
|
||||
background: url("showmore-bg.jpg") no-repeat center bottom;
|
||||
}
|
||||
span[id^="showmore-wrap"] {
|
||||
border-top: 1px solid #999999;
|
||||
color: #999999;
|
||||
display: block;
|
||||
text-align: center;
|
||||
background-color: #eff0f1;
|
||||
}
|
||||
#pause {
|
||||
position: fixed;
|
||||
bottom: 5px;
|
||||
|
|
|
@ -341,11 +341,6 @@
|
|||
height: 16px;
|
||||
background-position: 0px 0px;
|
||||
}
|
||||
|
||||
.sparkle {
|
||||
cursor: url('icons/lock.cur'), pointer;
|
||||
}
|
||||
|
||||
/* global */
|
||||
body {
|
||||
font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
|
||||
|
@ -904,6 +899,9 @@ section {
|
|||
width: 770px;
|
||||
padding: 0px 20px 0px 10px;
|
||||
}
|
||||
.sparkle {
|
||||
cursor: url('icons/lock.cur'), pointer;
|
||||
}
|
||||
/* wall item */
|
||||
.tread-wrapper {
|
||||
background-color: #eff0f1;
|
||||
|
@ -1141,6 +1139,16 @@ section {
|
|||
width: 25px;
|
||||
height: 25px;
|
||||
}
|
||||
span[id^="showmore-teaser"] {
|
||||
background: url("showmore-bg.jpg") no-repeat center bottom;
|
||||
}
|
||||
span[id^="showmore-wrap"] {
|
||||
border-top: 1px solid #999999;
|
||||
color: #999999;
|
||||
display: block;
|
||||
text-align: center;
|
||||
background-color: #eff0f1;
|
||||
}
|
||||
#pause {
|
||||
position: fixed;
|
||||
bottom: 5px;
|
||||
|
|
|
@ -422,6 +422,10 @@ section {
|
|||
padding:0px 20px 0px 10px;
|
||||
}
|
||||
|
||||
.sparkle {
|
||||
cursor: url('icons/lock.cur'), pointer;
|
||||
}
|
||||
|
||||
/* wall item */
|
||||
.tread-wrapper {
|
||||
background-color: @ThreadBackgroundColor;
|
||||
|
@ -590,6 +594,17 @@ section {
|
|||
}
|
||||
.wwto .contact-photo { width: 25px; height: 25px; }
|
||||
|
||||
span[id^="showmore-teaser"]{
|
||||
background: url("showmore-bg.jpg") no-repeat center bottom;
|
||||
}
|
||||
span[id^="showmore-wrap"] {
|
||||
border-top: 1px solid #999999;
|
||||
color: #999999;
|
||||
display: block;
|
||||
text-align: center;
|
||||
background-color: @ThreadBackgroundColor;
|
||||
}
|
||||
|
||||
|
||||
#pause {
|
||||
position: fixed;
|
||||
|
|
BIN
view/theme/quattro/showmore-bg.jpg
Normal file
BIN
view/theme/quattro/showmore-bg.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.9 KiB |
Loading…
Reference in a new issue