Skip to content

Commit b226aef

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #19703 from MauricioFauth/jquery-ui-dialog-removal
Replace jQuery UI's dialog components with Bootstrap modal component
2 parents 12ccf79 + 5238dff commit b226aef

21 files changed

Lines changed: 848 additions & 996 deletions

File tree

‎public/themes/bootstrap/scss/_common.scss‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -508,8 +508,6 @@ div {
508508
}
509509

510510
&#queryAnalyzerDialog {
511-
min-width: 700px;
512-
513511
div {
514512
&.CodeMirror-scroll {
515513
height: auto;
@@ -1552,10 +1550,6 @@ div#page_content div {
15521550
}
15531551
}
15541552

1555-
.ui-dialog {
1556-
position: fixed;
1557-
}
1558-
15591553
.small_font {
15601554
font-size: smaller;
15611555
}
@@ -2276,34 +2270,6 @@ th {
22762270

22772271
// end of styles of sortable tables
22782272

2279-
// styles for jQuery-ui to support rtl languages
2280-
body .ui-dialog {
2281-
.ui-dialog-titlebar-close {
2282-
right: 0.3em;
2283-
left: initial;
2284-
}
2285-
2286-
.ui-dialog-title {
2287-
float: left;
2288-
}
2289-
2290-
.ui-dialog-buttonpane .ui-dialog-buttonset {
2291-
float: right;
2292-
}
2293-
2294-
.ui-dialog-buttonpane .ui-dialog-buttonset button {
2295-
color: $white;
2296-
background: none;
2297-
background-color: #6c757d !important;
2298-
border-color: #6c757d;
2299-
}
2300-
2301-
.ui-dialog-buttonpane .ui-dialog-buttonset button:hover {
2302-
background-color: #5a6268 !important;
2303-
}
2304-
}
2305-
// end of styles for jQuery-ui to support rtl languages
2306-
23072273
// templates/database/designer
23082274
// side menu
23092275
#name-panel {
@@ -2352,11 +2318,6 @@ body .ui-dialog {
23522318
min-width: 100%;
23532319
}
23542320
}
2355-
2356-
.ui-dialog {
2357-
margin: 1%;
2358-
width: 95% !important;
2359-
}
23602321
}
23612322

23622323
#tooltip_editor {

‎public/themes/metro/scss/_common.scss‎

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -761,8 +761,6 @@ div {
761761
}
762762

763763
&#queryAnalyzerDialog {
764-
min-width: 700px;
765-
766764
div {
767765
&.CodeMirror-scroll {
768766
height: auto;
@@ -2470,21 +2468,6 @@ meter {
24702468
/* styles for jQuery-ui to support rtl languages */
24712469

24722470
body {
2473-
.ui-dialog {
2474-
.ui-dialog-titlebar-close {
2475-
right: 0.3em;
2476-
left: initial;
2477-
}
2478-
2479-
.ui-dialog-title {
2480-
float: left;
2481-
}
2482-
2483-
.ui-dialog-buttonpane .ui-dialog-buttonset {
2484-
float: right;
2485-
}
2486-
}
2487-
24882471
.ui-corner-all,
24892472
.ui-corner-top,
24902473
.ui-corner-left,
@@ -2512,40 +2495,6 @@ body {
25122495
.ui-corner-br {
25132496
border-bottom-right-radius: 0;
25142497
}
2515-
2516-
.ui-dialog {
2517-
padding: 0;
2518-
2519-
.ui-widget-header {
2520-
color: $button-color;
2521-
border: none;
2522-
background-color: var(--navi-background);
2523-
background-image: none;
2524-
}
2525-
2526-
.ui-dialog-title {
2527-
padding: 5px;
2528-
font-weight: normal;
2529-
}
2530-
2531-
.ui-dialog-buttonpane button {
2532-
font-family: $font-family-base;
2533-
color: $button-color;
2534-
background-color: var(--navi-background);
2535-
background-image: none;
2536-
border: 1px solid var(--button-background);
2537-
2538-
&.ui-state-hover {
2539-
background-color: var(--button-hover);
2540-
border: 1px solid var(--button-hover);
2541-
}
2542-
2543-
&.ui-state-active {
2544-
background-color: #333;
2545-
border: 1px solid #333;
2546-
}
2547-
}
2548-
}
25492498
}
25502499

25512500
#tooltip_editor {

‎public/themes/original/scss/_common.scss‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,10 +1584,6 @@ div#page_content div {
15841584
}
15851585
}
15861586

1587-
.ui-dialog {
1588-
position: fixed;
1589-
}
1590-
15911587
.small_font {
15921588
font-size: smaller;
15931589
}
@@ -2227,21 +2223,6 @@ span.drag_icon {
22272223
/* styles for jQuery-ui to support rtl languages */
22282224

22292225
body {
2230-
.ui-dialog {
2231-
.ui-dialog-titlebar-close {
2232-
right: 0.3em;
2233-
left: initial;
2234-
}
2235-
2236-
.ui-dialog-title {
2237-
float: left;
2238-
}
2239-
2240-
.ui-dialog-buttonpane .ui-dialog-buttonset {
2241-
float: right;
2242-
}
2243-
}
2244-
22452226
.ui-corner-all,
22462227
.ui-corner-top,
22472228
.ui-corner-left,
@@ -2269,40 +2250,6 @@ body {
22692250
.ui-corner-br {
22702251
border-bottom-right-radius: 0;
22712252
}
2272-
2273-
.ui-dialog {
2274-
padding: 0;
2275-
border-color: #000;
2276-
2277-
.ui-dialog-titlebar {
2278-
padding: 0.3em 0.5em;
2279-
border: none;
2280-
border-bottom: 1px solid #000;
2281-
2282-
button {
2283-
border: 1px solid #999;
2284-
}
2285-
}
2286-
2287-
.ui-dialog-content {
2288-
padding: 0.2em 0.4em;
2289-
}
2290-
2291-
.ui-dialog-buttonpane {
2292-
background: #d3dce3;
2293-
border-top: 1px solid #000;
2294-
2295-
button {
2296-
margin: 0.1em 0 0.1em 0.4em;
2297-
border: 1px solid #999;
2298-
color: #000;
2299-
}
2300-
}
2301-
2302-
.ui-button-text-only .ui-button-text {
2303-
padding: 0.2em 0.6em;
2304-
}
2305-
}
23062253
}
23072254

23082255
/* templates/database/designer */
@@ -2349,11 +2296,6 @@ body {
23492296
}
23502297
}
23512298

2352-
.ui-dialog {
2353-
margin: 1%;
2354-
width: 95% !important;
2355-
}
2356-
23572299
#server-breadcrumb .item {
23582300
margin: 4px;
23592301
}

‎public/themes/pmahomme/scss/_common.scss‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -694,8 +694,6 @@ div {
694694
}
695695

696696
&#queryAnalyzerDialog {
697-
min-width: 700px;
698-
699697
div {
700698
&.CodeMirror-scroll {
701699
height: auto;
@@ -1777,10 +1775,6 @@ div#page_content div {
17771775
}
17781776
}
17791777

1780-
.ui-dialog {
1781-
position: fixed;
1782-
}
1783-
17841778
.small_font {
17851779
font-size: smaller;
17861780
}
@@ -2435,23 +2429,6 @@ meter {
24352429

24362430
// end of styles of sortable tables
24372431

2438-
// styles for jQuery-ui to support rtl languages
2439-
body .ui-dialog {
2440-
.ui-dialog-titlebar-close {
2441-
right: 0.3em;
2442-
left: initial;
2443-
}
2444-
2445-
.ui-dialog-title {
2446-
float: left;
2447-
}
2448-
2449-
.ui-dialog-buttonpane .ui-dialog-buttonset {
2450-
float: right;
2451-
}
2452-
}
2453-
// end of styles for jQuery-ui to support rtl languages
2454-
24552432
// templates/database/designer
24562433
// side menu
24572434
#name-panel {
@@ -2494,11 +2471,6 @@ body .ui-dialog {
24942471
min-width: 100%;
24952472
}
24962473
}
2497-
2498-
.ui-dialog {
2499-
margin: 1%;
2500-
width: 95% !important;
2501-
}
25022474
}
25032475

25042476
#tooltip_editor {

0 commit comments

Comments
 (0)