Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add bootstrap 5.2 cdn links for both CSS and Js and removed all !important from scss #302

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
52 changes: 28 additions & 24 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
Expand All @@ -11,8 +12,10 @@
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.11.2/css/all.css">
<!-- Google Fonts Roboto -->
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap">
<!-- Bootstrap core CSS -->
<link rel="stylesheet" href="css/bootstrap.min.css">
<!-- Bootstrap core CSS with cdn-->
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">

<!-- Material Design Bootstrap -->
<link rel="stylesheet" href="css/mdb.min.css">
<!-- Your custom styles (optional) -->
Expand All @@ -21,43 +24,44 @@

</style>
</head>

<body>
<!-- Start your project here-->
<div class="container pt-5">
<div class="d-flex justify-content-center align-items-center" style="height: 100vh">
<div class="text-center">
<img
class="mb-4"
src="https://v1.mdbootstrap.com/wp-content/uploads/2022/11/mdb-sale.png"
/>
<img class="mb-4" src="https://v1.mdbootstrap.com/wp-content/uploads/2022/11/mdb-sale.png" />
<h5 class="mb-4">Only now, you can get all premium features & more with the best discounts of the year.</h5>
<p class="mb-4 fw-bold">All offers are LIMITED!</p>
<a
class="btn btn-lg btn-danger fw-bold mb-3" style="background-color: #e70808;"
href="https://mdbootstrap.com/sale/november/"
target="_blank"
role="button"
>Check insane offers</a
>
<hr>
<p class="mt-4 lead fw-bold">Publish your project with a single command.</p>
<p class="mt-2">Use <a href="https://mdbgo.com/" class="fw-bold" target="_blank"><u>MDB GO</u></a> for a free hosting & deployment
tool</p>
<a class="btn btn-lg btn-danger fw-bold mb-3" style="background-color: #e70808;"
href="https://mdbootstrap.com/sale/november/" target="_blank" role="button">Check insane offers</a>
<hr>
<p class="mt-4 lead fw-bold">Publish your project with a single command.</p>
<p class="mt-2">Use <a href="https://mdbgo.com/" class="fw-bold" target="_blank"><u>MDB GO</u></a> for a free
hosting & deployment
tool</p>
</div>
</div>
</div>
<!-- End your project here-->

<!-- jQuery -->
<script type="text/javascript" src="js/jquery.min.js"></script>
<!-- Bootstrap tooltips -->
<script type="text/javascript" src="js/popper.min.js"></script>
<!-- Bootstrap core JavaScript -->
<script type="text/javascript" src="js/bootstrap.min.js"></script>
<!-- js with cdn of bootstrap -->
<script src="https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js"
integrity="sha384-oBqDVmMz9ATKxIep9tiCxS/Z9fNfEXiDAYTujMAeBAsjFuCZSmKbSSUnQlmh/jp3"
crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"
integrity="sha384-cuYeSxntonz0PPNlHhBs68uyIAVpIIOZZ5JqeqvYYIcEL727kskC66kF92t6Xl2V"
crossorigin="anonymous"></script>
<!-- MDB core JavaScript -->
<script type="text/javascript" src="js/mdb.min.js"></script>
<!-- Your custom scripts (optional) -->
<script type="text/javascript"></script>



</body>
</html>

</html>
51 changes: 35 additions & 16 deletions scss/addons/_datatables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@

div.dataTables_wrapper div {
&.dataTables_length {
select, input {
select,
input {
width: auto;
}
&.d-flex.flex-row {
Expand All @@ -25,7 +26,8 @@ div.dataTables_wrapper div {
margin-right: 1rem;
}
.select-wrapper.mdb-select {
span, .select-dropdown {
span,
.select-dropdown {
margin-top: 1rem;
}
}
Expand All @@ -34,8 +36,8 @@ div.dataTables_wrapper div {
&.dataTables_length,
&.dataTables_filter {
label {
padding-top: .5rem;
padding-bottom: .5rem;
padding-top: 0.5rem;
padding-bottom: 0.5rem;
font-weight: 400;
text-align: left;
}
Expand All @@ -47,7 +49,7 @@ div.dataTables_wrapper div {
}
input {
display: inline-block;
margin-left: .5rem;
margin-left: 0.5rem;
}
text-align: right;
}
Expand Down Expand Up @@ -80,7 +82,10 @@ div.dataTables_wrapper div {

@media (max-width: 767px) {
div.dataTables_wrapper div {
.dataTables_length, .dataTables_filter, .dataTables_info, .dataTables_paginate ul.pagination {
.dataTables_length,
.dataTables_filter,
.dataTables_info,
.dataTables_paginate ul.pagination {
-ms-flex-pack: center;
-webkit-justify-content: center;
justify-content: center;
Expand All @@ -91,19 +96,22 @@ div.dataTables_wrapper div {
}

.bs-select select {
display: inline-block !important;
display: inline-block;
}

table.dataTable thead {
cursor: pointer;
> tr > {
th,
td {
&.sorting_asc, &.sorting_desc, &.sorting {
&.sorting_asc,
&.sorting_desc,
&.sorting {
padding-right: 30px;
}
}
th:active, td:active {
th:active,
td:active {
outline: none;
}
}
Expand All @@ -114,31 +122,42 @@ table.dataTable thead {
.sorting_desc_disabled {
position: relative;
cursor: pointer;
&:before, &:after {
&:before,
&:after {
position: absolute;
bottom: .9em;
bottom: 0.9em;
display: block;
opacity: .3;
opacity: 0.3;
}
}
.sorting:before, .sorting_asc:before, .sorting_desc:before, .sorting_asc_disabled:before, .sorting_desc_disabled:before {
.sorting:before,
.sorting_asc:before,
.sorting_desc:before,
.sorting_asc_disabled:before,
.sorting_desc_disabled:before {
right: 1em;
font-family: "Font Awesome\ 5 Free", sans-serif;
font-size: 1rem;
font-weight: 900;
content: "\f0de";
}
.sorting:after, .sorting_asc:after, .sorting_desc:after, .sorting_asc_disabled:after, .sorting_desc_disabled:after {
.sorting:after,
.sorting_asc:after,
.sorting_desc:after,
.sorting_asc_disabled:after,
.sorting_desc_disabled:after {
right: 16px;
font-family: "Font Awesome\ 5 Free", sans-serif;
font-size: 1rem;
font-weight: 900;
content: "\f0dd";
}
.sorting_asc:before, .sorting_desc:after {
.sorting_asc:before,
.sorting_desc:after {
opacity: 1;
}
.sorting_asc_disabled:before, .sorting_desc_disabled:after {
.sorting_asc_disabled:before,
.sorting_desc_disabled:after {
opacity: 0;
}
}
72 changes: 46 additions & 26 deletions scss/addons/_datatables2.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@

div.dataTables_wrapper div {
&.dataTables_length {
select, input {
select,
input {
width: auto;
}
&.d-flex.flex-row {
Expand All @@ -25,7 +26,8 @@ div.dataTables_wrapper div {
margin-right: 1rem;
}
.select-wrapper.mdb-select {
span, .select-dropdown {
span,
.select-dropdown {
margin-top: 1rem;
}
}
Expand All @@ -34,8 +36,8 @@ div.dataTables_wrapper div {
&.dataTables_length,
&.dataTables_filter {
label {
padding-top: .5rem;
padding-bottom: .5rem;
padding-top: 0.5rem;
padding-bottom: 0.5rem;
font-weight: 400;
text-align: left;
}
Expand All @@ -47,7 +49,7 @@ div.dataTables_wrapper div {
}
input {
display: inline-block;
margin-left: .5rem;
margin-left: 0.5rem;
}
text-align: right;
}
Expand All @@ -68,13 +70,12 @@ div.dataTables_wrapper div {
.page-item {
&.active {
.page-link {

background-color: #7e7e7e;
&:focus {
background-color: #7e7e7e;
}
}
}
}
.page-link:focus {
-webkit-box-shadow: none;
box-shadow: none;
Expand All @@ -86,7 +87,10 @@ div.dataTables_wrapper div {

@media (max-width: 767px) {
div.dataTables_wrapper div {
.dataTables_length, .dataTables_filter, .dataTables_info, .dataTables_paginate ul.pagination {
.dataTables_length,
.dataTables_filter,
.dataTables_info,
.dataTables_paginate ul.pagination {
-ms-flex-pack: center;
-webkit-justify-content: center;
justify-content: center;
Expand All @@ -97,7 +101,7 @@ div.dataTables_wrapper div {
}

.bs-select select {
display: inline-block !important;
display: inline-block;
}

table.dataTable thead {
Expand All @@ -109,23 +113,27 @@ table.dataTable thead {
> tr > {
th,
td {
&.sorting_asc, &.sorting_desc, &.sorting {
&.sorting_asc,
&.sorting_desc,
&.sorting {
padding-right: 30px;
}
}
th:active, td:active {
th:active,
td:active {
outline: none;
}
}

.sorting,
.sorting_asc,
.sorting_desc,
.sorting_asc_disabled,
.sorting_desc_disabled {
position: relative;
cursor: pointer;
&:before, &:after {
&:before,
&:after {
position: absolute;
bottom: 1rem;
display: block;
Expand All @@ -137,43 +145,55 @@ table.dataTable thead {
opacity: 0.6;
}
}
.sorting:before, .sorting_asc:before, .sorting_desc:before, .sorting_asc_disabled:before, .sorting_desc_disabled:before {
.sorting:before,
.sorting_asc:before,
.sorting_desc:before,
.sorting_asc_disabled:before,
.sorting_desc_disabled:before {
left: 0.4rem;
font-family: "Font Awesome\ 5 Free", sans-serif;
font-size: 1rem;
font-weight: 900;
content: "\f062";
}
.sorting:after, .sorting_asc:after, .sorting_desc:after, .sorting_asc_disabled:after, .sorting_desc_disabled:after {
.sorting:after,
.sorting_asc:after,
.sorting_desc:after,
.sorting_asc_disabled:after,
.sorting_desc_disabled:after {
left: 0.4rem;
font-family: "Font Awesome\ 5 Free", sans-serif;
font-size: 1rem;
font-weight: 900;
content: "\f063";
}
.sorting_asc:before, .sorting_desc:after {
.sorting_asc:before,
.sorting_desc:after {
opacity: 1;
}
.sorting_asc_disabled:before, .sorting_desc_disabled:after {
.sorting_asc_disabled:before,
.sorting_desc_disabled:after {
opacity: 0;
}
}

.dataTables_scrollHead {
.dataTables_scrollHeadInner, .dataTables_scrollHeadInner table {
padding-right: 0 !important;
margin-right: 0 !important;
width: 100% !important;
.dataTables_scrollHeadInner,
.dataTables_scrollHeadInner table {
padding-right: 0;
margin-right: 0;
width: 100%;
}
.dataTables_scrollHeadInner table {
margin-bottom: 0 !important;
margin-bottom: 0;
}
}

.dataTables_scrollFoot {
.dataTables_scrollFootInner, .dataTables_scrollFootInner table {
padding-right: 0 !important;
margin-right: 0 !important;
width: 100% !important;
.dataTables_scrollFootInner,
.dataTables_scrollFootInner table {
padding-right: 0;
margin-right: 0;
width: 100%;
}
}