diff options
author | Sergio Benitez <sbenitez@mit.edu> | 2015-09-09 13:44:51 -0700 |
---|---|---|
committer | Sergio Benitez <sbenitez@mit.edu> | 2015-09-09 13:44:51 -0700 |
commit | 964d0262ff353db6a50ed5be83ebd22f71aa6e69 (patch) | |
tree | 8cbab6b6a9b4f62cbe9acb2a0b8752b531633362 /public/ng/less | |
parent | 079a2d68db5c843ef2dbba65aeca46d5887d6b02 (diff) | |
parent | b75d0378cbbf0523963fd9bc749543244be7392b (diff) | |
download | gitea-964d0262ff353db6a50ed5be83ebd22f71aa6e69.tar.gz gitea-964d0262ff353db6a50ed5be83ebd22f71aa6e69.zip |
Merged conflicts.
Diffstat (limited to 'public/ng/less')
-rw-r--r-- | public/ng/less/gogs/base.less | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/public/ng/less/gogs/base.less b/public/ng/less/gogs/base.less index a85f0fad62..ede56f01d0 100644 --- a/public/ng/less/gogs/base.less +++ b/public/ng/less/gogs/base.less @@ -299,3 +299,8 @@ clear: both; padding-left: 0; list-style: none; } +.emoji { + width: 1.5em; + height: 1.5em; + display: inline-block; +}
\ No newline at end of file |