Skip to content

Commit

Permalink
Merge pull request #2271 from LiskHQ/2180-fix-warnings-after-renaming…
Browse files Browse the repository at this point in the history
…-V2-css

Fixed css warnings after renaming v2 css files
  • Loading branch information
massao committed Jul 26, 2019
2 parents daf1584 + 5d32426 commit 53f5ae6
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 168 deletions.
40 changes: 0 additions & 40 deletions src/components/accountTransactions/accountTransactions.css

This file was deleted.

3 changes: 1 addition & 2 deletions src/components/accountTransactions/accountTransactions.js
@@ -1,13 +1,12 @@
import React from 'react';
import grid from 'flexboxgrid/dist/flexboxgrid.css';
import ExplorerTransactions from '../transactions/explorerTransactions';
import styles from './accountTransactions.css';

class AccountTransactions extends React.Component {
render() {
return (
<div className={`${grid.row}`}>
<div className={`${grid['col-xs-12']} ${styles.transactions}`}>
<div className={`${grid['col-xs-12']}`}>
<ExplorerTransactions
history={this.props.history}
address={this.props.match.params.address}
Expand Down
36 changes: 0 additions & 36 deletions src/components/app/type.css
Expand Up @@ -145,39 +145,3 @@ textarea,
select {
font-family: var(--content-font);
}

@media (--xLarge-viewport) {
h2 {
font-size: var(--font-size-h2-xl);
}
}

@media (--large-viewport) {
h2 {
font-size: var(--font-size-h2-l);
}
}

@media (--medium-viewport) {
h2 {
font-size: var(--font-size-h2-m);
}

h5 {
font-size: var(--font-size-h5-m);
}
}

@media (--small-viewport) {
h2 {
font-size: var(--font-size-h2-s);
}

h5 {
font-size: var(--font-size-h5-s);
}

p {
font-size: var(--paragraph-font-size-s);
}
}
71 changes: 0 additions & 71 deletions src/components/delegates/delegates.css
@@ -1,18 +1,9 @@
@import '../app/variables.css';

:root {
--submit-button-height: 55px;
--filters-height: 55px;
}

.wrapper {
width: 100%;
margin: 0;

& > aside {
padding-left: 0;
}

& > section {
border-radius: 6px;
display: flex;
Expand All @@ -23,73 +14,11 @@
}
}

.sideBar {
padding-right: 0px;
}

.votes {
padding-left: 0px;
position: relative;
}

@media (--medium-viewport) {
.wrapper {
margin: 0;

& > section,
& > aside {
padding: 0;
}

& > section {
position: relative;
overflow-y: hidden;
}

& > aside {
position: fixed;
z-index: 2;
left: 0;
bottom: var(--footer-height-m);
max-height: 100%;
height: auto;
max-width: 100%;
}
}

.hasLayover {
& :global(.delegate-list-box) {
overflow: hidden;
opacity: 0;
}

& aside {
height: 100%;
height: calc(100% - var(--header-height-m) - var(--footer-height-m));
}
}

.wrapper:not(.hasLayover) aside > div {
background-color: transparent;
}
}

@media (--small-viewport) {
.wrapper {
& > section {
height: calc(100vh - var(--submit-button-height) - var(--header-height-s) - var(--footer-height-s)); /* stylelint-disable-line */
}

& > aside {
bottom: var(--footer-height-s);
}
}

.hasLayover aside {
height: calc(100% - var(--header-height-s) - var(--footer-height-s));
}
}

@media (max-width: 1025px) {
.votingBox {
flex-basis: 100%;
Expand Down
14 changes: 1 addition & 13 deletions src/components/loadingBar/loadingBar.css
Expand Up @@ -3,7 +3,7 @@
.fixedAtTop {
position: fixed;
top: -9px;
left: var(--sidebar-width);
left: 0;
width: 100vw; /* stylelint-disable-line */
z-index: 201;
}
Expand All @@ -17,15 +17,3 @@
background: var(--color-link-active);
}
}

@media (--xLarge-viewport) {
.fixedAtTop {
left: var(--sidebar-width-xl);
}
}

@media (--medium-viewport) {
.fixedAtTop {
left: 0;
}
}
8 changes: 3 additions & 5 deletions src/components/multiStep/multiStep.css
@@ -1,8 +1,6 @@
@import '../app/variables';

:root {
--link-color: var(--color-primary-medium);
--back-button-color: var(--color-grayscale-dark);
--nav-line-height: 32px;
--back-button-width-l: 75px;
--back-button-width-s: 65px;
Expand Down Expand Up @@ -37,7 +35,7 @@
& .backButton {
width: var(--back-button-width-l); /* to have equal width with its shadow */
cursor: pointer;
color: var(--link-color);
color: var(--color-link);
font-weight: bold;

& .icon {
Expand All @@ -52,13 +50,13 @@
}

& .navEl {
color: var(--link-color);
color: var(--color-link);
opacity: 0.4;

&.dash b {
width: 50px;
height: 0;
border-bottom: solid 2px var(--link-color);
border-bottom: solid 2px var(--color-link);
opacity: 0.5;
font-size: 0 !important;

Expand Down
2 changes: 1 addition & 1 deletion src/components/transactions/amount/transactionAmount.css
Expand Up @@ -10,7 +10,7 @@
font-weight: var(--font-weight-bold);

& .recieve {
border-radius: var(--border-radius-normal);
border-radius: var(--border-radius-standard);
display: inline-block;
height: 29px;
padding: 6px 12px;
Expand Down

0 comments on commit 53f5ae6

Please sign in to comment.