Skip to content

Commit 9910e93

Browse files
scottgonzalezjzaefferer
authored andcommitted
Menu: Simplify styling. Remove rounded corners, reduce spacing.
1 parent 8748658 commit 9910e93

File tree

2 files changed

+10
-23
lines changed

2 files changed

+10
-23
lines changed

themes/base/jquery.ui.menu.css

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,47 +10,34 @@
1010
*/
1111
.ui-menu {
1212
list-style: none;
13-
padding: 2px;
13+
padding: 0;
1414
margin: 0;
1515
display: block;
1616
outline: none;
1717
}
1818
.ui-menu .ui-menu {
19-
margin-top: -3px;
2019
position: absolute;
2120
}
2221
.ui-menu .ui-menu-item {
2322
margin: 0;
2423
display: block;
25-
padding: 2px .4em;
26-
line-height: 1.5;
24+
padding: 3px .4em;
2725
min-height: 0; /* support: IE7 */
28-
font-weight: normal;
2926
/* support: IE10, see #8844 */
3027
list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
3128
}
3229
.ui-menu .ui-menu-divider {
33-
margin: 5px -2px 5px -2px;
30+
margin: 5px 0;
3431
height: 0;
3532
font-size: 0;
3633
line-height: 0;
3734
border-width: 1px 0 0 0;
3835
}
3936
.ui-menu .ui-state-focus,
4037
.ui-menu .ui-state-active {
41-
font-weight: normal;
4238
margin: -1px;
4339
}
4440

45-
.ui-menu .ui-state-disabled {
46-
font-weight: normal;
47-
margin: .4em 0 .2em;
48-
line-height: 1.5;
49-
}
50-
.ui-menu .ui-state-disabled a {
51-
cursor: default;
52-
}
53-
5441
/* icon support */
5542
.ui-menu-icons {
5643
position: relative;
@@ -69,6 +56,7 @@
6956

7057
/* right-aligned */
7158
.ui-menu .ui-menu-icon {
72-
position: static;
59+
position: relative;
60+
top: -.2em;
7361
float: right;
7462
}

ui/jquery.ui.menu.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ $.widget( "ui.menu", {
2626
items: "> *",
2727
menus: "ul",
2828
position: {
29-
my: "left top",
29+
my: "left-1 top",
3030
at: "right top"
3131
},
3232
role: "menu",
@@ -44,7 +44,7 @@ $.widget( "ui.menu", {
4444
this.mouseHandled = false;
4545
this.element
4646
.uniqueId()
47-
.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
47+
.addClass( "ui-menu ui-widget ui-widget-content" )
4848
.toggleClass( "ui-menu-icons", !!this.element.find( ".ui-icon" ).length )
4949
.attr({
5050
role: this.options.role,
@@ -147,7 +147,7 @@ $.widget( "ui.menu", {
147147
this.element
148148
.removeAttr( "aria-activedescendant" )
149149
.find( ".ui-menu" ).addBack()
150-
.removeClass( "ui-menu ui-widget ui-widget-content ui-corner-all ui-menu-icons" )
150+
.removeClass( "ui-menu ui-widget ui-widget-content ui-menu-icons" )
151151
.removeAttr( "role" )
152152
.removeAttr( "tabIndex" )
153153
.removeAttr( "aria-labelledby" )
@@ -163,7 +163,7 @@ $.widget( "ui.menu", {
163163
.removeAttr( "role" )
164164
.removeAttr( "aria-disabled" )
165165
.removeUniqueId()
166-
.removeClass( "ui-corner-all ui-state-hover" )
166+
.removeClass( "ui-state-hover" )
167167
.removeAttr( "tabIndex" )
168168
.removeAttr( "role" )
169169
.removeAttr( "aria-haspopup" )
@@ -292,7 +292,7 @@ $.widget( "ui.menu", {
292292

293293
// Initialize nested menus
294294
submenus.filter( ":not(.ui-menu)" )
295-
.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
295+
.addClass( "ui-menu ui-widget ui-widget-content" )
296296
.hide()
297297
.attr({
298298
role: this.options.role,
@@ -328,7 +328,6 @@ $.widget( "ui.menu", {
328328
items.not( ".ui-menu-item, .ui-menu-divider" )
329329
.addClass( "ui-menu-item" )
330330
.uniqueId()
331-
.addClass( "ui-corner-all" )
332331
.attr({
333332
tabIndex: -1,
334333
role: this._itemRole()

0 commit comments

Comments
 (0)