Download as
Browse Code »

Commit 981250332236d9fd624098530ad7a0b67fb1ba13

Authored by Joenio Costa
Committed by Antonio Terceiro
1 parent 5927a520
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Pidgin emoticons should be compat with Debian Lenny; and 

- fixing links at scroll bottom of chat history

(ActionItem1635)
Showing 2 changed files with 7 additions and 4 deletions   Show diff stats
public/designs/icons/pidgin/emoticons.js
  Diff comments   View file @9812503
@@ -21,6 +21,9 @@ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, @@ -21,6 +21,9 @@ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
21 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 21 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
22 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 22 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
23 OTHER DEALINGS IN THE SOFTWARE. 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 var emoticons = { 29 var emoticons = {
@@ -37,7 +40,7 @@ var emoticons = { @@ -37,7 +40,7 @@ var emoticons = {
37 } 40 }
38 }, 41 },
39 "::bigSmile": { 42 "::bigSmile": {
40 - "image": "excited.png", 43 + "image": "smile-big.png",
41 "emotes": { 44 "emotes": {
42 ":D": "", 45 ":D": "",
43 "=D": "", 46 "=D": "",
@@ -45,7 +48,7 @@ var emoticons = { @@ -45,7 +48,7 @@ var emoticons = {
45 } 48 }
46 }, 49 },
47 "::shock": { 50 "::shock": {
48 - "image": "shocked.png", 51 + "image": "shock.png",
49 "emotes": { 52 "emotes": {
50 ":O": "", 53 ":O": "",
51 ":0": "", 54 ":0": "",
@@ -91,7 +94,7 @@ var emoticons = { @@ -91,7 +94,7 @@ var emoticons = {
91 } 94 }
92 }, 95 },
93 "::love": { 96 "::love": {
94 - "image": "in_love.png", 97 + "image": "in-love.png",
95 "emotes": { 98 "emotes": {
96 "<3": "", 99 "<3": "",
97 "<333": "" 100 "<333": ""
public/stylesheets/application.css
  Diff comments   View file @9812503
@@ -4505,7 +4505,7 @@ h1#agenda-title { @@ -4505,7 +4505,7 @@ h1#agenda-title {
4505 left: 0; 4505 left: 0;
4506 right: 25px; 4506 right: 25px;
4507 bottom: 40px; 4507 bottom: 40px;
4508 - padding: 20px 20px 10px 15px; 4508 + padding: 0 20px 10px 15px;
4509 } 4509 }
4510 .msie7 .conversation .input-div { 4510 .msie7 .conversation .input-div {
4511 padding-left: 5px; 4511 padding-left: 5px;