diff --git a/build.json b/build.json index 17d38b31410..635e73d9dc4 100644 --- a/build.json +++ b/build.json @@ -37,7 +37,6 @@ { "css/all-web.css": [ "lib/css/legacy/body.css", - "lib/css/legacy/menus.css", "lib/css/legacy/messages.css", "lib/css/legacy/dialog.css", "lib/css/bootstrap/headings.css", @@ -53,7 +52,6 @@ { "css/all-app.css": [ "lib/css/legacy/body.css", - "lib/css/legacy/menus.css", "lib/css/legacy/messages.css", "lib/css/legacy/forms.css", "lib/css/legacy/grid.css", diff --git a/css/all-app.css b/css/all-app.css index 97dc509fb9c..f3a07ec9da2 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -230,59 +230,16 @@ div.std-footer-item { box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); } -/* - * lib/css/legacy/menus.css - */ -/******** Menus - menu.js ************/ - -ul.menu_toolbar { - z-index: 30; - padding: 0px; - margin: 0px; - margin-top: 1px; +.avatar-small { + display: inline-block; + min-width: 29px; +} +.avatar-small img { + height: 24px; + margin-bottom: -7px; + max-width: 24px; } -ul.menu_toolbar li { - list-style: none; - margin: 0px; - float: left; -} - -.top_menu { - margin: 0px; - padding: 4px; - cursor: pointer; - color: #FFF; - margin-right: 8px; -} - -.top_menu_mo { - background-color: #000; - - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -div.menu_toolbar_dropdown { - position: absolute; - margin-top: 4px; - margin-left: 8px; - width: 140px; - background-color: #FFF; - color: #000; - display: none; - border: 2px solid #333; - z-index: 31; - overflow-y: auto; - overflow-x: hidden; -} - -div.dd_item { - cursor: pointer; - padding: 4px; - background-color: #FFF; -} -div.dd_item_mo { background-color: #FE8; } /* * lib/css/legacy/messages.css */ diff --git a/css/all-web.css b/css/all-web.css index c8eb20fd762..967c32b65c1 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -230,59 +230,16 @@ div.std-footer-item { box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); } -/* - * lib/css/legacy/menus.css - */ -/******** Menus - menu.js ************/ - -ul.menu_toolbar { - z-index: 30; - padding: 0px; - margin: 0px; - margin-top: 1px; +.avatar-small { + display: inline-block; + min-width: 29px; +} +.avatar-small img { + height: 24px; + margin-bottom: -7px; + max-width: 24px; } -ul.menu_toolbar li { - list-style: none; - margin: 0px; - float: left; -} - -.top_menu { - margin: 0px; - padding: 4px; - cursor: pointer; - color: #FFF; - margin-right: 8px; -} - -.top_menu_mo { - background-color: #000; - - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -div.menu_toolbar_dropdown { - position: absolute; - margin-top: 4px; - margin-left: 8px; - width: 140px; - background-color: #FFF; - color: #000; - display: none; - border: 2px solid #333; - z-index: 31; - overflow-y: auto; - overflow-x: hidden; -} - -div.dd_item { - cursor: pointer; - padding: 4px; - background-color: #FFF; -} -div.dd_item_mo { background-color: #FE8; } /* * lib/css/legacy/messages.css */ diff --git a/erpnext/home/page/activity/activity.js b/erpnext/home/page/activity/activity.js index feea380e62d..9a323d3ec11 100644 --- a/erpnext/home/page/activity/activity.js +++ b/erpnext/home/page/activity/activity.js @@ -15,9 +15,7 @@ erpnext.ActivityFeed = Class.extend({ this.scrub_data(data); this.add_date_separator(row, data); $(row).append(sprintf('