[Rt-commit] rt branch, 4.6/fix-principal-autocomplete, created. rt-4.4.4-493-gd0ab7f4085
? sunnavy
sunnavy at bestpractical.com
Wed Nov 6 16:57:16 EST 2019
The branch, 4.6/fix-principal-autocomplete has been created
at d0ab7f40854c61b3e237f6ccfe75a6050c753097 (commit)
- Log -----------------------------------------------------------------
commit a894fc96519df110883654ebbde502d00f7a48cf
Author: sunnavy <sunnavy at bestpractical.com>
Date: Tue Nov 5 23:45:57 2019 +0800
Function "size" has been dropped since jQuery 3
diff --git a/share/static/js/util.js b/share/static/js/util.js
index cf21975f64..bc8b0fd338 100644
--- a/share/static/js/util.js
+++ b/share/static/js/util.js
@@ -436,7 +436,7 @@ function addprincipal_onselect(ev, ui) {
// if principal link exists, we shall go there instead
var principal_link = jQuery(ev.target).closest('form').find('a[href="#acl-' + ui.item.id + '"]:first');
- if (principal_link.size()) {
+ if (principal_link.length) {
jQuery(this).val('').blur();
update_addprincipal_title( '' ); // reset title to blank for #acl-AddPrincipal
principal_link.click();
commit ce21fa5074c692cb94ddac31b1d37e3981fb8dac
Author: sunnavy <sunnavy at bestpractical.com>
Date: Wed Nov 6 00:03:44 2019 +0800
Fix jquery ui background url
The /jquery_ui/ path was somehow missed :/
diff --git a/share/static/css/elevator-light/jquery-ui.custom.modified.css b/share/static/css/elevator-light/jquery-ui.custom.modified.css
index 4cbf0fdba4..f80f2e9076 100644
--- a/share/static/css/elevator-light/jquery-ui.custom.modified.css
+++ b/share/static/css/elevator-light/jquery-ui.custom.modified.css
@@ -420,7 +420,7 @@
}
.ui-widget-header {
border: 1px solid #aaaaaa;
- background: #cccccc url("../../../static/images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;
+ background: #cccccc url("../../../static/images/jquery_ui/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;
color: #222222;
font-weight: bold;
}
@@ -440,7 +440,7 @@ works properly when clicked or hovered */
html .ui-button.ui-state-disabled:hover,
html .ui-button.ui-state-disabled:active {
border: 1px solid #d3d3d3;
- background: #e6e6e6 url("../../../static/images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;
+ background: #e6e6e6 url("../../../static/images/jquery_ui/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;
font-weight: normal;
color: #555555;
}
@@ -463,7 +463,7 @@ a:visited.ui-button,
.ui-button:hover,
.ui-button:focus {
border: 1px solid #999999;
- background: #dadada url("../../../static/images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;
+ background: #dadada url("../../../static/images/jquery_ui/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;
font-weight: normal;
color: #212121;
}
@@ -491,7 +491,7 @@ a.ui-button:active,
.ui-button:active,
.ui-button.ui-state-active:hover {
border: 1px solid #aaaaaa;
- background: #ffffff url("../../../static/images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;
+ background: #ffffff url("../../../static/images/jquery_ui/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;
font-weight: normal;
color: #212121;
}
@@ -513,7 +513,7 @@ a.ui-button:active,
.ui-widget-content .ui-state-highlight,
.ui-widget-header .ui-state-highlight {
border: 1px solid #fcefa1;
- background: #fbf9ee url("../../../static/images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;
+ background: #fbf9ee url("../../../static/images/jquery_ui/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;
color: #363636;
}
.ui-state-checked {
@@ -529,7 +529,7 @@ a.ui-button:active,
.ui-widget-content .ui-state-error,
.ui-widget-header .ui-state-error {
border: 1px solid #cd0a0a;
- background: #fef1ec url("../../../static/images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;
+ background: #fef1ec url("../../../static/images/jquery_ui/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;
color: #cd0a0a;
}
.ui-state-error a,
@@ -575,31 +575,31 @@ a.ui-button:active,
}
.ui-icon,
.ui-widget-content .ui-icon {
- background-image: url("../../../static/images/ui-icons_222222_256x240.png");
+ background-image: url("../../../static/images/jquery_ui/ui-icons_222222_256x240.png");
}
.ui-widget-header .ui-icon {
- background-image: url("../../../static/images/ui-icons_222222_256x240.png");
+ background-image: url("../../../static/images/jquery_ui/ui-icons_222222_256x240.png");
}
.ui-state-hover .ui-icon,
.ui-state-focus .ui-icon,
.ui-button:hover .ui-icon,
.ui-button:focus .ui-icon {
- background-image: url("../../../static/images/ui-icons_454545_256x240.png");
+ background-image: url("../../../static/images/jquery_ui/ui-icons_454545_256x240.png");
}
.ui-state-active .ui-icon,
.ui-button:active .ui-icon {
- background-image: url("../../../static/images/ui-icons_454545_256x240.png");
+ background-image: url("../../../static/images/jquery_ui/ui-icons_454545_256x240.png");
}
.ui-state-highlight .ui-icon,
.ui-button .ui-state-highlight.ui-icon {
- background-image: url("../../../static/images/ui-icons_2e83ff_256x240.png");
+ background-image: url("../../../static/images/jquery_ui/ui-icons_2e83ff_256x240.png");
}
.ui-state-error .ui-icon,
.ui-state-error-text .ui-icon {
- background-image: url("../../../static/images/ui-icons_cd0a0a_256x240.png");
+ background-image: url("../../../static/images/jquery_ui/ui-icons_cd0a0a_256x240.png");
}
.ui-button .ui-icon {
- background-image: url("../../../static/images/ui-icons_888888_256x240.png");
+ background-image: url("../../../static/images/jquery_ui/ui-icons_888888_256x240.png");
}
/* positioning */
commit 65e3f984b084477661bd49b5f74b84e9ef2adb12
Author: sunnavy <sunnavy at bestpractical.com>
Date: Wed Nov 6 00:10:36 2019 +0800
Revert back to old padding of autocomplete list
The list is too dense without this, and the old spacing looks better.
diff --git a/share/static/css/elevator-light/jquery-ui.css b/share/static/css/elevator-light/jquery-ui.css
index e8a7bbedf3..f4b350036c 100644
--- a/share/static/css/elevator-light/jquery-ui.css
+++ b/share/static/css/elevator-light/jquery-ui.css
@@ -1 +1,5 @@
@import "jquery-ui.custom.modified.css";
+
+.ui-menu .ui-menu-item {
+ padding: 3px 1em 3px .4em;
+}
commit d0ab7f40854c61b3e237f6ccfe75a6050c753097
Author: sunnavy <sunnavy at bestpractical.com>
Date: Thu Nov 7 05:52:19 2019 +0800
Highlight hovered autocomplete item using our bg instead
diff --git a/share/static/css/elevator-light/jquery-ui.css b/share/static/css/elevator-light/jquery-ui.css
index f4b350036c..ee21395ec9 100644
--- a/share/static/css/elevator-light/jquery-ui.css
+++ b/share/static/css/elevator-light/jquery-ui.css
@@ -1,5 +1,16 @@
@import "jquery-ui.custom.modified.css";
.ui-menu .ui-menu-item {
- padding: 3px 1em 3px .4em;
+ padding: 3px 0 3px 0;
+}
+
+.ui-menu .ui-menu-item .ui-menu-item-wrapper {
+ display: block;
+}
+
+.ui-menu .ui-menu-item .ui-state-active {
+ background: #4868b3;
+ color: white;
+ border: none;
+ margin: 0;
}
-----------------------------------------------------------------------
More information about the rt-commit
mailing list