Skip to content

Some performance improvements #43

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Some performance improvements #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65e6d33
Update css to latest version
Dec 3, 2018
0ad972a
Remove styling from components and revert back PR#38
Dec 3, 2018
137bfcc
Update docs, now using css file
Dec 3, 2018
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
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
```js
import { Picker } from 'emoji-mart-vue'
```
```css
import 'emoji-mart-vue/css/emoji-mart.css'
```

```html
<picker set="emojione" />
Expand Down
110 changes: 100 additions & 10 deletions css/emoji-mart.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,11 @@
max-width: 22px;
}

.emoji-mart-anchors svg {
.emoji-mart-anchors svg,
.emoji-mart-anchors img {
fill: currentColor;
max-height: 18px;
height: 18px;
width: 18px;
}

.emoji-mart-scroll {
Expand All @@ -87,17 +89,29 @@
.emoji-mart-search {
margin-top: 6px;
padding: 0 6px;
position: relative;
}

.emoji-mart-search input {
font-size: 16px;
display: block;
width: 100%;
padding: .2em .6em;
border-radius: 25px;
padding: 5px 25px 6px 10px;
border-radius: 5px;
border: 1px solid #d9d9d9;
outline: 0;
}

.emoji-mart-search-icon {
position: absolute;
top: 9px;
right: 16px;
z-index: 2;
padding: 0;
border: none;
background: none;
}

.emoji-mart-category .emoji-mart-emoji span {
z-index: 1;
position: relative;
Expand Down Expand Up @@ -138,12 +152,22 @@
font-size: 0;
}

.emoji-mart-emoji-native {
font-family: "Segoe UI Emoji", "Segoe UI Symbol", "Segoe UI", "Apple Color Emoji";
}

.emoji-mart-no-results {
font-size: 14px;
text-align: center;
padding-top: 70px;
color: #858585;
}
.emoji-mart-no-results-img {
display: block;
margin-left: auto;
margin-right: auto;
width: 50%;
}
.emoji-mart-no-results .emoji-mart-category-label {
display: none;
}
Expand Down Expand Up @@ -181,6 +205,11 @@
text-align: right;
}

.emoji-mart-preview-skins.custom {
right: 10px;
text-align: right;
}

.emoji-mart-preview-name {
font-size: 14px;
}
Expand Down Expand Up @@ -223,12 +252,18 @@
background-color: #fff;
}

.emoji-mart-skin-swatches-opened .emoji-mart-skin-swatch {
.emoji-mart-skin-swatches.custom {
font-size: 0;
border: none;
background-color: #fff;
}

.emoji-mart-skin-swatches.opened .emoji-mart-skin-swatch {
width: 16px;
padding: 0 2px;
}

.emoji-mart-skin-swatches-opened .emoji-mart-skin-swatch-selected:after {
.emoji-mart-skin-swatches.opened .emoji-mart-skin-swatch.selected:after {
opacity: .75;
}

Expand All @@ -248,12 +283,13 @@
.emoji-mart-skin-swatch:nth-child(5) { transition-delay: .12s }
.emoji-mart-skin-swatch:nth-child(6) { transition-delay: .15s }

.emoji-mart-skin-swatch-selected {
.emoji-mart-skin-swatch.selected {
position: relative;
width: 16px;
padding: 0 2px;
}
.emoji-mart-skin-swatch-selected:after {

.emoji-mart-skin-swatch.selected:after {
content: "";
position: absolute;
top: 50%; left: 50%;
Expand All @@ -266,9 +302,63 @@
transition: opacity .2s ease-out;
}

.emoji-mart-skin-swatch.custom {
display: inline-block;
width: 0;
height: 38px;
overflow: hidden;
vertical-align: middle;
transition-property: width, height;
transition-duration: .125s;
transition-timing-function: ease-out;
cursor: default;
}

.emoji-mart-skin-swatch.custom.selected {
position: relative;
width: 36px;
height: 38px;
padding: 0 2px 0 0;
}

.emoji-mart-skin-swatch.custom.selected:after {
content: "";
width: 0;
height: 0;
}

.emoji-mart-skin-swatches.custom .emoji-mart-skin-swatch.custom:hover {
background-color: #f4f4f4;
border-radius: 10%;
}

.emoji-mart-skin-swatches.custom.opened .emoji-mart-skin-swatch.custom {
width: 36px;
height: 38px;
padding: 0 2px 0 0;
}

.emoji-mart-skin-swatches.custom.opened .emoji-mart-skin-swatch.custom.selected:after {
opacity: .75;
}

.emoji-mart-skin-text.opened {
display: inline-block;
vertical-align: middle;
text-align: left;
color: #888;
font-size: 11px;
padding: 5px 2px;
width: 95px;
height: 40px;
border-radius: 10%;
background-color: #fff;
}

.emoji-mart-skin {
display: inline-block;
width: 100%; padding-top: 100%;
width: 100%;
padding-top: 100%;
max-width: 12px;
border-radius: 100%;
}
Expand All @@ -278,4 +368,4 @@
.emoji-mart-skin-tone-3 { background-color: #e0bb95 }
.emoji-mart-skin-tone-4 { background-color: #bf8f68 }
.emoji-mart-skin-tone-5 { background-color: #9b643d }
.emoji-mart-skin-tone-6 { background-color: #594539 }
.emoji-mart-skin-tone-6 { background-color: #594539 }
1 change: 1 addition & 0 deletions docs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
text-align: center;
}
</style>
<link rel="stylesheet" type="text/css" href="emoji-mart.css">
</head>
<body>
<div id="app"></div>
Expand Down
5 changes: 4 additions & 1 deletion docs/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var path = require('path')
var pack = require('../package.json')
var webpack = require('webpack')

var CopyWebpackPlugin = require('copy-webpack-plugin')
var PROD = process.env.NODE_ENV === 'production'
var TEST = process.env.NODE_ENV === 'test'

Expand Down Expand Up @@ -52,6 +52,9 @@ var config = {
new webpack.DefinePlugin({
EMOJI_DATASOURCE_VERSION: `'${pack.devDependencies['emoji-datasource']}'`,
}),
new CopyWebpackPlugin([
'css/emoji-mart.css',
])
],

bail: true,
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-es2015": "6.6.0",
"babel-runtime": "^6.26.0",
"copy-webpack-plugin": "^4.6.0",
"css-loader": "^0.28.0",
"emoji-datasource": "4.0.4",
"emojilib": "^2.2.1",
Expand All @@ -55,7 +56,7 @@
"vue-loader": "^13.3.0",
"vue-style-loader": "^4.1.2",
"vue-template-compiler": "^2.5.2",
"webpack": "^3.6.0",
"webpack": "^3.12.0",
"webpack-dev-server": "^2.9.1"
},
"scripts": {
Expand Down
53 changes: 0 additions & 53 deletions src/components/anchors.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,56 +45,3 @@ export default {
}

</script>

<style scoped>

.emoji-mart-anchors {
display: flex;
flex-direction: row;
justify-content: space-between;
padding: 0 6px;
color: #858585;
line-height: 0;
}

.emoji-mart-anchor {
position: relative;
display: block;
flex: 1 1 auto;
text-align: center;
padding: 12px 4px;
overflow: hidden;
transition: color .1s ease-out;
}
.emoji-mart-anchor:hover,
.emoji-mart-anchor-selected {
color: #464646;
}

.emoji-mart-anchor-selected .emoji-mart-anchor-bar {
bottom: 0;
}

.emoji-mart-anchor-bar {
position: absolute;
bottom: -3px; left: 0;
width: 100%; height: 3px;
background-color: #464646;
}

.emoji-mart-anchors i {
display: inline-block;
width: 100%;
max-width: 22px;
}

</style>

<style>

.emoji-mart-anchors svg {
fill: currentColor;
max-height: 18px;
}

</style>
75 changes: 0 additions & 75 deletions src/components/category.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,78 +87,3 @@ export default {
}

</script>

<style scoped>

.emoji-mart-category {
position: relative;
}

.emoji-mart-category-label {
position: sticky;
top: 0;
}

.emoji-mart-category .emoji-mart-emoji:before {
z-index: 0;
content: "";
position: absolute;
top: 0; left: 0;
width: 100%; height: 100%;
background-color: #f4f4f4;
border-radius: 100%;
opacity: 0;
}

.emoji-mart-category .emoji-mart-emoji:hover:before {
opacity: 1;
}

.emoji-mart-category-label {
z-index: 2;
position: relative;
position: -webkit-sticky;
position: sticky;
top: 0;
}

.emoji-mart-category-label span {
display: block;
width: 100%;
font-weight: 500;
padding: 5px 6px;
background-color: #fff;
background-color: rgba(255, 255, 255, .95);
}

.emoji-mart-no-results {
font-size: 14px;
text-align: center;
padding-top: 70px;
color: #858585;
}

.emoji-mart-no-results .emoji-mart-category-label {
display: none;
}

.emoji-mart-no-results .emoji-mart-no-results-label {
margin-top: .2em;
}

.emoji-mart-no-results .emoji-mart-emoji:hover:before {
content: none;
}

</style>

<style>

.emoji-mart-category .emoji-mart-emoji span {
z-index: 1;
position: relative;
text-align: center;
cursor: default;
}

</style>
Loading