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

Syntax improvements

Browse Source
This commit is contained in:
María Checa 2016-02-01 12:18:35 +01:00
parent 0b3e6b44cc
commit 3a9a4beb0f
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/scss/cdb-components/forms/checkbox.scss
View File

@ -71,11 +71,11 @@
~ .CDB-CheckboxFace { ~ .CDB-CheckboxFace {
border: 1px solid $cBlue; border: 1px solid $cBlue;
background: $cBlue; background: $cBlue;
}
&::before, ~ .CDB-CheckboxFace::before,
&::after { ~ .CDB-CheckboxFace::after {
background: $cWhite; background: $cWhite;
}
} }
&:hover ~ .CDB-CheckboxFace { &:hover ~ .CDB-CheckboxFace {
@ -95,11 +95,11 @@
~ .CDB-CheckboxFace { ~ .CDB-CheckboxFace {
border: 1px solid $cSecondaryLine; border: 1px solid $cSecondaryLine;
background: $cThirdBackground; background: $cThirdBackground;
}
&::before, ~ .CDB-CheckboxFace::before,
&::after { ~ .CDB-CheckboxFace::after {
background: $cWhite; background: $cWhite;
}
} }
&:hover ~ .CDB-CheckboxFace { &:hover ~ .CDB-CheckboxFace {

12
src/scss/cdb-components/forms/radio.scss
View File

@ -60,10 +60,10 @@
~ .CDB-RadioFace { ~ .CDB-RadioFace {
border: 1px solid $cBlue; border: 1px solid $cBlue;
background: $cBlue; background: $cBlue;
}
&::before { ~ .CDB-RadioFace::before {
background: $cWhite; background: $cWhite;
}
} }
&:hover ~ .CDB-RadioFace { &:hover ~ .CDB-RadioFace {
@ -83,10 +83,10 @@
~ .CDB-RadioFace { ~ .CDB-RadioFace {
border: 1px solid $cSecondaryLine; border: 1px solid $cSecondaryLine;
background: $cThirdBackground; background: $cThirdBackground;
}
&::before { ~ .CDB-RadioFace::before {
background: $cWhite; background: $cWhite;
}
} }
&:hover ~ .CDB-RadioFace { &:hover ~ .CDB-RadioFace {

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

@ -7,19 +7,19 @@
font-style: normal; font-style: normal;
font-weight: 300; font-weight: 300;
src: local('Open Sans Light'), local('OpenSans-Light'), url('themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'), src: local('Open Sans Light'), local('OpenSans-Light'), url('themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'),
url('//themes.googleusercontent.com/static/fonts/opensans/v8/DXI1ORHCpsQm3Vp6mXoaTeY5mlVXtdNkpsMpKkrDXP4.woff') format('woff'); url('themes.googleusercontent.com/static/fonts/opensans/v8/DXI1ORHCpsQm3Vp6mXoaTeY5mlVXtdNkpsMpKkrDXP4.woff') format('woff');
} }
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: local('Open Sans'), local('OpenSans'), url('themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'), src: local('Open Sans'), local('OpenSans'), url('themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'),
url('//themes.googleusercontent.com/static/fonts/opensans/v8/u-WUoqrET9fUeobQW7jkRbO3LdcAZYWl9Si6vvxL-qU.woff') format('woff'); url('themes.googleusercontent.com/static/fonts/opensans/v8/u-WUoqrET9fUeobQW7jkRbO3LdcAZYWl9Si6vvxL-qU.woff') format('woff');
} }
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
font-weight: 600; font-weight: 600;
src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url('themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'), src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url('themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf') format('truetype'),
url('//themes.googleusercontent.com/static/fonts/opensans/v8/MTP_ySUJH_bn48VBG8sNSuY5mlVXtdNkpsMpKkrDXP4.woff') format('woff'); url('themes.googleusercontent.com/static/fonts/opensans/v8/MTP_ySUJH_bn48VBG8sNSuY5mlVXtdNkpsMpKkrDXP4.woff') format('woff');
} }