cartodb4/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 16:43:54 +01:00
parent ab562c2f74
commit 7aec38fb55
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,7 @@
</ul> </ul>
</li> </li>
<li class="CDB-HeaderInfo-ListItem"> <li class="CDB-HeaderInfo-ListItem">
<p class="CDB-HeaderInfo-Text CDB-Text CDB-Size-medium u-iBlock u-textSubtitle">Published 8 days ago</p> <p class="CDB-HeaderInfo-Text CDB-Text CDB-Size-medium u-iBlock u-aux1TextColor">Published 8 days ago</p>
</li> </li>
</ul> </ul>
</div> </div>
@ -111,7 +111,7 @@
</a> </a>
</div> </div>
</div> </div>
<p class="CDB-HeaderInfo-Text CDB-Text CDB-Size-medium u-textSubtitle">Positron by CartoDB</p> <p class="CDB-HeaderInfo-Text CDB-Text CDB-Size-medium u-aux1TextColor">Positron by CartoDB</p>
</div> </div>
</div> </div>
@ -155,8 +155,8 @@
</div> </div>
</div> </div>
<p class="CDB-Text is-upper CDB-FontSize-small u-textSubtitle u-bSpace--m">Histogram</p> <p class="CDB-Text is-upper CDB-FontSize-small u-aux1TextColor u-bSpace--m">Histogram</p>
<p class="CDB-Text CDB-Size-medium u-textSubtitle">Distribution of a numeric variable in a range</p> <p class="CDB-Text CDB-Size-medium u-aux1TextColor">Distribution of a numeric variable in a range</p>
</div> </div>
</div> </div>

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

@ -18,10 +18,10 @@
<a class="CDB-NavMenu-Link" href="#">POP-UP</a> <a class="CDB-NavMenu-Link" href="#">POP-UP</a>
<ul class="CDB-NavSubmenu CDB-Size-small"> <ul class="CDB-NavSubmenu CDB-Size-small">
<li class="CDB-NavSubmenu-Item is-active"> <li class="CDB-NavSubmenu-Item is-active">
<a href="#" class="CDB-NavSubmenu-Link">CLICK <span class="CDB-NavSubmenu-Status u-textDisabled">NONE</span></a> <a href="#" class="CDB-NavSubmenu-Link">CLICK <span class="CDB-NavSubmenu-Status u-aux2TextColor">NONE</span></a>
</li> </li>
<li class="CDB-NavSubmenu-Item"> <li class="CDB-NavSubmenu-Item">
<a href="#" class="CDB-NavSubmenu-Link">HOVER <span class="CDB-NavSubmenu-Status u-textDisabled">NONE</span></a> <a href="#" class="CDB-NavSubmenu-Link">HOVER <span class="CDB-NavSubmenu-Status u-aux2TextColor">NONE</span></a>
</li> </li>
</ul> </ul>
</li> </li>

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

@ -11,8 +11,8 @@
<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 is-upper CDB-Size-medium">Open Sans 12/16 Semibold Uppercase</p>
<p class="CDB-Text CDB-Size-medium u-textSecondary">Open Sans 12/16 Regular</p> <p class="CDB-Text CDB-Size-medium u-textSecondary">Open Sans 12/16 Regular</p>
<p class="CDB-Text CDB-Size-medium u-textSubtitle">Open Sans 12/16 Regular</p> <p class="CDB-Text CDB-Size-medium u-aux1TextColor">Open Sans 12/16 Regular</p>
<p class="CDB-Text CDB-Size-medium u-textDisabled">Open Sans 12/16 Regular</p> <p class="CDB-Text CDB-Size-medium u-aux2TextColor">Open Sans 12/16 Regular</p>
<p class="CDB-Text is-semibold CDB-Size-small">Open Sans 10/14 Semibold</p> <p class="CDB-Text is-semibold CDB-Size-small">Open Sans 10/14 Semibold</p>
<p class="CDB-Text CDB-Size-small">Open Sans 10/14 Regular</p> <p class="CDB-Text CDB-Size-small">Open Sans 10/14 Regular</p>
``` ```

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

@ -37,13 +37,21 @@
.u-bSpace--m { .u-bSpace--m {
margin-bottom: 8px; margin-bottom: 8px;
} }
// Colors
// Main Text Color is default color
// ----------------------------------------------
.u-mainTextColor {
color: $cMainDark;
}
.u-textSecondary { .u-textSecondary {
color: $cTypo2; color: $cTypo2;
} }
.u-textSubtitle { .u-aux1TextColor {
color: $cTypo3; color: $cTypo3;
} }
.u-textDisabled { .u-aux2TextColor {
color: $cTypo4; color: $cTypo4;
} }