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

Jump to bottom

TASK: Extract fonts to load seperatelty #821

Merged
merged 2 commits into from
Aug 31, 2017
Merged

TASK: Extract fonts to load seperatelty #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0242e3
TASK: Extract fonts to load seperatelty
mstruebing Aug 13, 2017
c44508a
TASK: Update font-handling
mstruebing Aug 31, 2017
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
Binary file added Resources/Public/Fonts/WorkSans-Bold.woff
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Public/Fonts/WorkSans-Regular.woff
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/build-essentials/src/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const webpackConfig = {
loader: 'json-loader'
},
{
test: /\.(woff|woff2|eot|svg)$/,
test: /\.(woff|woff2)$/,
loader: 'url-loader?limit=100000'
},
{
Expand Down
2 changes: 0 additions & 2 deletions packages/neos-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@
"redux-saga": "^0.12.0",
"regenerator": "^0.8.46",
"reselect": "^2.4.0",
"typeface-work-sans": "0.0.31",
"url-loader": "^0.5.9",
"uuid": "^2.0.2",
"whatwg-fetch": "^1.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/neos-ui/src/Containers/FlashMessages/FlashMessage/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
padding: 12px 49px 12px;
margin-bottom: 0;
color: white;
font-weight: 400;
font-weight: normal;
font-size: 14px;
line-height: 14px;
}
Expand Down
2 changes: 0 additions & 2 deletions packages/neos-ui/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ import {put} from 'redux-saga/effects';
import {Map} from 'immutable';
import merge from 'lodash.merge';

require('typeface-work-sans');

import {reducer, actions} from '@neos-project/neos-ui-redux-store';
import {createConsumerApi} from '@neos-project/neos-ui-extensibility';
import {SynchronousMetaRegistry} from '@neos-project/neos-ui-extensibility/src/registry';
Expand Down
16 changes: 15 additions & 1 deletion packages/neos-ui/src/styleHostOnly.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
@import 'normalize.css';

@font-face {
font-family: 'Work Sans';
src: url('../../../Resources/Public/Fonts/WorkSans-Regular.woff') format('woff');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Work Sans';
src: url('../../../Resources/Public/Fonts/WorkSans-Bold.woff') format('woff');
font-weight: bold;
font-style: normal;
}

* {
box-sizing: border-box;
}

body {
font-family: 'Noto Sans', sans-serif;
font-family: 'Work Sans', sans-serif;
-webkit-font-smoothing: antialiased;
font-size: 14px;
line-height: 20px;
Expand Down
35 changes: 0 additions & 35 deletions packages/neos-ui/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ bezier-easing@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/bezier-easing/-/bezier-easing-2.0.3.tgz#cb493fddb7f8920ecca00973344ce0518885f17e"

big.js@^3.1.3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.1.3.tgz#4cada2193652eb3ca9ec8e55c9015669c9806978"

brace-expansion@^1.1.7:
version "1.1.8"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
Expand Down Expand Up @@ -180,10 +176,6 @@ detective@^4.3.1:
acorn "^4.0.3"
defined "^1.0.0"

emojis-list@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"

encoding@^0.1.11:
version "0.1.12"
resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
Expand Down Expand Up @@ -298,10 +290,6 @@ json2mq@^0.2.0:
dependencies:
string-convert "^0.2.0"

json5@^0.5.0:
version "0.5.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"

kind-of@^3.0.2:
version "3.2.2"
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
Expand All @@ -318,14 +306,6 @@ lcid@^1.0.0:
dependencies:
invert-kv "^1.0.0"

loader-utils@^1.0.2:
version "1.1.0"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
dependencies:
big.js "^3.1.3"
emojis-list "^2.0.0"
json5 "^0.5.0"

lodash-es@^4.2.0, lodash-es@^4.2.1:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7"
Expand Down Expand Up @@ -420,10 +400,6 @@ mime-types@^2.1.10:
dependencies:
mime-db "~1.27.0"

mime@1.3.x:
version "1.3.6"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"

"minimatch@2 || 3":
version "3.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
Expand Down Expand Up @@ -801,21 +777,10 @@ tryor@~0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/tryor/-/tryor-0.1.2.tgz#8145e4ca7caff40acde3ccf946e8b8bb75b4172b"

typeface-work-sans@0.0.31:
version "0.0.31"
resolved "https://registry.yarnpkg.com/typeface-work-sans/-/typeface-work-sans-0.0.31.tgz#3024ea398afae7a413ce391928d5d03ea244b0a5"

ua-parser-js@^0.7.9:
version "0.7.13"
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.13.tgz#cd9dd2f86493b3f44dbeeef3780fda74c5ee14be"

url-loader@^0.5.9:
version "0.5.9"
resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.9.tgz#cc8fea82c7b906e7777019250869e569e995c295"
dependencies:
loader-utils "^1.0.2"
mime "1.3.x"

uuid@^2.0.2:
version "2.0.3"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
Expand Down
2 changes: 1 addition & 1 deletion packages/react-ui-components/src/DateInput/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@
width: 37px;
height: 40px;
line-height: 40px;
font-weight: 400;
font-weight: normal;
font-size: var(--baseFontSize);
border: 0;
border-right: 1px solid var(--brandColorsContrastNeutral);
Expand Down
2 changes: 1 addition & 1 deletion packages/react-ui-components/src/TextArea/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}
}
.textArea::-webkit-input-placeholder {
font-family: 'Noto Sans', sans-serif;
font-family: 'Work Sans', sans-serif;
color: var(--brandColorsContrastBright);
}
.textArea--invalid {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-ui-components/src/TextInput/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}
}
.textInput::-webkit-input-placeholder {
font-family: 'Noto Sans', sans-serif;
font-family: 'Work Sans', sans-serif;
color: var(--brandColorsContrastBright);
}
.textInput--invalid {
Expand Down