Skip to content

Commit

Permalink
Merge pull request #29 from drzzle-app/mediaSiteTypes
Browse files Browse the repository at this point in the history
Media site types
  • Loading branch information
runrog authored May 4, 2021
2 parents 39d87ed + b0e607c commit 9327dcd
Show file tree
Hide file tree
Showing 16 changed files with 189 additions and 44 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ src/router/routes.js
static/css/
static/fonts/
static/icons/
static/js/
dist/index.html
dist/static
scripts/deploy-docs.sh
Expand Down
5 changes: 5 additions & 0 deletions build/webpack.dev.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ const devWebpackConfig = merge(baseWebpackConfig, {
{ from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') },
],
},
headers: {
'Access-Control-Allow-Origin': '*',
'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, PATCH, OPTIONS',
'Access-Control-Allow-Headers': 'X-Requested-With, content-type, Authorization'
},
hot: true,
contentBase: false, // since we use CopyWebpackPlugin.
compress: true,
Expand Down
2 changes: 2 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ const buildSearch = () => {

const buildModules = async () => {
await fse.copy('./src/js-lib/modules', './dist/js/modules', { overwrite: true });
await fse.copy('./src/js-lib/modules', './static/js/modules', { overwrite: true });
};

const bundleJs = async () =>
Expand Down Expand Up @@ -331,6 +332,7 @@ const buildJsPlugins = async () => {
},
}))
.pipe(gulp.dest('./dist/js/'))
.pipe(gulp.dest('./static/js/'))
.on('end', () => {
console.log(colors.green('Successfully built Picazzo javascript library!'));
resolve();
Expand Down
40 changes: 40 additions & 0 deletions src/icons/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2997,6 +2997,46 @@
"search": [
"mobile-device-small"
]
},
{
"uid": "fb4794d89b77ab712ad56c0dc4c76c6b",
"css": "spotify",
"code": 61884,
"src": "fontawesome"
},
{
"uid": "dff942d95eb1b3f1be140e622d0a7c74",
"css": "soundcloud",
"code": 61886,
"src": "fontawesome"
},
{
"uid": "26803a0a73bcf75fcfe9e0e05a1f412b",
"css": "media-group",
"code": 59616,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M982.2 268.6H919.5V205.8C919.5 195.4 912.2 188.1 901.7 188.1H839V124.3C839 113.9 831.7 106.5 821.2 106.5H17.8C7.3 106.6 0 113.9 0 124.3V713.6C0 723.1 7.3 731.4 17.8 731.4H80.5V795.2C80.5 804.6 87.8 813 98.3 813H161V875.7C161 885.1 168.3 893.5 178.8 893.5H982.4C992.8 893.5 1000.2 885.1 1000.2 875.7V286.3C1000 275.8 992.7 268.6 982.2 268.6ZM34.5 695.9V141.1H804.6V188.1H98.2C87.8 188.1 80.4 195.4 80.4 205.9V696H34.5ZM114.9 777.5V731.4 695.9 222.5H804.6 839.1 885.1V268.6H839.1 804.6 178.6C168.2 268.6 160.8 275.8 160.8 286.4V695.9 731.4 777.5H114.9ZM965.5 857.9H195.4V813 777.5 731.4 695.9 303.1H804.6 839.1 885.1 919.6 965.6V857.9ZM717.9 566.4C722 569.5 725.2 574.7 725.2 581 725.2 586.3 722 592.5 717.9 595.7L516.2 729.4C510.9 732.5 503.6 733.6 498.4 730.4 493.2 727.3 489.1 721 489.1 714.7V447.2C489.1 439.9 493.2 434.7 498.5 431.5 500.5 429.5 503.6 429.5 506.8 429.5 509.9 429.5 513.1 430.5 516.2 432.6L717.9 566.4Z",
"width": 1000
},
"search": [
"media-group"
]
},
{
"uid": "026e21c3390decf22f15ab92542896ae",
"css": "item-group",
"code": 59617,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M982.2 268.6H919.5V205.8C919.5 195.4 912.2 188.1 901.7 188.1H839V124.3C839 113.9 831.7 106.5 821.2 106.5H17.8C7.3 106.6 0 113.9 0 124.3V713.6C0 723.1 7.3 731.4 17.8 731.4H80.5V795.2C80.5 804.6 87.8 813 98.3 813H161V875.7C161 885.1 168.3 893.5 178.8 893.5H982.4C992.8 893.5 1000.2 885.1 1000.2 875.7V286.3C1000 275.8 992.7 268.6 982.2 268.6ZM34.5 695.9V141.1H804.6V188.1H98.2C87.8 188.1 80.4 195.4 80.4 205.9V696H34.5ZM114.9 777.5V731.4 695.9 222.5H804.6 839.1 885.1V268.6H839.1 804.6 178.6C168.2 268.6 160.8 275.8 160.8 286.4V695.9 731.4 777.5H114.9ZM965.5 857.9H195.4V813 777.5 731.4 695.9 303.1H804.6 839.1 885.1 919.6 965.6V857.9Z",
"width": 1000
},
"search": [
"item-group"
]
}
]
}
4 changes: 4 additions & 0 deletions src/icons/css/drzzle-codes.css
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,8 @@
.drzicon-place-box:before { content: '\e8dd'; } /* '' */
.drzicon-place-card:before { content: '\e8de'; } /* '' */
.drzicon-mobile-device-small:before { content: '\e8df'; } /* '' */
.drzicon-media-group:before { content: '\e8e0'; } /* '' */
.drzicon-item-group:before { content: '\e8e1'; } /* '' */
.drzicon-move:before { content: '\f047'; } /* '' */
.drzicon-link-ext:before { content: '\f08e'; } /* '' */
.drzicon-twitter:before { content: '\f099'; } /* '' */
Expand Down Expand Up @@ -278,6 +280,8 @@
.drzicon-behance:before { content: '\f1b4'; } /* '' */
.drzicon-behance-squared:before { content: '\f1b5'; } /* '' */
.drzicon-recycle:before { content: '\f1b8'; } /* '' */
.drzicon-spotify:before { content: '\f1bc'; } /* '' */
.drzicon-soundcloud:before { content: '\f1be'; } /* '' */
.drzicon-file-pdf:before { content: '\f1c1'; } /* '' */
.drzicon-git:before { content: '\f1d3'; } /* '' */
.drzicon-paragraph:before { content: '\f1dd'; } /* '' */
Expand Down
16 changes: 10 additions & 6 deletions src/icons/css/drzzle-embedded.css

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions src/icons/css/drzzle-ie7-codes.css
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,8 @@
.drzicon-place-box { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-place-card { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-mobile-device-small { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-media-group { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-item-group { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-move { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-link-ext { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-twitter { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Expand Down Expand Up @@ -278,6 +280,8 @@
.drzicon-behance { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-behance-squared { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-recycle { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-spotify { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-soundcloud { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-file-pdf { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-git { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-paragraph { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Expand Down
4 changes: 4 additions & 0 deletions src/icons/css/drzzle-ie7.css
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,8 @@
.drzicon-place-box { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-place-card { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-mobile-device-small { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-media-group { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-item-group { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-move { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-link-ext { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-twitter { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Expand Down Expand Up @@ -289,6 +291,8 @@
.drzicon-behance { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-behance-squared { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-recycle { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-spotify { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-soundcloud { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-file-pdf { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-git { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.drzicon-paragraph { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Expand Down
18 changes: 11 additions & 7 deletions src/icons/css/drzzle.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@font-face {
font-family: 'drzzle';
src: url('../font/drzzle.eot?21518136');
src: url('../font/drzzle.eot?21518136#iefix') format('embedded-opentype'),
url('../font/drzzle.woff2?21518136') format('woff2'),
url('../font/drzzle.woff?21518136') format('woff'),
url('../font/drzzle.ttf?21518136') format('truetype'),
url('../font/drzzle.svg?21518136#drzzle') format('svg');
src: url('../font/drzzle.eot?14148166');
src: url('../font/drzzle.eot?14148166#iefix') format('embedded-opentype'),
url('../font/drzzle.woff2?14148166') format('woff2'),
url('../font/drzzle.woff?14148166') format('woff'),
url('../font/drzzle.ttf?14148166') format('truetype'),
url('../font/drzzle.svg?14148166#drzzle') format('svg');
font-weight: normal;
font-style: normal;
}
Expand All @@ -15,7 +15,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'drzzle';
src: url('../font/drzzle.svg?21518136#drzzle') format('svg');
src: url('../font/drzzle.svg?14148166#drzzle') format('svg');
}
}
*/
Expand Down Expand Up @@ -279,6 +279,8 @@
.drzicon-place-box:before { content: '\e8dd'; } /* '' */
.drzicon-place-card:before { content: '\e8de'; } /* '' */
.drzicon-mobile-device-small:before { content: '\e8df'; } /* '' */
.drzicon-media-group:before { content: '\e8e0'; } /* '' */
.drzicon-item-group:before { content: '\e8e1'; } /* '' */
.drzicon-move:before { content: '\f047'; } /* '' */
.drzicon-link-ext:before { content: '\f08e'; } /* '' */
.drzicon-twitter:before { content: '\f099'; } /* '' */
Expand Down Expand Up @@ -334,6 +336,8 @@
.drzicon-behance:before { content: '\f1b4'; } /* '' */
.drzicon-behance-squared:before { content: '\f1b5'; } /* '' */
.drzicon-recycle:before { content: '\f1b8'; } /* '' */
.drzicon-spotify:before { content: '\f1bc'; } /* '' */
.drzicon-soundcloud:before { content: '\f1be'; } /* '' */
.drzicon-file-pdf:before { content: '\f1c1'; } /* '' */
.drzicon-git:before { content: '\f1d3'; } /* '' */
.drzicon-paragraph:before { content: '\f1dd'; } /* '' */
Expand Down
Loading

0 comments on commit 9327dcd

Please sign in to comment.