Skip to content

Commit

Permalink
Merge branch 'develop' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
Fábio Santos committed Apr 7, 2015
2 parents a50c5e9 + 0d14e00 commit 39e7879
Show file tree
Hide file tree
Showing 9 changed files with 511 additions and 509 deletions.
968 changes: 486 additions & 482 deletions dist/css/font-awesome.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/font-awesome.min.css
View file

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions dist/css/ink-flex.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* @author Sapo Ink Team
* @license http://opensource.org/licenses/MIT MIT
* @link http://ink.sapo.pt
* @version 3.1.6
* @version 3.1.7
*/
/**
* Ink class names prefix
Expand Down Expand Up @@ -6709,13 +6709,13 @@ th {
background: #f2f2f2;
text-decoration: none;
}
.ink-dropdown ul.dropdown-menu li.submenu:hover:hover > ul.dropdown-menu, .ink-dropdown ul.dropdown-menu li.submenu:hover:hover > ul.dropdown,
.ink-dropdown ul.dropdown li.submenu:hover:hover > ul.dropdown-menu,
.ink-dropdown ul.dropdown li.submenu:hover:hover > ul.dropdown,
.ink-navigation ul.dropdown-menu li.submenu:hover:hover > ul.dropdown-menu,
.ink-navigation ul.dropdown-menu li.submenu:hover:hover > ul.dropdown,
.ink-navigation ul.dropdown li.submenu:hover:hover > ul.dropdown-menu,
.ink-navigation ul.dropdown li.submenu:hover:hover > ul.dropdown {
.ink-dropdown ul.dropdown-menu li.submenu:hover > ul.dropdown-menu, .ink-dropdown ul.dropdown-menu li.submenu:hover > ul.dropdown,
.ink-dropdown ul.dropdown li.submenu:hover > ul.dropdown-menu,
.ink-dropdown ul.dropdown li.submenu:hover > ul.dropdown,
.ink-navigation ul.dropdown-menu li.submenu:hover > ul.dropdown-menu,
.ink-navigation ul.dropdown-menu li.submenu:hover > ul.dropdown,
.ink-navigation ul.dropdown li.submenu:hover > ul.dropdown-menu,
.ink-navigation ul.dropdown li.submenu:hover > ul.dropdown {
display: block;
}
.ink-dropdown ul.dropdown-menu li.submenu > ul.dropdown-menu, .ink-dropdown ul.dropdown-menu li.submenu > ul.dropdown,
Expand Down Expand Up @@ -7088,7 +7088,7 @@ body {
}

.condensed-300, .condensed-thin {
font-weight: 200;
font-weight: 300;
font-family: Roboto_condensed, Arial, Helvetica, sans-serif;
}

Expand Down
2 changes: 1 addition & 1 deletion dist/css/ink-flex.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/ink-ie.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @author Sapo Ink Team
* @license http://opensource.org/licenses/MIT MIT
* @link http://ink.sapo.pt
* @version 3.1.6
* @version 3.1.7
*/
/**
* Ink class names prefix
Expand Down
2 changes: 1 addition & 1 deletion dist/css/ink-legacy.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @author Sapo Ink Team
* @license http://opensource.org/licenses/MIT MIT
* @link http://ink.sapo.pt
* @version 3.1.6
* @version 3.1.7
*/
/**
* Ink class names prefix
Expand Down
18 changes: 9 additions & 9 deletions dist/css/ink.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* @author Sapo Ink Team
* @license http://opensource.org/licenses/MIT MIT
* @link http://ink.sapo.pt
* @version 3.1.6
* @version 3.1.7
*/
/**
* Ink class names prefix
Expand Down Expand Up @@ -5626,13 +5626,13 @@ th {
background: #f2f2f2;
text-decoration: none;
}
.ink-dropdown ul.dropdown-menu li.submenu:hover:hover > ul.dropdown-menu, .ink-dropdown ul.dropdown-menu li.submenu:hover:hover > ul.dropdown,
.ink-dropdown ul.dropdown li.submenu:hover:hover > ul.dropdown-menu,
.ink-dropdown ul.dropdown li.submenu:hover:hover > ul.dropdown,
.ink-navigation ul.dropdown-menu li.submenu:hover:hover > ul.dropdown-menu,
.ink-navigation ul.dropdown-menu li.submenu:hover:hover > ul.dropdown,
.ink-navigation ul.dropdown li.submenu:hover:hover > ul.dropdown-menu,
.ink-navigation ul.dropdown li.submenu:hover:hover > ul.dropdown {
.ink-dropdown ul.dropdown-menu li.submenu:hover > ul.dropdown-menu, .ink-dropdown ul.dropdown-menu li.submenu:hover > ul.dropdown,
.ink-dropdown ul.dropdown li.submenu:hover > ul.dropdown-menu,
.ink-dropdown ul.dropdown li.submenu:hover > ul.dropdown,
.ink-navigation ul.dropdown-menu li.submenu:hover > ul.dropdown-menu,
.ink-navigation ul.dropdown-menu li.submenu:hover > ul.dropdown,
.ink-navigation ul.dropdown li.submenu:hover > ul.dropdown-menu,
.ink-navigation ul.dropdown li.submenu:hover > ul.dropdown {
display: block;
}
.ink-dropdown ul.dropdown-menu li.submenu > ul.dropdown-menu, .ink-dropdown ul.dropdown-menu li.submenu > ul.dropdown,
Expand Down Expand Up @@ -6005,7 +6005,7 @@ body {
}

.condensed-300, .condensed-thin {
font-weight: 200;
font-weight: 300;
font-family: Roboto_condensed, Arial, Helvetica, sans-serif;
}

Expand Down
2 changes: 1 addition & 1 deletion dist/css/ink.min.css
View file

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions src/sass/modules/_nav.dropdown.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,8 @@

}

&:hover {
> ul.dropdown-menu, > ul.dropdown {
display: block;
}
> ul.dropdown-menu, > ul.dropdown {
display: block;
}

}
Expand Down

0 comments on commit 39e7879

Please sign in to comment.