From 09eba6ca06ea5ca3031eebf305fd15bee79f226e Mon Sep 17 00:00:00 2001 From: jlukic Date: Tue, 2 Sep 2014 13:28:58 -0400 Subject: [PATCH] Fixes #1054, issue with inheritance of link styles in menus --- server/files/stylesheets/semantic.css | 7 ++++++- src/definitions/collections/menu.less | 6 +++--- src/definitions/modules/sidebar.less | 1 - 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/server/files/stylesheets/semantic.css b/server/files/stylesheets/semantic.css index a83aeee3f..56128b023 100755 --- a/server/files/stylesheets/semantic.css +++ b/server/files/stylesheets/semantic.css @@ -1580,9 +1580,14 @@ body.progress .ui.progress .bar { #example.button :not(.buttons) .ui.button { margin-bottom: 0.5em; } + #example .masthead:before { + -webkit-animation-name: none; + -moz-animation-name: none; + -o-animation-name: none; + animation-name: none; + } } - @media only screen and (max-width : 998px) { #example.index .main.menu .container { diff --git a/src/definitions/collections/menu.less b/src/definitions/collections/menu.less index 1eebb28ac..32dcbfd37 100755 --- a/src/definitions/collections/menu.less +++ b/src/definitions/collections/menu.less @@ -139,7 +139,7 @@ ---------------*/ .ui.menu .text.item > *, -.ui.menu .item > a, +.ui.menu .item > a:not(.ui), .ui.menu .item > p:only-child { user-select: text; line-height: @textLineHeight; @@ -1175,7 +1175,7 @@ } .ui.inverted.menu .item, -.ui.inverted.menu .item > a { +.ui.inverted.menu .item > a:not(.ui) { color: @invertedTextColor; } @@ -1184,7 +1184,7 @@ } .ui.inverted.menu .item .item, -.ui.inverted.menu .item .item > a { +.ui.inverted.menu .item .item > a:not(.ui) { color: @invertedSubMenuColor; } .ui.inverted.menu .dropdown .menu .item { diff --git a/src/definitions/modules/sidebar.less b/src/definitions/modules/sidebar.less index 5d4c142b2..404e7899e 100755 --- a/src/definitions/modules/sidebar.less +++ b/src/definitions/modules/sidebar.less @@ -38,7 +38,6 @@ margin: 0 !important; will-change: transform; overflow-y: auto !important; - -webkit-overflow-scrolling: touch; }