summaryrefslogtreecommitdiffstats
path: root/ui-react/src/theme
diff options
context:
space:
mode:
authorsebdet <sebastien.determe@intl.att.com>2019-08-26 05:47:01 -0700
committersebdet <sebastien.determe@intl.att.com>2019-08-26 05:47:01 -0700
commitd0d65631dfda6b43339e5c3dd1f1c336040d6672 (patch)
tree1b5f9b0afefb2e764f630042607753ea6d6941e8 /ui-react/src/theme
parent3f5a8564f29f0284377688f9d3c288baf475d57a (diff)
Fix the CSS
Remove colors settings in global css and add the theme property to the menubar correctly (not via global prop anymore) Issue-ID: CLAMP-477 Change-Id: Ie0ba1ea350e393d452108b1dadb10e7dbe1dab23 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Diffstat (limited to 'ui-react/src/theme')
-rw-r--r--ui-react/src/theme/globalStyle.js92
1 files changed, 41 insertions, 51 deletions
diff --git a/ui-react/src/theme/globalStyle.js b/ui-react/src/theme/globalStyle.js
index 0f6fb91c6..a0c338cd4 100644
--- a/ui-react/src/theme/globalStyle.js
+++ b/ui-react/src/theme/globalStyle.js
@@ -24,60 +24,50 @@
import { createGlobalStyle } from 'styled-components';
export const GlobalClampStyle = createGlobalStyle`
- body {
- padding: 0;
- margin: 0;
- font-family: ${props => props.theme.fontFamily};
- font-size: ${props => props.theme.fontSize};
- font-weight: normal;
- color: ${props => props.theme.fontNormal};
- background-color: ${props => props.theme.backgroundColor};
- }
+ body {
+ padding: 0;
+ margin: 0;
+ font-family: ${props => props.theme.fontFamily};
+ font-size: ${props => props.theme.fontSize};
+ font-weight: normal;
+ }
- span {
- font-family: ${props => props.theme.fontFamily};
- font-size: ${props => props.theme.fontSize};
- font-weight: bold;
- color: ${props => props.theme.fontNormal};
- background-color: ${props => props.theme.backgroundColor};
- }
-
- a {
- font-family: ${props => props.theme.fontFamily};
- font-size: ${props => props.theme.fontSize};
- font-weight: bold;
- color: ${props => props.theme.fontNormal};
- background-color: ${props => props.theme.backgroundColor};
+ span {
+ font-family: ${props => props.theme.fontFamily};
+ font-size: ${props => props.theme.fontSize};
+ font-weight: bold;
+ }
- }
-
- div {
- font-family: ${props => props.theme.fontFamily};
- font-size: ${props => props.theme.fontSize};
- border-radius: 4px;
- color: ${props => props.theme.fontNormal};
- background-color: ${props => (props.theme.backgroundColor)};
- margin-top: 1px;
- }
+ a {
+ font-family: ${props => props.theme.fontFamily};
+ font-size: ${props => props.theme.fontSize};
+ font-weight: bold;
+ }
- svg {
- overflow: hidden;
- width: 100%;
- height: 100%;
- }
-
- button {
- background-color: ${props => (props.theme.loopViewerHeaderBackgroundColor)};
- border: 1px;
- color: white;
- padding: 15px 32px;
- text-align: center;
- text-decoration: none;
- display: inline-block;
- font-size: ${props => props.theme.fontSize};
- font-family: ${props => props.theme.fontFamily};
+ div {
+ font-family: ${props => props.theme.fontFamily};
+ font-size: ${props => props.theme.fontSize};
+ border-radius: 4px;
+ margin-top: 1px;
+ }
- }
+ svg {
+ overflow: hidden;
+ width: 100%;
+ height: 100%;
+ }
+
+ label {
+ font-family: ${props => props.theme.fontFamily};
+ font-size: ${props => props.theme.fontSize};
+ font-weight: bold;
+ }
+
+ button {
+ font-family: ${props => props.theme.fontFamily};
+ font-size: ${props => props.theme.fontSize};
+ font-weight: bold;
+ }
`
export const DefaultClampTheme = {
@@ -90,7 +80,7 @@ export const DefaultClampTheme = {
backgroundColor: '#eeeeee',
fontFamily: 'Arial, Sans-serif',
- fontSize: '15px',
+ fontSize: '16px',
loopViewerBackgroundColor: 'white',
loopViewerFontColor: 'yellow',