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

Merge pull request #71 from CartoDB/70-menu-changes

Browse Source 
Menu fixes
This commit is contained in:
Javier Arce
2016-02-17 10:10:33 +01:00
parent dd463d605b 4248fa1738
commit e3b40a2a41
4 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fonts/cartoIcon.eot
BIN
View File
Binary file not shown.
src/fonts/cartoIcon.ttf
BIN
View File
Binary file not shown.
src/fonts/cartoIcon.woff
BIN
View File
Binary file not shown.
src/scss/cdb-components/menu.scss
+29 -33
View File
@@ -9,24 +9,24 @@
<nav class="CDB-NavMenu"> <nav class="CDB-NavMenu">
<ul class="CDB-NavMenu-Inner CDB-Text is-semibold CDB-Size-medium"> <ul class="CDB-NavMenu-Inner CDB-Text is-semibold CDB-Size-medium">
<li class="CDB-NavMenu-Item"> <li class="CDB-NavMenu-Item">
<a class="CDB-NavMenu-Link" href="#">DATA</a> <button class="CDB-NavMenu-Link">DATA</button>
</li> </li>
<li class="CDB-NavMenu-Item"> <li class="CDB-NavMenu-Item">
<a class="CDB-NavMenu-Link" href="#">STYLE</a> <button class="CDB-NavMenu-Link">STYLE</button>
</li> </li>
<li class="CDB-NavMenu-Item"> <li class="CDB-NavMenu-Item is-selected">
<a class="CDB-NavMenu-Link" href="#">POP-UP</a> <button class="CDB-NavMenu-Link">POP-UP</button>
<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-selected">
<a href="#" class="CDB-NavSubmenu-Link">CLICK <span class="CDB-NavSubmenu-Status u-hintTextColor">NONE</span></a> <button class="CDB-NavSubmenu-Link">CLICK <span class="CDB-NavSubmenu-Status u-hintTextColor">NONE</span></button>
</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-hintTextColor">NONE</span></a> <button class="CDB-NavSubmenu-Link">HOVER <span class="CDB-NavSubmenu-Status u-hintTextColor">NONE</span></button>
</li> </li>
</ul> </ul>
</li> </li>
<li class="CDB-NavMenu-Item"> <li class="CDB-NavMenu-Item">
<a class="CDB-NavMenu-Link" href="#">LEGEND</a> <button class="CDB-NavMenu-Link">LEGEND</button>
</li> </li>
</ul> </ul>
<div style="position: absolute; right: 0; top: 0; height: 24px; width: 46px; background: red;"> <div style="position: absolute; right: 0; top: 0; height: 24px; width: 46px; background: red;">
@@ -41,24 +41,24 @@
<nav class="CDB-NavMenu is-dark"> <nav class="CDB-NavMenu is-dark">
<ul class="CDB-NavMenu-Inner CDB-Text is-semibold CDB-Size-medium"> <ul class="CDB-NavMenu-Inner CDB-Text is-semibold CDB-Size-medium">
<li class="CDB-NavMenu-Item CDB-Text"> <li class="CDB-NavMenu-Item CDB-Text">
<a class="CDB-NavMenu-Link" href="#">DATA</a> <button class="CDB-NavMenu-Link">DATA</button>
</li> </li>
<li class="CDB-NavMenu-Item"> <li class="CDB-NavMenu-Item">
<a class="CDB-NavMenu-Link" href="#">STYLE</a> <button class="CDB-NavMenu-Link">STYLE</button>
</li> </li>
<li class="CDB-NavMenu-item is-active"> <li class="CDB-NavMenu-item is-selected">
<a class="CDB-NavMenu-Link" href="#">POP-UP</a> <button class="CDB-NavMenu-Link">POP-UP</button>
<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-selected">
<a href="#" class="CDB-NavSubmenu-Link">CLICK <span class="CDB-NavSubmenu-Status">NONE</span></a> <button class="CDB-NavSubmenu-Link">CLICK <span class="CDB-NavSubmenu-Status">NONE</span></button>
</li> </li>
<li class="CDB-NavSubmenu-Item"> <li class="CDB-NavSubmenu-Item">
<a href="#" class="CDB-NavSubmenu-Link">HOVER <span class="CDB-NavSubmenu-Status">NONE</span></a> <button class="CDB-NavSubmenu-Link">HOVER <span class="CDB-NavSubmenu-Status">NONE</span></button>
</li> </li>
</ul> </ul>
</li> </li>
<li class="CDB-NavMenu-Item"> <li class="CDB-NavMenu-Item">
<a class="CDB-NavMenu-Link" href="#">LEGEND</a> <button class="CDB-NavMenu-Link">LEGEND</button>
</li> </li>
</ul> </ul>
</nav> </nav>
@@ -87,6 +87,7 @@
margin-bottom: -1px; margin-bottom: -1px;
padding: 4px 0 11px; padding: 4px 0 11px;
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
color: $cBlue;
} }
.CDB-NavMenu-Item, .CDB-NavMenu-Item,
@@ -96,8 +97,8 @@
vertical-align: middle; vertical-align: middle;
} }
.CDB-NavMenu-Item.is-active .CDB-NavMenu-Link { .CDB-NavMenu-Item.is-selected .CDB-NavMenu-Link {
border-bottom: 1px solid $cMainLine; border-bottom: 1px solid $cBlack;
color: $cMainText; color: $cMainText;
} }
@@ -114,13 +115,12 @@
margin-bottom: -1px; margin-bottom: -1px;
padding-bottom: 12px; padding-bottom: 12px;
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
color: $cBlue;
} }
.CDB-NavSubmenu-item.is-active { .CDB-NavSubmenu-item.is-selected .CDB-NavSubmenu-Link {
.CDB-NavSubmenu-Link { border-bottom: 1px solid $cMainLine;
border-bottom: 1px solid $cMainLine; color: $cMainText;
color: $cMainText;
}
} }
.CDB-NavSubmenu-Status { .CDB-NavSubmenu-Status {
@@ -139,18 +139,14 @@
color: $cAltText; color: $cAltText;
} }
.CDB-NavMenu-Item.is-active { .CDB-NavMenu-Item.is-selected .CDB-NavMenu-Link {
.CDB-NavMenu-Link { border-bottom: 1px solid $cMainLine;
border-bottom: 1px solid $cMainLine; color: $cWhite;
color: $cWhite;
}
} }
.CDB-NavSubmenu-item.is-active { .CDB-NavSubmenu-item.is-selected .CDB-NavSubmenu-Link {
.CDB-NavSubmenu-Link { border-bottom: 1px solid $cMainLine;
border-bottom: 1px solid $cMainLine; color: $cWhite;
color: $cWhite;
}
} }
.CDB-NavSubmenu-Status { .CDB-NavSubmenu-Status {