diff --git a/src/editor/config/config.js b/src/editor/config/config.js index 5770ba252..2d0487aa9 100644 --- a/src/editor/config/config.js +++ b/src/editor/config/config.js @@ -215,7 +215,7 @@ define(function () { id: 'quo', label: 'Quote', content: '
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore ipsum dolor sit
', - attributes: {class:'gjs-fonts gjs-f-quo'} + attributes: {class:'fa fa-quote-right'} },{ id: 'link', label: 'Link', diff --git a/styles/css/main.css b/styles/css/main.css index 6df66474f..5711672c1 100644 --- a/styles/css/main.css +++ b/styles/css/main.css @@ -2570,8 +2570,8 @@ $fontColorActive: #4f8ef7; /* #515151 */ @font-face { font-family: 'font3336'; - src: url("../fonts/main-fonts.eot?v=5"); - src: url("../fonts/main-fonts.woff?v=5") format("woff"), url("../fonts/main-fonts.ttf?v=5") format("truetype"), url("../fonts/main-fonts.svg?v=5") format("svg"), url("../fonts/main-fonts.eot?v=5") format("embedded-opentype"); + src: url("../fonts/main-fonts.eot?v=20"); + src: url("../fonts/main-fonts.woff?v=20") format("woff"), url("../fonts/main-fonts.ttf?v=20") format("truetype"), url("../fonts/main-fonts.svg?v=20") format("svg"), url("../fonts/main-fonts.eot?v=20") format("embedded-opentype"); font-weight: normal; font-style: normal; } @@ -2584,19 +2584,19 @@ $fontColorActive: #4f8ef7; font-size: 5em; } .gjs-f-b1::before { - content: 'q'; } + content: 'Q'; } .gjs-f-b2::before { - content: 'w'; } + content: 'W'; } .gjs-f-b3::before { - content: 'e'; } + content: 'E'; } .gjs-f-b37::before { - content: 'r'; } + content: 'R'; } .gjs-f-hero::before { - content: 't'; } + content: 'T'; } .gjs-f-h1p::before { content: 'y'; } @@ -2605,7 +2605,7 @@ $fontColorActive: #4f8ef7; content: 'u'; } .gjs-f-image::before { - content: 'i'; } + content: 'I'; } .gjs-f-text::before { content: 'o'; } @@ -3898,7 +3898,7 @@ ol.example li.placeholder:before { float: left; } .gjs-am-file-uploader > form { background-color: rgba(0, 0, 0, 0.1); - border: 2px dashed #999999; + border: 2px dashed; border-radius: 3px; position: relative; text-align: center; diff --git a/styles/fonts/main-fonts.eot b/styles/fonts/main-fonts.eot index 5882dcaff..b0a083bf0 100644 Binary files a/styles/fonts/main-fonts.eot and b/styles/fonts/main-fonts.eot differ diff --git a/styles/fonts/main-fonts.svg b/styles/fonts/main-fonts.svg index 99e5dcd1b..ff483d535 100644 --- a/styles/fonts/main-fonts.svg +++ b/styles/fonts/main-fonts.svg @@ -18,6 +18,20 @@ sodipodi:docname="main-fonts.svg"> + + + + + + + + + + + + image/svg+xml - + @@ -154,18 +213,18 @@ transform="translate(0,-52.36227)"> Borders: 20pxBorders: 30pxCanvas: 1000x1000px + id="flowPara4179">Canvas: 1000x1000px + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/styles/fonts/main-fonts.ttf b/styles/fonts/main-fonts.ttf index a93ed4513..4399759ff 100644 Binary files a/styles/fonts/main-fonts.ttf and b/styles/fonts/main-fonts.ttf differ diff --git a/styles/fonts/main-fonts.woff b/styles/fonts/main-fonts.woff index a64309930..77e183be9 100644 Binary files a/styles/fonts/main-fonts.woff and b/styles/fonts/main-fonts.woff differ diff --git a/styles/scss/main.scss b/styles/scss/main.scss index 6554381a3..ab89a9fec 100644 --- a/styles/scss/main.scss +++ b/styles/scss/main.scss @@ -44,7 +44,7 @@ $leftWidth: 15%; $fontPath: '../fonts'; $fontName: 'main-fonts'; -$fontV: 5;//random(1000) +$fontV: 20;//random(1000) @font-face { font-family: 'font3336'; @@ -96,14 +96,14 @@ $fontV: 5;//random(1000) -moz-osx-font-smoothing: grayscale; font-size: 5em; } -.#{$app-prefix}f-b1::before { content: 'q'; } -.#{$app-prefix}f-b2::before { content: 'w'; } -.#{$app-prefix}f-b3::before { content: 'e'; } -.#{$app-prefix}f-b37::before { content: 'r'; } -.#{$app-prefix}f-hero::before { content: 't'; } +.#{$app-prefix}f-b1::before { content: 'Q'; } +.#{$app-prefix}f-b2::before { content: 'W'; } +.#{$app-prefix}f-b3::before { content: 'E'; } +.#{$app-prefix}f-b37::before { content: 'R'; } +.#{$app-prefix}f-hero::before { content: 'T'; } .#{$app-prefix}f-h1p::before { content: 'y'; } .#{$app-prefix}f-3ba::before { content: 'u'; } -.#{$app-prefix}f-image::before { content: 'i'; } +.#{$app-prefix}f-image::before { content: 'I'; } .#{$app-prefix}f-text::before { content: 'o'; } .#{$app-prefix}f-quo::before { content: 'p'; } @@ -1343,7 +1343,7 @@ $uploadPadding: 150px 10px; > form { background-color: $mainDklColor; - border: 2px dashed #999999; + border: 2px dashed; border-radius: 3px; position: relative; text-align: center;