keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9918 from MrPetovan/bug/9914-smileybutton-rework

Browse source 
Move vier-specific smileybutton styles to addon
This commit is contained in:
Tobias Diekershoff 2021-02-10 11:29:13 +01:00 committed by GitHub
commit 4c6877c1f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 0 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bin/dev/minifyjs.sh
View file

@ -9,13 +9,6 @@ JSFILES=(
"view/js/country.js"
"view/js/main.js"
"vendor/asset/base64/base64.min.js"
"view/theme/frost/js/jquery.divgrow-1.3.1.f1.js"
"view/theme/frost/js/main.js"
"view/theme/frost/js/theme.js"
"view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.js"
"view/theme/frost-mobile/js/main.js"
"view/theme/frost-mobile/js/theme.js"
"view/theme/decaf-mobile/js/theme.js"
)
JSFILES2=(
"library/colorbox/jquery.colorbox.js"

2
doc/Text_comment.md
View file

@ -40,5 +40,3 @@ Darkzero <img src="doc/img/darkzero.png" alt="darkzero.png" style="padding-left
<span style="padding-left: 10px; font-style:italic;">(incl. more "zero"-themes, slackr, comix, easterbunny, facepark)</span>
Dispy <img src="doc/img/dispy.png" alt="dispy.png" style="padding-left: 57px; vertical-align:middle;"> <i>(incl. smoothly, testbubble)</i>
Frost Mobile <img src="doc/img/frost.png" alt="frost.png" style="padding-left: 16px; vertical-align:middle;">

5
doc/Text_editor.md
View file

@ -78,11 +78,6 @@ These icons can change depending on the theme. Some examples:
<td><img src="doc/img/editor_darkbubble.png" alt="darkbubble.png" style="vertical-align:middle;"></td>
<td>&nbsp;</td>
</tr>
<tr>
<td>Frost: </td>
<td><img src="doc/img/editor_frost.png" alt="frost.png" style="vertical-align:middle;"> </td>
<td>&nbsp;</td>
</tr>
</table>
<i><b>*</b> how to [upload](help/FAQ#upload) files</i>
<p style="clear:both;">&nbsp;</p>

2
doc/de/Text_comment.md
View file

@ -57,5 +57,3 @@ Darkzero <img src="doc/img/darkzero.png" alt="darkzero.png" style="padding-left
<span style="padding-left: 10px; font-style:italic;">(inkl. weiterer "zero"-Themen, slackr, comix, easterbunny, facepark)</span>
Dispy <img src="doc/img/dispy.png" alt="dispy.png" style="padding-left: 57px; vertical-align:middle;"> <i>(inkl. smoothly, testbubble)</i>
Frost Mobile <img src="doc/img/frost.png" alt="frost.png" style="padding-left: 16px; vertical-align:middle;">

2
doc/de/Text_editor.md
View file

@ -54,6 +54,4 @@ Darkbubble <img src="doc/img/editor_darkbubble.png" alt="darkbubble.png" style=
Frio <img src="doc/img/editor_frio.png" alt="frio.png" style="padding-left: 44px; vertical-align:middle;">
Frost <img src="doc/img/editor_frost.png" alt="frost.png" style="padding-left: 42px; vertical-align:middle;">
Vier <img src="doc/img/editor_vier.png" alt="vier.png" style="padding-left: 44px; vertical-align:middle;"> <i>(inkl. dispy)</i>

BIN
doc/img/editor_frost.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.8 KiB

BIN
doc/img/frost.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1 KiB

16
view/theme/vier/style.css
View file

@ -2073,22 +2073,6 @@ section.minimal {
margin-left: 15px;
cursor: pointer;
}
#profile-smiley-wrapper {
float: left;
margin-left: 15px;
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;
margin-left: 15px;