From a287b306beac2d02e3c991a30a0500e0c78937ef Mon Sep 17 00:00:00 2001 From: xidedix Date: Fri, 16 Mar 2018 15:31:04 +0100 Subject: [PATCH] fix: temporary add dependency to git @coreui/react --- package.json | 4 +-- src/containers/Full/Full.js | 2 +- src/containers/Full/FullHeader.js | 2 +- src/scss/style.css | 41 ------------------------------- 4 files changed, 4 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index 8a99897..044f28b 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,8 @@ "url": "git@github.com:mrholek/CoreUI-React.git" }, "dependencies": { - "@coreui/styles": "git://github.com/coreui/styles.git", - "@coreui/react-dev": "git://github.com/coreui/react.git", + "@coreui/styles": "next", + "@coreui/react": "git://github.com/coreui/react.git", "bootstrap": "4.0.0", "chart.js": "2.7.2", "classnames": "^2.2.3", diff --git a/src/containers/Full/Full.js b/src/containers/Full/Full.js index 9f8cb7b..ccac0b0 100644 --- a/src/containers/Full/Full.js +++ b/src/containers/Full/Full.js @@ -13,7 +13,7 @@ import { AppSidebarHeader, AppSidebarMinimizer, AppSidebarNav, -} from '@coreui/react-dev'; +} from '@coreui/react'; // sidebar nav config import navigation from '../../_nav'; // routes config diff --git a/src/containers/Full/FullHeader.js b/src/containers/Full/FullHeader.js index ae07656..5a7fa68 100644 --- a/src/containers/Full/FullHeader.js +++ b/src/containers/Full/FullHeader.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { Badge, DropdownItem, DropdownMenu, DropdownToggle, Nav, NavItem, NavLink } from 'reactstrap'; import PropTypes from 'prop-types'; -import { AppAsideToggler, AppHeaderDropdown, AppNavbarBrand, AppSidebarToggler } from '@coreui/react-dev'; +import { AppAsideToggler, AppHeaderDropdown, AppNavbarBrand, AppSidebarToggler } from '@coreui/react'; const propTypes = { children: PropTypes.node, diff --git a/src/scss/style.css b/src/scss/style.css index 79592aa..b5d0e7c 100644 --- a/src/scss/style.css +++ b/src/scss/style.css @@ -1,11 +1,3 @@ -@charset "UTF-8"; -/*! - * CoreUI - Open Source Dashboard UI Kit - * @version v2.0.0-alpha.2 - * @link https://coreui.io - * Copyright (c) 2018 creativeLabs Ɓukasz Holeczek - * Licensed under MIT (https://coreui.io/license) - */ /*! * Bootstrap v4.0.0 (https://getbootstrap.com) * Copyright 2011-2018 The Bootstrap Authors @@ -7011,39 +7003,6 @@ button { base-chart.chart { display: block; } -canvas { - user-select: none; } - -.chartjs-tooltip { - position: absolute; - z-index: 1021; - display: flex; - flex-direction: column; - padding: 0.25rem 0.5rem; - color: #fff; - pointer-events: none; - background: rgba(0, 0, 0, 0.7); - border-radius: 0.25rem; - opacity: 0; - transition: all .1s ease; - transform: translate(-50%, 0); } - .chartjs-tooltip .tooltip-header { - margin-bottom: 0.5rem; } - .chartjs-tooltip .tooltip-header-item { - font-size: 0.76563rem; - font-weight: 700; } - .chartjs-tooltip .tooltip-body-item { - display: flex; - align-items: center; - font-size: 0.76563rem; - white-space: nowrap; } - -.chartjs-tooltip-key { - display: inline-block; - width: 0.875rem; - height: 0.875rem; - margin-right: 0.875rem; } - .dropdown-item { position: relative; padding: 10px 20px;