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

Merge pull request #69 from CartoDB/68-move_uppercase

Browse Source 
move helper
This commit is contained in:
piensaenpixel 2016-02-15 16:52:28 +01:00
commit 48033c7627
6 changed files with 7 additions and 5 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.

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

@ -155,7 +155,7 @@
</div> </div>
</div> </div>
<p class="CDB-Text is-upper CDB-FontSize-small u-altTextColor u-bSpace--m">Histogram</p> <p class="CDB-Text u-upperCase CDB-FontSize-small u-altTextColor u-bSpace--m">Histogram</p>
<p class="CDB-Text CDB-Size-medium u-altTextColor">Distribution of a numeric variable in a range</p> <p class="CDB-Text CDB-Size-medium u-altTextColor">Distribution of a numeric variable in a range</p>
</div> </div>
</div> </div>

5
src/scss/cdb-components/typography.scss
View File

@ -9,7 +9,7 @@
<p class="CDB-Text CDB-Size-huge is-light">Open Sans 26/34 Light</p> <p class="CDB-Text CDB-Size-huge is-light">Open Sans 26/34 Light</p>
<p class="CDB-Text CDB-Size-large">Open Sans 16/22 Regular</p> <p class="CDB-Text CDB-Size-large">Open Sans 16/22 Regular</p>
<p class="CDB-Text is-semibold CDB-Size-medium">Open Sans 12/16 Semibold</p> <p class="CDB-Text is-semibold CDB-Size-medium">Open Sans 12/16 Semibold</p>
<p class="CDB-Text is-semibold is-upper CDB-Size-medium">Open Sans 12/16 Semibold Uppercase</p> <p class="CDB-Text is-semibold u-upperCase CDB-Size-medium">Open Sans 12/16 Semibold Uppercase</p>
<p class="CDB-Text CDB-Size-medium u-secondaryTextColor">Open Sans 12/16 Regular</p> <p class="CDB-Text CDB-Size-medium u-secondaryTextColor">Open Sans 12/16 Regular</p>
<p class="CDB-Text CDB-Size-medium u-altTextColor">Open Sans 12/16 Regular</p> <p class="CDB-Text CDB-Size-medium u-altTextColor">Open Sans 12/16 Regular</p>
<p class="CDB-Text CDB-Size-medium u-hintTextColor">Open Sans 12/16 Regular</p> <p class="CDB-Text CDB-Size-medium u-hintTextColor">Open Sans 12/16 Regular</p>
@ -30,9 +30,6 @@
&.is-light { &.is-light {
font-weight: $sFontWeight-lighter; font-weight: $sFontWeight-lighter;
} }
&.is-upper {
text-transform: uppercase;
}
} }
.CDB-Size-huge { .CDB-Size-huge {

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

@ -79,6 +79,11 @@
display: none !important; display: none !important;
} }
/* Decoration */
.u-upperCase {
text-transform: uppercase;
}
/* Media queries*/ /* Media queries*/
@include media-query-mobile() { @include media-query-mobile() {
.u-showDesktop { .u-showDesktop {