Pidgin emoticons should be compat with Debian Lenny; and

- fixing links at scroll bottom of chat history (ActionItem1635)

Pidgin emoticons should be compat with Debian Lenny; and
- fixing links at scroll bottom of chat history (ActionItem1635)
Joenio Costa · Antonio Terceiro
1 parent 5927a520
Showing 2 changed files with 7 additions and 4 deletions Show diff stats
public/designs/icons/pidgin/emoticons.js
public/stylesheets/application.css
@@ -21,6 +21,9 @@ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
+
+The icons above are based in Debian pidgin-data package package version 2.4.3
+
 */
  
 var emoticons = {
@@ -37,7 +40,7 @@ var emoticons = {
          }
       },
       "::bigSmile": {
-         "image": "excited.png",
+         "image": "smile-big.png",
          "emotes": {
             ":D": "",
             "=D": "",
@@ -45,7 +48,7 @@ var emoticons = {
          }
       },
       "::shock": {
-         "image": "shocked.png",
+         "image": "shock.png",
          "emotes": {
             ":O":  "",
             ":0":  "",
@@ -91,7 +94,7 @@ var emoticons = {
          }
       },
       "::love": {
-         "image": "in_love.png",
+         "image": "in-love.png",
          "emotes": {
             "<3":   "",
             "<333": ""
@@ -4505,7 +4505,7 @@ h1#agenda-title {
   left: 0;
   right: 25px;
   bottom: 40px;
-  padding: 20px 20px 10px 15px;
+  padding: 0 20px 10px 15px;
 }
 .msie7 .conversation .input-div {
   padding-left: 5px;
...	...	@@ -21,6 +21,9 @@ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
21	21	WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
22	22	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
23	23	OTHER DEALINGS IN THE SOFTWARE.
	24	+
	25	+The icons above are based in Debian pidgin-data package package version 2.4.3
	26	+
24	27	*/
25	28
26	29	var emoticons = {
...	...	@@ -37,7 +40,7 @@ var emoticons = {
37	40	}
38	41	},
39	42	"::bigSmile": {
40		- "image": "excited.png",
	43	+ "image": "smile-big.png",
41	44	"emotes": {
42	45	":D": "",
43	46	"=D": "",
...	...	@@ -45,7 +48,7 @@ var emoticons = {
45	48	}
46	49	},
47	50	"::shock": {
48		- "image": "shocked.png",
	51	+ "image": "shock.png",
49	52	"emotes": {
50	53	":O": "",
51	54	":0": "",
...	...	@@ -91,7 +94,7 @@ var emoticons = {
91	94	}
92	95	},
93	96	"::love": {
94		- "image": "in_love.png",
	97	+ "image": "in-love.png",
95	98	"emotes": {
96	99	"<3": "",
97	100	"<333": ""
...	...
...	...	@@ -4505,7 +4505,7 @@ h1#agenda-title {
4505	4505	left: 0;
4506	4506	right: 25px;
4507	4507	bottom: 40px;
4508		- padding: 20px 20px 10px 15px;
	4508	+ padding: 0 20px 10px 15px;
4509	4509	}
4510	4510	.msie7 .conversation .input-div {
4511	4511	padding-left: 5px;
...	...