Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow labels to contain emoji #6063

Merged
merged 7 commits into from
Feb 16, 2019
Merged

Allow labels to contain emoji #6063

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d15ae20
Add emoji to labels
jolheiser Feb 13, 2019
ec3e1a3
Quick find/replace in other i18n files containing label translations
jolheiser Feb 13, 2019
f7a4896
Revert "Quick find/replace in other i18n files containing label trans…
jolheiser Feb 14, 2019
d0dffa0
Add style to overwrite emoji height in labels
jolheiser Feb 14, 2019
5021dbf
Merge branch 'master' of /~https://github.com/go-gitea/gitea into 6062_…
jolheiser Feb 15, 2019
a51c898
Revert Makefile change that makes Windows work
jolheiser Feb 15, 2019
0a59606
Merge branch 'master' into 6062_label_emoji
lunny Feb 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ stylesheets-check: generate-stylesheets
.PHONY: generate-stylesheets
generate-stylesheets:
$(eval BROWSERS := "> 2%, last 2 firefox versions, last 2 safari versions")
node_modules/.bin/lessc --clean-css public/less/index.less public/css/index.css
node_modules\\.bin\\lessc --clean-css public/less/index.less public/css/index.css
lafriks marked this conversation as resolved.
Show resolved Hide resolved
$(foreach file, $(filter-out public/less/themes/_base.less, $(wildcard public/less/themes/*)),node_modules/.bin/lessc --clean-css public/less/themes/$(notdir $(file)) > public/css/theme-$(notdir $(call strip-suffix,$(file))).css;)
$(foreach file, $(wildcard public/css/*),node_modules/.bin/postcss --use autoprefixer --autoprefixer.browsers $(BROWSERS) -o $(file) $(file);)

Expand Down
2 changes: 1 addition & 1 deletion public/css/index.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/less/_emojify.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
}

.ui.label .emoji {
height: 1.5em !important;
height: 1.2em !important;
}
You are viewing a condensed version of this merge commit. You can view the full changes here.