diff --git a/pix/s/SMILEYS b/pix/s/SMILEYS index 510b9ed04b4..f73deaaed80 100644 --- a/pix/s/SMILEYS +++ b/pix/s/SMILEYS @@ -1 +1,31 @@ -All these icon are 15x15 and saved using adaptive color tables +Steps to update the smileys: + +1. From the emoji-data catalog, https://projects.iamcal.com/emoji-data/table.htm, choose the proper icon from img-google column: +- s/smiley - :blush: +- s/biggrin - :grin: +- s/wink - :wink: +- s/mixed - :confused: +- s/thoughtful - :face_with_raised_eyebrow: +- s/tongueout - :stuck_out_tongue_winking_eye: +- s/cool - :sunglasses: +- s/approve - :slightly_smiling_face: +- s/wideeyes - :open_mouth: +- s/clown - :clown_face: +- s/sad - :white_frowning_face: +- s/shy - :flushed: +- s/blush - :face_with_hand_over_mouth: +- s/kiss - :kissing_heart: +- s/surprise - :astonished: +- s/blackeye - :face_with_head_bandage: +- s/angry - :rage: +- s/dead - :skull_and_crossbones: +- s/sleepy - :sleeping: +- s/evil - :smiling_imp: +- s/heart - :heart: +- s/yes - :+1: +- s/no - :-1: +- s/egg - :egg: + +2. Download each of them into the pix/s folder. + +3. Crop the content (if required). diff --git a/pix/s/angry.gif b/pix/s/angry.gif deleted file mode 100644 index b56fcbaf6e8..00000000000 Binary files a/pix/s/angry.gif and /dev/null differ diff --git a/pix/s/angry.png b/pix/s/angry.png new file mode 100644 index 00000000000..3ce6fa0f436 Binary files /dev/null and b/pix/s/angry.png differ diff --git a/pix/s/angry.svg b/pix/s/angry.svg deleted file mode 100644 index 2beafa938f8..00000000000 --- a/pix/s/angry.svg +++ /dev/null @@ -1 +0,0 @@ -angry \ No newline at end of file diff --git a/pix/s/approve.gif b/pix/s/approve.gif deleted file mode 100644 index 745061b6f1a..00000000000 Binary files a/pix/s/approve.gif and /dev/null differ diff --git a/pix/s/approve.png b/pix/s/approve.png new file mode 100644 index 00000000000..2ab5e2701d7 Binary files /dev/null and b/pix/s/approve.png differ diff --git a/pix/s/approve.svg b/pix/s/approve.svg deleted file mode 100644 index 10babba60bc..00000000000 --- a/pix/s/approve.svg +++ /dev/null @@ -1 +0,0 @@ -approve \ No newline at end of file diff --git a/pix/s/biggrin.gif b/pix/s/biggrin.gif deleted file mode 100644 index 1e8f2f9c834..00000000000 Binary files a/pix/s/biggrin.gif and /dev/null differ diff --git a/pix/s/biggrin.png b/pix/s/biggrin.png new file mode 100644 index 00000000000..eb3804f403f Binary files /dev/null and b/pix/s/biggrin.png differ diff --git a/pix/s/biggrin.svg b/pix/s/biggrin.svg deleted file mode 100644 index da3a9974ace..00000000000 --- a/pix/s/biggrin.svg +++ /dev/null @@ -1 +0,0 @@ -biggrin \ No newline at end of file diff --git a/pix/s/blackeye.gif b/pix/s/blackeye.gif deleted file mode 100644 index b8f8a751a87..00000000000 Binary files a/pix/s/blackeye.gif and /dev/null differ diff --git a/pix/s/blackeye.png b/pix/s/blackeye.png new file mode 100644 index 00000000000..4653195894b Binary files /dev/null and b/pix/s/blackeye.png differ diff --git a/pix/s/blackeye.svg b/pix/s/blackeye.svg deleted file mode 100644 index 4020d5b0777..00000000000 --- a/pix/s/blackeye.svg +++ /dev/null @@ -1 +0,0 @@ -blackeye \ No newline at end of file diff --git a/pix/s/blush.gif b/pix/s/blush.gif deleted file mode 100644 index 91be4f79fe1..00000000000 Binary files a/pix/s/blush.gif and /dev/null differ diff --git a/pix/s/blush.png b/pix/s/blush.png new file mode 100644 index 00000000000..828e755a847 Binary files /dev/null and b/pix/s/blush.png differ diff --git a/pix/s/blush.svg b/pix/s/blush.svg deleted file mode 100644 index 563dcb8d4a8..00000000000 --- a/pix/s/blush.svg +++ /dev/null @@ -1 +0,0 @@ -blush \ No newline at end of file diff --git a/pix/s/clown.gif b/pix/s/clown.gif deleted file mode 100644 index 2d84189ce3f..00000000000 Binary files a/pix/s/clown.gif and /dev/null differ diff --git a/pix/s/clown.png b/pix/s/clown.png new file mode 100644 index 00000000000..39dc4f117c5 Binary files /dev/null and b/pix/s/clown.png differ diff --git a/pix/s/clown.svg b/pix/s/clown.svg deleted file mode 100644 index 62089a9eedf..00000000000 --- a/pix/s/clown.svg +++ /dev/null @@ -1 +0,0 @@ -clown \ No newline at end of file diff --git a/pix/s/cool.gif b/pix/s/cool.gif deleted file mode 100644 index 32169678565..00000000000 Binary files a/pix/s/cool.gif and /dev/null differ diff --git a/pix/s/cool.png b/pix/s/cool.png new file mode 100644 index 00000000000..f9bc1070bf8 Binary files /dev/null and b/pix/s/cool.png differ diff --git a/pix/s/cool.svg b/pix/s/cool.svg deleted file mode 100644 index d9f70ed3520..00000000000 --- a/pix/s/cool.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/pix/s/dead.gif b/pix/s/dead.gif deleted file mode 100644 index 343c4de341b..00000000000 Binary files a/pix/s/dead.gif and /dev/null differ diff --git a/pix/s/dead.png b/pix/s/dead.png new file mode 100644 index 00000000000..08286eb4095 Binary files /dev/null and b/pix/s/dead.png differ diff --git a/pix/s/dead.svg b/pix/s/dead.svg deleted file mode 100644 index f500f704cbb..00000000000 --- a/pix/s/dead.svg +++ /dev/null @@ -1 +0,0 @@ -deadXX \ No newline at end of file diff --git a/pix/s/egg.gif b/pix/s/egg.gif deleted file mode 100644 index e70dccdf46d..00000000000 Binary files a/pix/s/egg.gif and /dev/null differ diff --git a/pix/s/egg.png b/pix/s/egg.png new file mode 100644 index 00000000000..00c2a87daa3 Binary files /dev/null and b/pix/s/egg.png differ diff --git a/pix/s/egg.svg b/pix/s/egg.svg deleted file mode 100644 index 76f4827ef47..00000000000 --- a/pix/s/egg.svg +++ /dev/null @@ -1 +0,0 @@ -egg diff --git a/pix/s/evil.gif b/pix/s/evil.gif deleted file mode 100644 index 964bc9e7ed9..00000000000 Binary files a/pix/s/evil.gif and /dev/null differ diff --git a/pix/s/evil.png b/pix/s/evil.png new file mode 100644 index 00000000000..6229b08ab18 Binary files /dev/null and b/pix/s/evil.png differ diff --git a/pix/s/evil.svg b/pix/s/evil.svg deleted file mode 100644 index 3d4f73e75b2..00000000000 --- a/pix/s/evil.svg +++ /dev/null @@ -1 +0,0 @@ -evil \ No newline at end of file diff --git a/pix/s/heart.gif b/pix/s/heart.gif deleted file mode 100644 index 6baf853cc91..00000000000 Binary files a/pix/s/heart.gif and /dev/null differ diff --git a/pix/s/heart.png b/pix/s/heart.png new file mode 100644 index 00000000000..87fdd688394 Binary files /dev/null and b/pix/s/heart.png differ diff --git a/pix/s/heart.svg b/pix/s/heart.svg deleted file mode 100644 index 7d3a8c02714..00000000000 --- a/pix/s/heart.svg +++ /dev/null @@ -1 +0,0 @@ -heart \ No newline at end of file diff --git a/pix/s/kiss.gif b/pix/s/kiss.gif deleted file mode 100644 index b5f392c972e..00000000000 Binary files a/pix/s/kiss.gif and /dev/null differ diff --git a/pix/s/kiss.png b/pix/s/kiss.png new file mode 100644 index 00000000000..e20745c2e51 Binary files /dev/null and b/pix/s/kiss.png differ diff --git a/pix/s/kiss.svg b/pix/s/kiss.svg deleted file mode 100644 index f347a3f1674..00000000000 --- a/pix/s/kiss.svg +++ /dev/null @@ -1 +0,0 @@ -kiss \ No newline at end of file diff --git a/pix/s/martin.gif b/pix/s/martin.gif deleted file mode 100644 index 3246f4d2f87..00000000000 Binary files a/pix/s/martin.gif and /dev/null differ diff --git a/pix/s/mixed.gif b/pix/s/mixed.gif deleted file mode 100644 index 53c3fb10882..00000000000 Binary files a/pix/s/mixed.gif and /dev/null differ diff --git a/pix/s/mixed.png b/pix/s/mixed.png new file mode 100644 index 00000000000..1f991af92f9 Binary files /dev/null and b/pix/s/mixed.png differ diff --git a/pix/s/mixed.svg b/pix/s/mixed.svg deleted file mode 100644 index fe71c8bf4ea..00000000000 --- a/pix/s/mixed.svg +++ /dev/null @@ -1 +0,0 @@ -mixed \ No newline at end of file diff --git a/pix/s/no.gif b/pix/s/no.gif deleted file mode 100644 index 45dd129d095..00000000000 Binary files a/pix/s/no.gif and /dev/null differ diff --git a/pix/s/no.png b/pix/s/no.png new file mode 100644 index 00000000000..7132290af9b Binary files /dev/null and b/pix/s/no.png differ diff --git a/pix/s/no.svg b/pix/s/no.svg deleted file mode 100644 index a462b4ee0a4..00000000000 --- a/pix/s/no.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/pix/s/sad.gif b/pix/s/sad.gif deleted file mode 100644 index 9e820e08954..00000000000 Binary files a/pix/s/sad.gif and /dev/null differ diff --git a/pix/s/sad.png b/pix/s/sad.png new file mode 100644 index 00000000000..b7778023a86 Binary files /dev/null and b/pix/s/sad.png differ diff --git a/pix/s/sad.svg b/pix/s/sad.svg deleted file mode 100644 index aeda7d020ae..00000000000 --- a/pix/s/sad.svg +++ /dev/null @@ -1 +0,0 @@ -sad \ No newline at end of file diff --git a/pix/s/shy.gif b/pix/s/shy.gif deleted file mode 100644 index f9db148cf75..00000000000 Binary files a/pix/s/shy.gif and /dev/null differ diff --git a/pix/s/shy.png b/pix/s/shy.png new file mode 100644 index 00000000000..04f9761c7dd Binary files /dev/null and b/pix/s/shy.png differ diff --git a/pix/s/shy.svg b/pix/s/shy.svg deleted file mode 100644 index 910bf198347..00000000000 --- a/pix/s/shy.svg +++ /dev/null @@ -1 +0,0 @@ -shy \ No newline at end of file diff --git a/pix/s/sleepy.gif b/pix/s/sleepy.gif deleted file mode 100644 index 5b8d2255446..00000000000 Binary files a/pix/s/sleepy.gif and /dev/null differ diff --git a/pix/s/sleepy.png b/pix/s/sleepy.png new file mode 100644 index 00000000000..dcdbe422948 Binary files /dev/null and b/pix/s/sleepy.png differ diff --git a/pix/s/sleepy.svg b/pix/s/sleepy.svg deleted file mode 100644 index f6c4afb4436..00000000000 --- a/pix/s/sleepy.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/pix/s/smiley.gif b/pix/s/smiley.gif deleted file mode 100644 index 6ec1746dcb0..00000000000 Binary files a/pix/s/smiley.gif and /dev/null differ diff --git a/pix/s/smiley.png b/pix/s/smiley.png new file mode 100644 index 00000000000..7a2034103c7 Binary files /dev/null and b/pix/s/smiley.png differ diff --git a/pix/s/smiley.svg b/pix/s/smiley.svg deleted file mode 100644 index 88ffe143106..00000000000 --- a/pix/s/smiley.svg +++ /dev/null @@ -1 +0,0 @@ -smiley \ No newline at end of file diff --git a/pix/s/surprise.gif b/pix/s/surprise.gif deleted file mode 100644 index 1b5ef2f5d15..00000000000 Binary files a/pix/s/surprise.gif and /dev/null differ diff --git a/pix/s/surprise.png b/pix/s/surprise.png new file mode 100644 index 00000000000..1cf6f6151fc Binary files /dev/null and b/pix/s/surprise.png differ diff --git a/pix/s/surprise.svg b/pix/s/surprise.svg deleted file mode 100644 index 895febaf0c9..00000000000 --- a/pix/s/surprise.svg +++ /dev/null @@ -1 +0,0 @@ -surprise \ No newline at end of file diff --git a/pix/s/thoughtful.gif b/pix/s/thoughtful.gif deleted file mode 100644 index 0fc0da593a9..00000000000 Binary files a/pix/s/thoughtful.gif and /dev/null differ diff --git a/pix/s/thoughtful.png b/pix/s/thoughtful.png new file mode 100644 index 00000000000..236ea3514d9 Binary files /dev/null and b/pix/s/thoughtful.png differ diff --git a/pix/s/thoughtful.svg b/pix/s/thoughtful.svg deleted file mode 100644 index 8811b0f43b7..00000000000 --- a/pix/s/thoughtful.svg +++ /dev/null @@ -1 +0,0 @@ -thoughtful \ No newline at end of file diff --git a/pix/s/tongueout.gif b/pix/s/tongueout.gif deleted file mode 100644 index c0f8c869028..00000000000 Binary files a/pix/s/tongueout.gif and /dev/null differ diff --git a/pix/s/tongueout.png b/pix/s/tongueout.png new file mode 100644 index 00000000000..749cff368b6 Binary files /dev/null and b/pix/s/tongueout.png differ diff --git a/pix/s/tongueout.svg b/pix/s/tongueout.svg deleted file mode 100644 index 1b7887679db..00000000000 --- a/pix/s/tongueout.svg +++ /dev/null @@ -1 +0,0 @@ -tongueout \ No newline at end of file diff --git a/pix/s/wideeyes.gif b/pix/s/wideeyes.gif deleted file mode 100644 index 2f0df598f2f..00000000000 Binary files a/pix/s/wideeyes.gif and /dev/null differ diff --git a/pix/s/wideeyes.png b/pix/s/wideeyes.png new file mode 100644 index 00000000000..0bb88b0d28d Binary files /dev/null and b/pix/s/wideeyes.png differ diff --git a/pix/s/wideeyes.svg b/pix/s/wideeyes.svg deleted file mode 100644 index 99b921df125..00000000000 --- a/pix/s/wideeyes.svg +++ /dev/null @@ -1 +0,0 @@ -wideeyes \ No newline at end of file diff --git a/pix/s/wink.gif b/pix/s/wink.gif deleted file mode 100644 index fe33b2df3e2..00000000000 Binary files a/pix/s/wink.gif and /dev/null differ diff --git a/pix/s/wink.png b/pix/s/wink.png new file mode 100644 index 00000000000..29cc90fbcf4 Binary files /dev/null and b/pix/s/wink.png differ diff --git a/pix/s/wink.svg b/pix/s/wink.svg deleted file mode 100644 index 544ef20605c..00000000000 --- a/pix/s/wink.svg +++ /dev/null @@ -1 +0,0 @@ -wink \ No newline at end of file diff --git a/pix/s/yes.gif b/pix/s/yes.gif deleted file mode 100644 index 09f03a92d4a..00000000000 Binary files a/pix/s/yes.gif and /dev/null differ diff --git a/pix/s/yes.png b/pix/s/yes.png new file mode 100644 index 00000000000..3134e82e451 Binary files /dev/null and b/pix/s/yes.png differ diff --git a/pix/s/yes.svg b/pix/s/yes.svg deleted file mode 100644 index 88cb4dd58a1..00000000000 --- a/pix/s/yes.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/theme/boost/scss/moodle/icons.scss b/theme/boost/scss/moodle/icons.scss index 99ce4279449..60ba18a5260 100644 --- a/theme/boost/scss/moodle/icons.scss +++ b/theme/boost/scss/moodle/icons.scss @@ -55,6 +55,11 @@ $iconsizes: map-merge(( max-height: $icon-big-height; font-size: $icon-big-height; } + + &.emoticon { + max-width: map-get($iconsizes, 3); + max-height: map-get($iconsizes, 3); + } } // Force size for the SVG icons. diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 7917d03660d..c9b174520cf 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -26208,6 +26208,10 @@ body.behat-site .action-menu .dropdown-subpanel-content.show { max-height: 64px; font-size: 64px; } +.icon.emoticon { + max-width: 16px; + max-height: 16px; +} img.icon { width: 16px; diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index 91e46f1b941..27f96ad0817 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -26208,6 +26208,10 @@ body.behat-site .action-menu .dropdown-subpanel-content.show { max-height: 64px; font-size: 64px; } +.icon.emoticon { + max-width: 16px; + max-height: 16px; +} img.icon { width: 16px;