Skip to content

Commit

Permalink
Update style
Browse files Browse the repository at this point in the history
  • Loading branch information
artf committed Dec 6, 2016
1 parent c3c5f68 commit 0ec6409
Show file tree
Hide file tree
Showing 7 changed files with 179 additions and 31 deletions.
2 changes: 1 addition & 1 deletion src/editor/config/config.js
Expand Up @@ -215,7 +215,7 @@ define(function () {
id: 'quo',
label: 'Quote',
content: '<blockquote class="quote">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore ipsum dolor sit</blockquote>',
attributes: {class:'gjs-fonts gjs-f-quo'}
attributes: {class:'fa fa-quote-right'}
},{
id: 'link',
label: 'Link',
Expand Down
18 changes: 9 additions & 9 deletions styles/css/main.css
Expand Up @@ -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; }

Expand All @@ -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'; }
Expand All @@ -2605,7 +2605,7 @@ $fontColorActive: #4f8ef7;
content: 'u'; }

.gjs-f-image::before {
content: 'i'; }
content: 'I'; }

.gjs-f-text::before {
content: 'o'; }
Expand Down Expand Up @@ -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;
Expand Down
Binary file modified styles/fonts/main-fonts.eot
Binary file not shown.
174 changes: 161 additions & 13 deletions styles/fonts/main-fonts.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified styles/fonts/main-fonts.ttf
Binary file not shown.
Binary file modified styles/fonts/main-fonts.woff
Binary file not shown.
16 changes: 8 additions & 8 deletions styles/scss/main.scss
Expand Up @@ -44,7 +44,7 @@ $leftWidth: 15%;

$fontPath: '../fonts';
$fontName: 'main-fonts';
$fontV: 5;//random(1000)
$fontV: 20;//random(1000)

@font-face {
font-family: 'font3336';
Expand Down Expand Up @@ -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'; }

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 0ec6409

Please sign in to comment.