Merge pull request #2088 from nanoant/patch/further-layout-fixes

Further layout fixes
This commit is contained in:
Unknwon 2015-12-02 20:26:48 -05:00
commit c4bab163cb
26 changed files with 41 additions and 62 deletions

View file

@ -5,9 +5,7 @@
font-style: normal;
}
.octicon,
.mega-octicon,
.icon.octicon,
.icon.mega-octicon {
.mega-octicon {
font: normal normal normal 16px/1 octicons;
display: inline-block;
text-decoration: none;
@ -1052,6 +1050,7 @@ footer .container .links > *:first-child {
.octicon.icon,
.mega-octicon.icon {
font-family: octicons;
font-size: 16px;
opacity: 1 !important;
}
.sr-only {

View file

@ -313,9 +313,11 @@ footer {
.generate-img(@n, (@i + 1));
}
// ensure Semantic UI .icon font family and 14px size does not apply to .icon.octicon
.octicon.icon,
.mega-octicon.icon {
font-family: octicons;
font-size: 16px;
opacity: 1 !important;
}

View file

@ -14,9 +14,7 @@
// .octicon is optimized for 16px.
// .mega-octicon is optimized for 32px but can be used larger.
.octicon, .mega-octicon,
// ensure Semantic UI .icon of 14px does not apply to .icon.octicon:
.icon.octicon, .icon.mega-octicon {
.octicon, .mega-octicon {
font: normal normal normal 16px/1 octicons;
display: inline-block;
text-decoration: none;