cartodb/CartoAssets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix cr

Browse Source
This commit is contained in:
piensaenpixel 2016-02-09 17:48:57 +01:00
parent 1da800ecef
commit 7eec296963
12 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/fonts/cartoIcon.eot
View File

Binary file not shown.

BIN
src/fonts/cartoIcon.ttf
View File

Binary file not shown.

BIN
src/fonts/cartoIcon.woff
View File

Binary file not shown.

4
src/scss/cdb-components/boxes.scss
View File

@ -140,9 +140,9 @@
.CDB-BoxLoader-item { .CDB-BoxLoader-item {
@include display-flex(); @include display-flex();
padding: $baseSize 0; padding: $baseSize 0;
color: $cTypo2; color: $cSecondaryText;
&.is-working { &.is-working {
color: $cTypo3; color: $cAltText;
} }
} }

6
src/scss/cdb-components/colors.scss
View File

@ -89,13 +89,13 @@
.Color-Type02 { .Color-Type02 {
background: $cTypo2; background: $cSecondaryText;
} }
.Color-Type03 { .Color-Type03 {
background: $cTypo3; background: $cAltText;
} }
.Color-Type04 { .Color-Type04 {
background: $cTypo4; background: $cHintText;
} }

2
src/scss/cdb-components/forms/toggle.scss
View File

@ -33,7 +33,7 @@
height: $baseSize * 2; height: $baseSize * 2;
margin: 0 2px; margin: 0 2px;
border-radius: 50px; border-radius: 50px;
background: $cTypo4; background: $cHintText;
&::before { &::before {
position: absolute; position: absolute;

2
src/scss/cdb-components/headers.scss
View File

@ -216,7 +216,7 @@
border: 1px solid $cMainLine; border: 1px solid $cMainLine;
border-radius: 4px; border-radius: 4px;
background-color: $cWhite; background-color: $cWhite;
color: $cTypo3; color: $cAltText;
font-size: $sFontSize-small; font-size: $sFontSize-small;
line-height: 23px; line-height: 23px;
text-align: center; text-align: center;

4
src/scss/cdb-components/loader.scss
View File

@ -67,7 +67,7 @@ This is the generic loader for widgets, maps, components, ...
border: 2px solid $cMainLine; border: 2px solid $cMainLine;
border-radius: 50%; border-radius: 50%;
&.is-grey { &.is-grey {
border: 2px solid $cTypo2; border: 2px solid $cSecondaryText;
} }
} }
@ -107,7 +107,7 @@ This is the generic loader for widgets, maps, components, ...
&.is-grey { &.is-grey {
background: linear-gradient(to right, $cMainBg 10%, rgba($cWhite, 0) 42%); background: linear-gradient(to right, $cMainBg 10%, rgba($cWhite, 0) 42%);
&::before { &::before {
background: $cTypo2; background: $cSecondaryText;
} }
&::after { &::after {
background: $cMainBg; background: $cMainBg;

14
src/scss/cdb-components/menu.scss
View File

@ -97,8 +97,8 @@
} }
.CDB-NavMenu-Item.is-active .CDB-NavMenu-Link { .CDB-NavMenu-Item.is-active .CDB-NavMenu-Link {
border-bottom: 1px solid $cMainBg; border-bottom: 1px solid $cMainLine;
color: $cMainBg; color: $cMainText;
} }
.CDB-NavSubmenu { .CDB-NavSubmenu {
@ -118,8 +118,8 @@
.CDB-NavSubmenu-item.is-active { .CDB-NavSubmenu-item.is-active {
.CDB-NavSubmenu-Link { .CDB-NavSubmenu-Link {
border-bottom: 1px solid $cTypo3; border-bottom: 1px solid $cMainLine;
color: $cMainBg; color: $cMainText;
} }
} }
@ -131,12 +131,12 @@
.CDB-NavMenu-Inner, .CDB-NavMenu-Inner,
.CDB-NavSubmenu { .CDB-NavSubmenu {
border-bottom: 1px solid $cTypo2; border-bottom: 1px solid $cSecondaryText;
} }
.CDB-NavMenu-Link, .CDB-NavMenu-Link,
.CDB-NavSubmenu-Link { .CDB-NavSubmenu-Link {
color: $cTypo3; color: $cAltText;
} }
.CDB-NavMenu-Item.is-active { .CDB-NavMenu-Item.is-active {
@ -154,7 +154,7 @@
} }
.CDB-NavSubmenu-Status { .CDB-NavSubmenu-Status {
color: $cTypo2; color: $cSecondaryText;
} }
} }

2
src/scss/cdb-components/shapes/dots.scss
View File

@ -23,6 +23,6 @@ You may resize and change the colors of the icons with the `glyph-`-classes. Ava
background: $cSecondaryLine; background: $cSecondaryLine;
&.is-selected { &.is-selected {
background: $cTypo2; background: $cSecondaryText;
} }
} }

2
src/scss/cdb-utilities/defaults.css.scss
View File

@ -4,7 +4,7 @@
@import '../cdb-variables/colors'; @import '../cdb-variables/colors';
body { body {
color: $cTypoMain; color: $cMainText;
} }
a { a {

6
src/scss/cdb-utilities/helpers.scss
View File

@ -46,13 +46,13 @@
color: $cMainText; color: $cMainText;
} }
.u-secondaryTextColor { .u-secondaryTextColor {
color: $cTypo2; color: $cSecondaryText;
} }
.u-altTextColor { .u-altTextColor {
color: $cTypo3; color: $cAltText;
} }
.u-hintTextColor { .u-hintTextColor {
color: $cTypo4; color: $cHintText;
} }