Skip to content

Commit

Permalink
Made basic compatibility with 5.1 & 5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
khadkamhn committed Nov 23, 2022
1 parent 9f8fa56 commit d63240b
Show file tree
Hide file tree
Showing 6 changed files with 116 additions and 27 deletions.
2 changes: 1 addition & 1 deletion fistu/css/theme.css

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion fistu/css/theme.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion fistu/package.json
Expand Up @@ -32,4 +32,4 @@
],
"author": "Mohan",
"license": "MIT"
}
}
4 changes: 2 additions & 2 deletions fistu/scss/_bootstrap.scss
Expand Up @@ -6,7 +6,7 @@
//@import "../../../node_modules/bootstrap/scss/type";
//@import "../../../node_modules/bootstrap/scss/images";
//@import "../../../node_modules/bootstrap/scss/code";
//@import "../../../node_modules/bootstrap/scss/grid";
@import "../../../node_modules/bootstrap/scss/grid";
//@import "../../../node_modules/bootstrap/scss/tables";
//@import "../../../node_modules/bootstrap/scss/forms";
@import "../../../node_modules/bootstrap/scss/buttons";
Expand All @@ -27,7 +27,7 @@
//@import "../../../node_modules/bootstrap/scss/media";
//@import "../../../node_modules/bootstrap/scss/list-group";
//@import "../../../node_modules/bootstrap/scss/close";
//@import "../../../node_modules/bootstrap/scss/modal";
@import "../../../node_modules/bootstrap/scss/modal";
//@import "../../../node_modules/bootstrap/scss/tooltip";
//@import "../../../node_modules/bootstrap/scss/popover";
//@import "../../../node_modules/bootstrap/scss/carousel";
Expand Down
129 changes: 108 additions & 21 deletions fistu/scss/_common.scss
Expand Up @@ -830,22 +830,24 @@ td .icon {
}

.success h1,
.notice h1 {
.notice h1,
.alert .alert-heading {
font-weight: bold;
text-align: $left;
margin: 0 0 0.2em 0;
border-bottom: 2px solid;
}

div {
&.error h1 {
div, .alert {
&.error h1, &.alert-danger .alert-heading {
font-weight: bold;
text-align: $left;
margin: 0 0 0.2em 0;
border-bottom: 2px solid;
}

&.success, &.notice, &.error {
&.success, &.notice, &.error,
&.alert-success, &.alert-danger, &.alert-warning, &.alert-primary {
clear: both;
border: 1px solid;
margin: 0.5em 0 0.5em;
Expand Down Expand Up @@ -882,46 +884,46 @@ div {
}
}

.success a, .notice a, .error a {
.success a, .notice a, .error a, .alert a {
text-decoration: underline;
}

.success {
.success, .alert-success {
color: $white;
background-color: ptn(green,200);
}

h1.success, div.success {
h1.success, div.success, .alert-success {
border-color: ptn(green,500);
}

.success h1 {
.success h1, .alert-success .alert-heading {
border-color: inherit;
}

.notice {
.notice, .alert-warning, .alert-primary {
color: $white;
background-color: ptn(amber,500);
}

h1.notice, div.notice {
h1.notice, div.notice, div.alert-warning, div.alert-primary {
border-color: ptn(amber,700);
}

.notice h1 {
.notice h1, .alert-warning .alert-heading, .alert-primary .alert-heading {
border-color: inherit;
}

.error {
.error, .alert-danger {
color: $white;
background-color: ptn(red,400);
}

h1.error, div.error {
h1.error, div.error, .alert-danger {
border-color: ptn(red,600);
}

.error h1 {
.error h1, .alert-danger .alert-heading {
border-color: inherit;
}

Expand Down Expand Up @@ -1244,6 +1246,7 @@ ul {
a {
color: $primary;
font-weight: 500;
display: inline-block;
text-transform: uppercase;
}
&:hover {
Expand Down Expand Up @@ -1372,14 +1375,15 @@ div#tablestatistics table {
height: $top-bar-height;
}

#serverinfo {
#serverinfo, .breadcrumb {
padding: 0.8em;
max-width: 100%;
overflow: hidden;
list-style: none;
height: $top-bar-height;
padding-#{$left}: 2.8em;

.item {
.item, .breadcrumb-item a {
color: #fff;
white-space: nowrap;
vertical-align: middle;
Expand All @@ -1397,6 +1401,9 @@ div#tablestatistics table {
@include fistu-icon('eye','#{$white}');
}
}
.breadcrumb {
margin-bottom: 0;
}

#page_nav_icons {
top: 0;
Expand Down Expand Up @@ -1950,7 +1957,8 @@ div#queryboxcontainer div#bookmarkoptions {

/* iconic view for ul items */

li.no_bullets {
li.no_bullets,
.col-lg-7 .list-group .list-group-item {
list-style-type: none !important;
margin-#{$left}: -25px !important; //align with other list items which have bullets
}
Expand Down Expand Up @@ -2111,19 +2119,60 @@ div.sqlvalidate {
}
}
}
.col-lg-5 {
.list-group {
list-style: none;
padding-top: 5px;
padding-left: 15px;
&:last-child {
margin-bottom: 0;
}
.list-group-item {
position: relative;
padding-left: 30px;
padding-left: 24px;
list-style: none;
&::before {
left: 0;
top: 50%;
width: 16px;
content: '';
height: 16px;
margin-top: -8px;
position: absolute;
background-position: center;
background-repeat: no-repeat;
@include fistu-icon('info','#{ptn(grey,500)}');
}
}
}
}

@include media-breakpoint-up(md) {
#maincontainer {
&>.container-fluid {
padding: 0;
padding-top: 1rem;
&>.row>div:first-child {
padding-right: 0;
}
}
}
}

.group {
.group, .card {
background-color: $white;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);

margin-bottom: 1em;
padding-bottom: 1em;

h2 {
h2, .card-header {
color: #fff;
margin-top: 0;
font-weight: 300;
font-size: 1.5em;
margin-bottom: 10px;
padding: 0.1em 0.3em;
background-color: $primary;
@include fistu-bg-grd();
Expand Down Expand Up @@ -4144,8 +4193,46 @@ body .ui-dialog {
background-color: $secondary;
}
}

@media only screen and (max-width: 768px) {
@include media-breakpoint-up(md) {
.navbar-toggler {
display: none;
}
}
@include media-breakpoint-down(md) {
.navbar-toggler {
border: none;
width: $top-bar-height;
height: $top-bar-height;
padding: $top-bar-height/2/2;
background-color: transparent;
.navbar-toggler-icon {
width: 16px;
height: 16px;
display: block;
@include fistu-icon('menu','#{$icon}');
}
}
.navbar-collapse {
.navbar-nav {
max-width: 400px;
height: auto!important;
display: block!important;
background-color: fade-out($white,.10);
.nav-item {
display: block;
float: none!important;
.nav-link {
width: 100%;
}
}
}
&.collapse {
display: none;
&.show {
display: block;
}
}
}
#pmalogo:after {
text-align: left;
text-indent: 12px;
Expand Down
2 changes: 1 addition & 1 deletion fistu/theme.json
Expand Up @@ -4,5 +4,5 @@
"description": "a clean makeup for phpMyAdmin",
"author": "Mohan Khadka",
"url": "https://www.mohankhadka.com.np/",
"supports": ["5.0"]
"supports": ["5.0","5.1","5.2"]
}

0 comments on commit d63240b

Please sign in to comment.