CSS: Octicons 16px fix outside of _octicons.less

Otherwise the fix will be overwritten by next _octicons.less update.

This is follow-up for 22b0dfbb35.
This commit is contained in:
Adam Strzelecki 2015-12-03 02:18:38 +01:00
parent 2580e7b57e
commit 0068b8106b
3 changed files with 5 additions and 6 deletions

View file

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

View file

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

View file

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