diff options
| author |   Avi Gaffa <avi.gaffa@amdocs.com> | 2017-11-15 10:41:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-11-15 10:41:36 +0000 |
| commit | 68ca07bdc8b0aa86e31d06c083d73a140798f04d (patch) | |
| tree | 1a6d941ab8b11b87d737e1b18f5384470f5a7c84 | |
| parent | d52194fd5b45b5af0e0a9698b456f9945522bd80 (diff) | |
| parent | 78810b5975f453e84111ed413ebec26b4ed1fd33 (diff) | |
Merge "licens violation issue fix"
| -rw-r--r-- | openecomp-ui/.storybook/fonts/omnes-att-bold.otf | bin | 153056 -> 0 bytes | |||
| -rw-r--r-- | openecomp-ui/.storybook/fonts/omnes-att-light.ttf | bin | 73968 -> 0 bytes | |||
| -rw-r--r-- | openecomp-ui/.storybook/fonts/omnes-att-medium.ttf | bin | 65152 -> 0 bytes | |||
| -rw-r--r-- | openecomp-ui/.storybook/fonts/omnes-att-regular.ttf | bin | 71692 -> 0 bytes | |||
| -rw-r--r-- | openecomp-ui/.storybook/storybook.scss | 26 |
5 files changed, 2 insertions, 24 deletions
diff --git a/openecomp-ui/.storybook/fonts/omnes-att-bold.otf b/openecomp-ui/.storybook/fonts/omnes-att-bold.otf Binary files differdeleted file mode 100644 index 136afca84c..0000000000 --- a/openecomp-ui/.storybook/fonts/omnes-att-bold.otf +++ /dev/null diff --git a/openecomp-ui/.storybook/fonts/omnes-att-light.ttf b/openecomp-ui/.storybook/fonts/omnes-att-light.ttf Binary files differdeleted file mode 100644 index 273761ab3d..0000000000 --- a/openecomp-ui/.storybook/fonts/omnes-att-light.ttf +++ /dev/null diff --git a/openecomp-ui/.storybook/fonts/omnes-att-medium.ttf b/openecomp-ui/.storybook/fonts/omnes-att-medium.ttf Binary files differdeleted file mode 100644 index 2740425412..0000000000 --- a/openecomp-ui/.storybook/fonts/omnes-att-medium.ttf +++ /dev/null diff --git a/openecomp-ui/.storybook/fonts/omnes-att-regular.ttf b/openecomp-ui/.storybook/fonts/omnes-att-regular.ttf Binary files differdeleted file mode 100644 index 2342be4be5..0000000000 --- a/openecomp-ui/.storybook/fonts/omnes-att-regular.ttf +++ /dev/null diff --git a/openecomp-ui/.storybook/storybook.scss b/openecomp-ui/.storybook/storybook.scss index ed63bb9ab5..fabe892f38 100644 --- a/openecomp-ui/.storybook/storybook.scss +++ b/openecomp-ui/.storybook/storybook.scss @@ -1,32 +1,10 @@ $PORT: '9090'; $PROD_MACHINE: '10.147.92.78'; -@font-face { - font-family: omnes-light; - src: url('http://localhost:#{$PORT}/omnes-att-light.ttf'), - url('http://#{$PROD_MACHINE}:#{$PORT}/omnes-att-light.ttf'); -} - -@font-face { - font-family: omnes-regular; - src: url('http://localhost:#{$PORT}/omnes-att-regular.ttf'), - url('http://#{$PROD_MACHINE}:#{$PORT}/omnes-att-regular.ttf'); -} - -@font-face { - font-family: omnes-medium; - src: url('http://localhost:#{$PORT}/omnes-att-medium.ttf'), - url('http://#{$PROD_MACHINE}:#{$PORT}/omnes-att-medium.ttf'); -} - -@font-face { - font-family: omnes-bold; - src: url('http://localhost:#{$PORT}/omnes-att-bold.otf'), - url('http://#{$PROD_MACHINE}:#{$PORT}/omnes-att-bold.otf'); -} +@import url('https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700'); body { @import '../resources/scss/bootstrap.scss'; - font-family: omnes-medium,sans-serif; + font-family: 'Open Sans',sans-serif; font-size: 14px; }
\ No newline at end of file |