Skip to content
This repository has been archived by the owner on Apr 15, 2019. It is now read-only.

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'development' into 1.1.0
Browse files Browse the repository at this point in the history
isabello committed Sep 5, 2017

Unverified

No user is associated with the committer email.
2 parents 5faf58b + bb62be5 commit 1f19648
Showing 27 changed files with 476 additions and 324 deletions.
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -110,7 +110,9 @@
"sinon-chai": "=2.8.0",
"sinon-stub-promise": "^4.0.0",
"style-loader": "=0.16.1",
"stylelint": "=7.12.0",
"stylelint": "^8.0.0",
"stylelint-config-standard": "^17.0.0",
"stylelint-webpack-plugin": "^0.9.0",
"url-loader": "=0.5.7",
"webpack": "=2.2.1",
"webpack-bundle-analyzer": "=2.4.0",
26 changes: 9 additions & 17 deletions src/assets/fonts/material-design-icons/style.css
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@

/* http://google.github.io/material-design-icons */

@font-face {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
src: url('../../assets/fonts/material-design-icons/MaterialIcons-Regular.eot'); /* For IE6-8 */
src: local('Material Icons'),
local('MaterialIcons-Regular'),
url('../../assets/fonts/material-design-icons/MaterialIcons-Regular.woff2') format('woff2'),
url('../../assets/fonts/material-design-icons/MaterialIcons-Regular.woff') format('woff'),
url('../../assets/fonts/material-design-icons/MaterialIcons-Regular.ttf') format('truetype');
src: url('../../assets/fonts/material-design-icons/MaterialIcons-Regular.eot');
src:
local('Material Icons'),
local('MaterialIcons-Regular'),
url('../../assets/fonts/material-design-icons/MaterialIcons-Regular.woff2') format('woff2'),
url('../../assets/fonts/material-design-icons/MaterialIcons-Regular.woff') format('woff'),
url('../../assets/fonts/material-design-icons/MaterialIcons-Regular.ttf') format('truetype');
}

:global .material-icons {
font-family: 'Material Icons';
font-weight: normal;
font-style: normal;
font-size: 24px; /* Preferred icon size */
font-size: 24px;
display: inline-block;
width: 1em;
height: 1em;
@@ -26,15 +25,8 @@
word-wrap: normal;
white-space: nowrap;
direction: ltr;

/* Support for all WebKit browsers. */
-webkit-font-smoothing: antialiased;
/* Support for Safari and Chrome. */
text-rendering: optimizeLegibility;

/* Support for Firefox. */
-moz-osx-font-smoothing: grayscale;

/* Support for IE. */
font-feature-settings: 'liga';
}
53 changes: 29 additions & 24 deletions src/assets/fonts/roboto-mono/style.css
Original file line number Diff line number Diff line change
@@ -1,42 +1,47 @@

/* https://google-webfonts-helper.herokuapp.com */

/* roboto-mono-regular - latin */
@font-face {
font-family: 'Roboto Mono';
font-style: normal;
font-weight: 400;
src: url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.eot'); /* IE9 Compat Modes */
src: local('Roboto Mono'), local('RobotoMono-Regular'),
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.woff') format('woff'), /* Modern Browsers */
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.svg#RobotoMono') format('svg'); /* Legacy iOS */
src: url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.eot');
src:
local('Roboto Mono'),
local('RobotoMono-Regular'),
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.eot?#iefix') format('embedded-opentype'),
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.woff2') format('woff2'),
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.woff') format('woff'),
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.ttf') format('truetype'),
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-regular.svg#RobotoMono') format('svg');
}

/* roboto-mono-500 - latin */
@font-face {
font-family: 'Roboto Mono';
font-style: normal;
font-weight: 500;
src: url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-500.eot'); /* IE9 Compat Modes */
src: local('Roboto Mono Medium'), local('RobotoMono-Medium'),
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-500.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-500.woff2') format('woff2'), /* Super Modern Browsers */
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-500.woff') format('woff'), /* Modern Browsers */
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-500.ttf') format('truetype'), /* Safari, Android, iOS */
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-500.svg#RobotoMono') format('svg'); /* Legacy iOS */
src: url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-500.eot');
src:
local('Roboto Mono Medium'),
local('RobotoMono-Medium'),
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-500.eot?#iefix') format('embedded-opentype'),
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-500.woff2') format('woff2'),
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-500.woff') format('woff'),
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-500.ttf') format('truetype'),
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-500.svg#RobotoMono') format('svg');
}

/* roboto-mono-700 - latin */
@font-face {
font-family: 'Roboto Mono';
font-style: normal;
font-weight: 700;
src: url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-700.eot'); /* IE9 Compat Modes */
src: local('Roboto Mono Bold'), local('RobotoMono-Bold'),
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-700.woff') format('woff'), /* Modern Browsers */
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-700.svg#RobotoMono') format('svg'); /* Legacy iOS */
src: url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-700.eot');
src:
local('Roboto Mono Bold'),
local('RobotoMono-Bold'),
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-700.eot?#iefix') format('embedded-opentype'),
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-700.woff2') format('woff2'),
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-700.woff') format('woff'),
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-700.ttf') format('truetype'),
url('../../assets/fonts/roboto-mono/roboto-mono-v4-latin-700.svg#RobotoMono') format('svg');
}
54 changes: 29 additions & 25 deletions src/assets/fonts/roboto/style.css
Original file line number Diff line number Diff line change
@@ -1,42 +1,46 @@

/* https://google-webfonts-helper.herokuapp.com */

/* roboto-regular - latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url('../../assets/fonts/roboto/roboto-v15-latin-regular.eot'); /* IE9 Compat Modes */
src: local('Roboto'), local('Roboto-Regular'),
url('../../assets/fonts/roboto/roboto-v15-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../../assets/fonts/roboto/roboto-v15-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
url('../../assets/fonts/roboto/roboto-v15-latin-regular.woff') format('woff'), /* Modern Browsers */
url('../../assets/fonts/roboto/roboto-v15-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
url('../../assets/fonts/roboto/roboto-v15-latin-regular.svg#Roboto') format('svg'); /* Legacy iOS */
src: url('../../assets/fonts/roboto/roboto-v15-latin-regular.eot');
src:
local('Roboto'),
local('Roboto-Regular'),
url('../../assets/fonts/roboto/roboto-v15-latin-regular.eot?#iefix') format('embedded-opentype'),
url('../../assets/fonts/roboto/roboto-v15-latin-regular.woff2') format('woff2'),
url('../../assets/fonts/roboto/roboto-v15-latin-regular.woff') format('woff'),
url('../../assets/fonts/roboto/roboto-v15-latin-regular.ttf') format('truetype'),
url('../../assets/fonts/roboto/roboto-v15-latin-regular.svg#Roboto') format('svg');
}

/* roboto-500 - latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 500;
src: url('../../assets/fonts/roboto/roboto-v15-latin-500.eot'); /* IE9 Compat Modes */
src: local('Roboto Medium'), local('Roboto-Medium'),
url('../../assets/fonts/roboto/roboto-v15-latin-500.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../../assets/fonts/roboto/roboto-v15-latin-500.woff2') format('woff2'), /* Super Modern Browsers */
url('../../assets/fonts/roboto/roboto-v15-latin-500.woff') format('woff'), /* Modern Browsers */
url('../../assets/fonts/roboto/roboto-v15-latin-500.ttf') format('truetype'), /* Safari, Android, iOS */
url('../../assets/fonts/roboto/roboto-v15-latin-500.svg#Roboto') format('svg'); /* Legacy iOS */
src: url('../../assets/fonts/roboto/roboto-v15-latin-500.eot');
src:
local('Roboto Medium'),
local('Roboto-Medium'),
url('../../assets/fonts/roboto/roboto-v15-latin-500.eot?#iefix') format('embedded-opentype'),
url('../../assets/fonts/roboto/roboto-v15-latin-500.woff2') format('woff2'),
url('../../assets/fonts/roboto/roboto-v15-latin-500.woff') format('woff'),
url('../../assets/fonts/roboto/roboto-v15-latin-500.ttf') format('truetype'),
url('../../assets/fonts/roboto/roboto-v15-latin-500.svg#Roboto') format('svg');
}

/* roboto-700 - latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 700;
src: url('../../assets/fonts/roboto/roboto-v15-latin-700.eot'); /* IE9 Compat Modes */
src: local('Roboto Bold'), local('Roboto-Bold'),
url('../../assets/fonts/roboto/roboto-v15-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../../assets/fonts/roboto/roboto-v15-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
url('../../assets/fonts/roboto/roboto-v15-latin-700.woff') format('woff'), /* Modern Browsers */
url('../../assets/fonts/roboto/roboto-v15-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
url('../../assets/fonts/roboto/roboto-v15-latin-700.svg#Roboto') format('svg'); /* Legacy iOS */
src: url('../../assets/fonts/roboto/roboto-v15-latin-700.eot');
src:
local('Roboto Bold'),
local('Roboto-Bold'),
url('../../assets/fonts/roboto/roboto-v15-latin-700.eot?#iefix') format('embedded-opentype'),
url('../../assets/fonts/roboto/roboto-v15-latin-700.woff2') format('woff2'),
url('../../assets/fonts/roboto/roboto-v15-latin-700.woff') format('woff'),
url('../../assets/fonts/roboto/roboto-v15-latin-700.ttf') format('truetype'),
url('../../assets/fonts/roboto/roboto-v15-latin-700.svg#Roboto') format('svg');
}
136 changes: 73 additions & 63 deletions src/components/account/account.css
Original file line number Diff line number Diff line change
@@ -1,77 +1,87 @@
:root{
--online: #73C8A9;
--offline: #F45D4C;
:root {
--online: #73cba9;
--offline: #f45d4c;
}
.wrapper{
margin: 8px -8px 16px;

.wrapper {
margin: 8px -8px 16px;
}

:global .online{
color: var(--online);
:global .online {
color: var(--online);
}
:global .offline{
color: var(--offline);

:global .offline {
color: var(--offline);
}

.value-wrapper {
position: relative;
position: relative;
width: 100%;
height: 70px;
text-align: center;
background: #eee;
overflow: hidden;

& :global .inner {
font-size: 100%;
color: #5f696e;
display: inline-block;
width: 100%;
height: 70px;
text-align: center;
background: #eee;
overflow: hidden;
& :global .inner{
font-size: 100%;
color: #5f696e;
display: inline-block;
width: 100%;
margin: 0;
box-sizing: border-box;
position: relative;
z-index: 1;
&.primary{
font-weight: bold;
padding: 9px 9px;
}
&.secondary{
font-size: 100%;
}
&.full{
line-height: 51px;
height: 70px;
}
&.tooltip {
position: absolute;
z-index: 1;
width: 100%;
text-align: center;
left: 0;
top: 100%;
transition: all ease 200ms;
font-size: 85% !important;
z-index: 0;
}
&.hasTip:hover{
color: #000;

}
&.hasTip:hover + .tooltip {
top: 45px;
}
margin: 0;
box-sizing: border-box;
position: relative;
z-index: 1;

&.primary {
font-weight: bold;
padding: 9px;
}
& :global .status {
position: absolute;
top: 5px;
right: 5px;

&.secondary {
font-size: 100%;
}

&.full {
line-height: 51px;
height: 70px;
}

&.tooltip {
position: absolute;
width: 100%;
text-align: center;
left: 0;
top: 100%;
transition: all ease 200ms;
font-size: 85% !important;
z-index: 0;
}

&.hasTip:hover {
color: #000;
}

&.hasTip:hover + .tooltip {
top: 45px;
}
}

& :global .status {
position: absolute;
top: 5px;
right: 5px;
}
}

.title {
font-size: 20px;
font-weight: 500;
letter-spacing: 0;
margin-top: 0;
margin-top: 20px;
margin-bottom: 16px;
text-align: center;
font-size: 20px;
font-weight: 500;
letter-spacing: 0;
margin-top: 0;
margin-top: 20px;
margin-bottom: 16px;
text-align: center;
}

@media only screen and (min-width: 48em) {
Loading

0 comments on commit 1f19648

Please sign in to comment.