Visitar URL original
Merge pull request #19110 from MauricioFauth/recent-favorite-tables · phpmyadmin/phpmyadmin@a6c56e6 · GitHub
Skip to content

Commit a6c56e6

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #19110 from MauricioFauth/recent-favorite-tables
Refactor recent/favorite tables buttons
2 parents ca9032a + a921326 commit a6c56e6

13 files changed

Lines changed: 92 additions & 429 deletions

File tree

‎public/themes/bootstrap/scss/_navigation.scss‎

Lines changed: 0 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
#pmalogo,
3838
#serverChoice,
3939
#navipanellinks,
40-
#recentTableList,
41-
#favoriteTableList,
4240
#databaseList,
4341
div.pageselector.dbselector {
4442
text-align: center;
@@ -64,15 +62,6 @@
6462
#navipanellinks .icon {
6563
margin: 0;
6664
}
67-
68-
#recentTable,
69-
#favoriteTable {
70-
width: 200px;
71-
}
72-
73-
#favoriteTableList select {
74-
width: 80%;
75-
}
7665
}
7766

7867
@include color-mode(dark) {
@@ -405,70 +394,6 @@ li.fast_filter {
405394
}
406395
}
407396

408-
// Quick warp links
409-
.pma_quick_warp {
410-
margin-top: 5px;
411-
margin-left: 2px;
412-
position: relative;
413-
414-
.drop_list {
415-
float: left;
416-
margin-left: 3px;
417-
padding: 2px 0;
418-
419-
&:hover {
420-
ul {
421-
display: block;
422-
}
423-
}
424-
425-
ul {
426-
position: absolute;
427-
margin: 0;
428-
padding: 0;
429-
overflow: hidden;
430-
overflow-y: auto;
431-
list-style: none;
432-
background: $white;
433-
border: 1px solid #ddd;
434-
border-radius: 0.3em;
435-
border-top-right-radius: 0;
436-
border-bottom-right-radius: 0;
437-
box-shadow: 0 0 5px #ccc;
438-
top: 100%;
439-
left: 3px;
440-
right: 0;
441-
display: none;
442-
z-index: 802;
443-
}
444-
445-
li {
446-
white-space: nowrap;
447-
padding: 0;
448-
border-radius: 0;
449-
450-
img {
451-
vertical-align: sub;
452-
}
453-
454-
&:hover {
455-
background: #f2f2f2;
456-
}
457-
}
458-
459-
a {
460-
display: block;
461-
padding: 0.2em 0.3em;
462-
463-
&.favorite_table_anchor {
464-
clear: left;
465-
float: left;
466-
padding: 0.1em 0.3em 0;
467-
}
468-
}
469-
}
470-
}
471-
472397
@include color-mode(dark) {
473398
#pma_navigation_tree {
474399
li {
@@ -479,18 +404,6 @@ li.fast_filter {
479404
}
480405
}
481406
}
482-
483-
.pma_quick_warp {
484-
ul {
485-
background-color: var(--#{$prefix}body-bg);
486-
}
487-
488-
li {
489-
&:hover {
490-
background: $gray-800;
491-
}
492-
}
493-
}
494407
}
495408

496409
#floating_menubar {

‎public/themes/metro/scss/_navigation.scss‎

Lines changed: 0 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,6 @@
9090
display: none;
9191
}
9292

93-
#recentTableList {
94-
text-align: center;
95-
padding: 10px;
96-
97-
select {
98-
min-width: 100%;
99-
}
100-
}
101-
10293
#databaseList {
10394
text-align: center;
10495
margin: 10px;
@@ -458,78 +449,6 @@ li.fast_filter {
458449
z-index: 801;
459450
}
460451

461-
/* Quick warp links */
462-
.pma_quick_warp {
463-
margin-top: 5px;
464-
margin-left: 10px;
465-
position: relative;
466-
467-
.drop_list {
468-
float: left;
469-
margin-left: 3px;
470-
padding: 2px 0;
471-
}
472-
473-
.drop_button {
474-
padding: 0.2em 0.5em;
475-
border: 1px solid #ddd;
476-
background: #f2f2f2;
477-
cursor: pointer;
478-
color: #333;
479-
}
480-
481-
.drop_list {
482-
&:hover .drop_button {
483-
background: #fff;
484-
color: #333;
485-
}
486-
487-
ul {
488-
position: absolute;
489-
margin: 0;
490-
padding: 0;
491-
overflow: hidden;
492-
overflow-y: auto;
493-
list-style: none;
494-
background: #fff;
495-
border: 1px solid #ddd;
496-
top: 100%;
497-
left: 3px;
498-
right: 0;
499-
display: none;
500-
z-index: 802;
501-
}
502-
503-
&:hover ul {
504-
display: block;
505-
}
506-
507-
li {
508-
white-space: nowrap;
509-
padding: 0;
510-
511-
img {
512-
vertical-align: sub;
513-
}
514-
515-
&:hover {
516-
background: #f2f2f2;
517-
}
518-
}
519-
520-
a {
521-
display: block;
522-
padding: 0.2em 0.3em;
523-
524-
&.favorite_table_anchor {
525-
clear: left;
526-
float: left;
527-
padding: 0.1em 0.3em 0;
528-
}
529-
}
530-
}
531-
}
532-
533452
#floating_menubar {
534453
z-index: 99;
535454
}

‎public/themes/original/scss/_navigation.scss‎

Lines changed: 0 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -51,24 +51,11 @@
5151
background-color: $navi-background;
5252
padding: 0.3em;
5353
}
54-
55-
&#recentTableList,
56-
&#FavoriteTableList {
57-
text-align: center;
58-
margin-bottom: 0.5em;
59-
}
60-
}
61-
62-
#recentTable,
63-
#FavoriteTable {
64-
width: 200px;
6554
}
6655

6756
#pmalogo,
6857
#serverChoice,
6958
#navipanellinks,
70-
#recentTableList,
71-
#FavoriteTableList,
7259
#databaseList,
7360
div.pageselector.dbselector {
7461
text-align: center;
@@ -81,17 +68,9 @@
8168
margin: 0;
8269
}
8370

84-
#recentTableList select,
85-
#FavoriteTableList select,
8671
#serverChoice select {
8772
width: 80%;
8873
}
89-
90-
#recentTableList,
91-
#FavoriteTableList {
92-
margin-bottom: 0;
93-
padding-bottom: 0;
94-
}
9574
}
9675

9776
#pma_navigation_content > img.throbber {
@@ -387,76 +366,6 @@ li.fast_filter {
387366
padding-right: 23px;
388367
}
389368

390-
.pma_quick_warp {
391-
margin-top: 5px;
392-
margin-left: 2px;
393-
position: relative;
394-
395-
.drop_list {
396-
float: left;
397-
margin-left: 3px;
398-
padding: 2px 0;
399-
}
400-
401-
.drop_button {
402-
padding: 0 0.3em;
403-
border: 1px solid #ddd;
404-
background: #f2f2f2;
405-
cursor: pointer;
406-
}
407-
408-
.drop_list {
409-
&:hover .drop_button {
410-
background: #fff;
411-
}
412-
413-
ul {
414-
position: absolute;
415-
margin: 0;
416-
padding: 0;
417-
overflow: hidden;
418-
overflow-y: auto;
419-
list-style: none;
420-
background: #fff;
421-
border: 1px solid #ddd;
422-
border-top-right-radius: 0;
423-
border-bottom-right-radius: 0;
424-
top: 100%;
425-
left: 3px;
426-
right: 0;
427-
display: none;
428-
z-index: 802;
429-
}
430-
431-
&:hover ul {
432-
display: block;
433-
}
434-
435-
li {
436-
white-space: nowrap;
437-
438-
img {
439-
vertical-align: sub;
440-
}
441-
442-
&:hover {
443-
background: #f2f2f2;
444-
}
445-
}
446-
447-
a {
448-
display: block;
449-
padding: 0.1em 0.3em;
450-
451-
&.favorite_table_anchor {
452-
clear: left;
453-
float: left;
454-
padding: 0.1em 0.3em 0;
455-
}
456-
}
457-
}
458-
}
459-
460369
#floating_menubar {
461370
z-index: 99;
462371
}

0 commit comments

Comments
 (0)