diff --git a/src/collections/menu.less b/src/collections/menu.less index a190d5793..ec8c5215a 100755 --- a/src/collections/menu.less +++ b/src/collections/menu.less @@ -173,12 +173,10 @@ margin: 0em; } -.ui.menu .menu.left, -.ui.menu .item.left { +.ui.menu .menu.left { float: left; } -.ui.menu .menu.right, -.ui.menu .item.right { +.ui.menu .menu.right { float: right; } @@ -236,6 +234,11 @@ .ui.menu .text.item > *, .ui.menu .item > p:only-child { + -webkit-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + user-select: text; + line-height: 1.3; color: rgba(0, 0, 0, 0.6); } @@ -504,12 +507,15 @@ .ui.vertical.menu .item:first-child:before { background-image: none; } +.ui.vertical.menu .item:last-child::before { + display: block; +} /*--- Dropdown ---*/ .ui.vertical.menu .dropdown.item > i { float: right; } -.ui.vertical.menu .dropdown.item .menu { +.ui.vertical.menu .simple.dropdown.item .menu { top: 0% !important; left: 100%; margin: 0em; @@ -929,11 +935,10 @@ ; } .ui.text.menu > .item:before { - display: none; + display: none !important; } .ui.text.menu .header.item { background-color: transparent; - padding: 0em; opacity: 1; color: rgba(50, 50, 50, 0.8); diff --git a/src/elements/button.less b/src/elements/button.less index a7b8eb6b5..ce0d44644 100755 --- a/src/elements/button.less +++ b/src/elements/button.less @@ -656,6 +656,7 @@ /*--- Tertiary ---*/ .ui.buttons.tertiary .button, .ui.tertiary.button { + border-left: none; background-color: transparent; background-image: none; color: #999999; @@ -767,14 +768,13 @@ .ui.toggle.buttons .button.active, .ui.buttons .button.toggle.active, .ui.button.toggle.active { - background-color: #7BA74E; + color: #FFFFFF; } .ui.buttons.toggle .ui.button.active.hover, .ui.buttons .ui.button.toggle.active.hover, .ui.button.toggle.active.hover { color: #FFFFFF; - background-color: #89BF52; } /*-------------- diff --git a/src/modules/nag.js b/src/modules/nag.js index 83792f898..55566b087 100755 --- a/src/modules/nag.js +++ b/src/modules/nag.js @@ -105,29 +105,36 @@ }, show: function() { - if($.fn.popIn !== undefined) { + if(settings.animation.show == 'fade') { $module - .popIn(settings.duration) + .fadeIn(settings.duration, settings.easing) ; } else { $module - .fadeIn(settings.duration, settings.easing) + .slideDown(settings.duration, settings.easing) ; } }, hide: function() { - $module - .fadeOut(settings.duration, settings.easing, this.onHide) - ; + if(settings.animation.show == 'fade') { + $module + .fadeIn(settings.duration, settings.easing) + ; + } + else { + $module + .slideUp(settings.duration, settings.easing) + ; + } }, onHide: function() { $module.remove(); if (settings.onHide) { settings.onHide(); - }; + } }, stick: function() { @@ -297,6 +304,11 @@ // set to zero to manually dismiss, otherwise hides on its own displayTime : 0, + animation : { + show: 'slide', + hide: 'slide' + }, + // method of stickyness position : 'fixed', scrollBarWidth : 18, diff --git a/src/modules/nag.less b/src/modules/nag.less index 3bf5b8aba..0293e1ac8 100755 --- a/src/modules/nag.less +++ b/src/modules/nag.less @@ -19,13 +19,13 @@ display: none; opacity: 0.95; - position: absolute; + position: relative; top: 0px; - left: 10%; + left: 0%; z-index: 101; - width: 80%; - min-height: 20px; + min-height: 0; + width: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -33,7 +33,8 @@ box-sizing: border-box; margin: 0em; - padding: 0.75em 1em; + line-height: 3em; + padding: 0em 1em; background-color: #555555; @@ -73,7 +74,7 @@ a.ui.nag { } -.ui.nag > .icon.close { +.ui.nag > .close.icon { cursor: pointer; opacity: 0.4; @@ -116,8 +117,8 @@ a.ui.nag { Static ---------------*/ -.ui.static.nag { - position: static; +.ui.overlay.nag { + position: absolute; display: block; } @@ -133,28 +134,42 @@ a.ui.nag { Bottom ---------------*/ -.ui.nag.bottom { +.ui.botton.nag { -webkit-border-radius: 5px 5px 0px 0px; -moz-border-radius: 5px 5px 0px 0px; border-radius: 5px 5px 0px 0px; } -.ui.nag.bottom.fixed { +.ui.fixed.bottom.nags, +.ui.fixed.bottom.nag { top: auto; bottom: 0px; } - /*-------------- White ---------------*/ -.ui.nag.white { +.ui.white.nags .nag, +.ui.white.nag { background-color: #F1F1F1; text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.8); color: #ACACAC; } -.ui.nag.white .close, -.ui.nag.white .title { +.ui.white.nags .nag .close, +.ui.white.nags .nag .title, +.ui.white.nag .close, +.ui.white.nag .title { color: #333333; +} + + +/******************************* + Groups +*******************************/ + +.ui.nags .nag { + -webkit-border-radius: 0px; + -moz-border-radius: 0px; + border-radius: 0px; } \ No newline at end of file