Skip to content

Commit

Permalink
Merge pull request #19110 from MauricioFauth/recent-favorite-tables
Browse files Browse the repository at this point in the history
Refactor recent/favorite tables buttons
  • Loading branch information
MauricioFauth committed Apr 13, 2024
2 parents ca9032a + a921326 commit a6c56e6
Show file tree
Hide file tree
Showing 13 changed files with 92 additions and 429 deletions.
87 changes: 0 additions & 87 deletions public/themes/bootstrap/scss/_navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
#pmalogo,
#serverChoice,
#navipanellinks,
#recentTableList,
#favoriteTableList,
#databaseList,
div.pageselector.dbselector {
text-align: center;
Expand All @@ -64,15 +62,6 @@
#navipanellinks .icon {
margin: 0;
}

#recentTable,
#favoriteTable {
width: 200px;
}

#favoriteTableList select {
width: 80%;
}
}

@include color-mode(dark) {
Expand Down Expand Up @@ -405,70 +394,6 @@ li.fast_filter {
}
}

// Quick warp links
.pma_quick_warp {
margin-top: 5px;
margin-left: 2px;
position: relative;

.drop_list {
float: left;
margin-left: 3px;
padding: 2px 0;

&:hover {
ul {
display: block;
}
}

ul {
position: absolute;
margin: 0;
padding: 0;
overflow: hidden;
overflow-y: auto;
list-style: none;
background: $white;
border: 1px solid #ddd;
border-radius: 0.3em;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
box-shadow: 0 0 5px #ccc;
top: 100%;
left: 3px;
right: 0;
display: none;
z-index: 802;
}

li {
white-space: nowrap;
padding: 0;
border-radius: 0;

img {
vertical-align: sub;
}

&:hover {
background: #f2f2f2;
}
}

a {
display: block;
padding: 0.2em 0.3em;

&.favorite_table_anchor {
clear: left;
float: left;
padding: 0.1em 0.3em 0;
}
}
}
}

@include color-mode(dark) {
#pma_navigation_tree {
li {
Expand All @@ -479,18 +404,6 @@ li.fast_filter {
}
}
}

.pma_quick_warp {
ul {
background-color: var(--#{$prefix}body-bg);
}

li {
&:hover {
background: $gray-800;
}
}
}
}

#floating_menubar {
Expand Down
81 changes: 0 additions & 81 deletions public/themes/metro/scss/_navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,6 @@
display: none;
}

#recentTableList {
text-align: center;
padding: 10px;

select {
min-width: 100%;
}
}

#databaseList {
text-align: center;
margin: 10px;
Expand Down Expand Up @@ -458,78 +449,6 @@ li.fast_filter {
z-index: 801;
}

/* Quick warp links */
.pma_quick_warp {
margin-top: 5px;
margin-left: 10px;
position: relative;

.drop_list {
float: left;
margin-left: 3px;
padding: 2px 0;
}

.drop_button {
padding: 0.2em 0.5em;
border: 1px solid #ddd;
background: #f2f2f2;
cursor: pointer;
color: #333;
}

.drop_list {
&:hover .drop_button {
background: #fff;
color: #333;
}

ul {
position: absolute;
margin: 0;
padding: 0;
overflow: hidden;
overflow-y: auto;
list-style: none;
background: #fff;
border: 1px solid #ddd;
top: 100%;
left: 3px;
right: 0;
display: none;
z-index: 802;
}

&:hover ul {
display: block;
}

li {
white-space: nowrap;
padding: 0;

img {
vertical-align: sub;
}

&:hover {
background: #f2f2f2;
}
}

a {
display: block;
padding: 0.2em 0.3em;

&.favorite_table_anchor {
clear: left;
float: left;
padding: 0.1em 0.3em 0;
}
}
}
}

#floating_menubar {
z-index: 99;
}
91 changes: 0 additions & 91 deletions public/themes/original/scss/_navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,24 +51,11 @@
background-color: $navi-background;
padding: 0.3em;
}

&#recentTableList,
&#FavoriteTableList {
text-align: center;
margin-bottom: 0.5em;
}
}

#recentTable,
#FavoriteTable {
width: 200px;
}

#pmalogo,
#serverChoice,
#navipanellinks,
#recentTableList,
#FavoriteTableList,
#databaseList,
div.pageselector.dbselector {
text-align: center;
Expand All @@ -81,17 +68,9 @@
margin: 0;
}

#recentTableList select,
#FavoriteTableList select,
#serverChoice select {
width: 80%;
}

#recentTableList,
#FavoriteTableList {
margin-bottom: 0;
padding-bottom: 0;
}
}

#pma_navigation_content > img.throbber {
Expand Down Expand Up @@ -387,76 +366,6 @@ li.fast_filter {
padding-right: 23px;
}

.pma_quick_warp {
margin-top: 5px;
margin-left: 2px;
position: relative;

.drop_list {
float: left;
margin-left: 3px;
padding: 2px 0;
}

.drop_button {
padding: 0 0.3em;
border: 1px solid #ddd;
background: #f2f2f2;
cursor: pointer;
}

.drop_list {
&:hover .drop_button {
background: #fff;
}

ul {
position: absolute;
margin: 0;
padding: 0;
overflow: hidden;
overflow-y: auto;
list-style: none;
background: #fff;
border: 1px solid #ddd;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
top: 100%;
left: 3px;
right: 0;
display: none;
z-index: 802;
}

&:hover ul {
display: block;
}

li {
white-space: nowrap;

img {
vertical-align: sub;
}

&:hover {
background: #f2f2f2;
}
}

a {
display: block;
padding: 0.1em 0.3em;

&.favorite_table_anchor {
clear: left;
float: left;
padding: 0.1em 0.3em 0;
}
}
}
}

#floating_menubar {
z-index: 99;
}
Loading

0 comments on commit a6c56e6

Please sign in to comment.