summaryrefslogtreecommitdiffstats
path: root/public/less
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-12-02 20:26:48 -0500
committerUnknwon <u@gogs.io>2015-12-02 20:26:48 -0500
commitc4bab163cb1d28385cd18ba0d58c9a3e3b237361 (patch)
treed77e573dca1f359a802645e5941c01e0751688f4 /public/less
parent3d3498bda17ce35d38f7e06ce63f6a62dd5a894e (diff)
parent0068b8106ba1c3dbe79bf6dfff79be470e950f4a (diff)
downloadgitea-c4bab163cb1d28385cd18ba0d58c9a3e3b237361.tar.gz
gitea-c4bab163cb1d28385cd18ba0d58c9a3e3b237361.zip
Merge pull request #2088 from nanoant/patch/further-layout-fixes
Further layout fixes
Diffstat (limited to 'public/less')
-rw-r--r--public/less/_base.less2
-rwxr-xr-xpublic/less/_octicons.less4
2 files changed, 3 insertions, 3 deletions
diff --git a/public/less/_base.less b/public/less/_base.less
index 77ed754518..fd12c80b2b 100644
--- a/public/less/_base.less
+++ b/public/less/_base.less
@@ -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;
}
diff --git a/public/less/_octicons.less b/public/less/_octicons.less
index a159dec851..dfd437e6b1 100755
--- a/public/less/_octicons.less
+++ b/public/less/_octicons.less
@@ -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;