Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 279081a

Browse files
amercaderamercader
authored
Merge pull request #7163 from pdelboca/sync-css-files
Update css files for latest frontend dependencies build
2 parents e16ff34 + 28d6b2c commit 279081a

5 files changed

Lines changed: 84 additions & 283 deletions

File tree

‎changes/7163.bugfix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Build CSS files with latest updates.

‎ckan/public/base/css/main-rtl.css‎

Lines changed: 28 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,8 @@ progress {
664664
flex-shrink: 0;
665665
width: 100%;
666666
max-width: 100%;
667+
padding-right: calc(var(--bs-gutter-x) * 0.5);
668+
padding-left: calc(var(--bs-gutter-x) * 0.5);
667669
margin-top: var(--bs-gutter-y);
668670
}
669671

@@ -4741,93 +4743,38 @@ textarea.form-control-lg {
47414743
color: #6c757d;
47424744
}
47434745

4744-
.pagination > li {
4745-
display: inline-flex;
4746+
.pagination {
4747+
display: flex;
4748+
padding-left: 0;
4749+
list-style: none;
47464750
}
4747-
.pagination > li > a, .pagination > li > span {
4751+
4752+
.page-link {
47484753
position: relative;
4749-
float: left;
4750-
padding: 6px 12px;
4751-
margin-left: -1px;
4752-
line-height: 1.42857143;
4754+
display: block;
47534755
color: #206b82;
4754-
text-decoration: none;
47554756
background-color: #fff;
4756-
border: 1px solid #ddd;
4757-
}
4758-
.pagination > li > a:hover, .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus {
4759-
z-index: 2;
4760-
color: #113845;
4761-
background-color: #eeeeee;
4762-
border-color: #ddd;
4757+
border: 1px solid #dee2e6;
4758+
transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
47634759
}
4764-
.pagination > li:first-child > a, .pagination > li:first-child > span {
4765-
margin-left: 0;
4766-
border-top-left-radius: 4px;
4767-
border-bottom-left-radius: 4px;
4760+
@media (prefers-reduced-motion: reduce) {
4761+
.page-link {
4762+
transition: none;
4763+
}
47684764
}
4769-
.pagination > li:last-child > a, .pagination > li:last-child > span {
4770-
border-top-right-radius: 4px;
4771-
border-bottom-right-radius: 4px;
4765+
.page-link:hover {
4766+
z-index: 2;
4767+
color: #1a5668;
4768+
text-decoration: none;
4769+
background-color: #e9ecef;
4770+
border-color: #dee2e6;
47724771
}
4773-
.pagination > .active > a, .pagination > .active > span, .pagination > .active > a:hover, .pagination > .active > span:hover, .pagination > .active > a:focus, .pagination > .active > span:focus {
4772+
.page-link:focus {
47744773
z-index: 3;
4775-
color: #fff;
4776-
cursor: default;
4777-
background-color: #206b82;
4778-
border-color: #206b82;
4779-
}
4780-
.pagination > .disabled > span {
4781-
color: #777777;
4782-
cursor: not-allowed;
4783-
background-color: #fff;
4784-
border-color: #ddd;
4785-
}
4786-
.pagination > .disabled > span:hover, .pagination > .disabled > span:focus {
4787-
color: #777777;
4788-
cursor: not-allowed;
4789-
background-color: #fff;
4790-
border-color: #ddd;
4791-
}
4792-
.pagination > .disabled > a {
4793-
color: #777777;
4794-
cursor: not-allowed;
4795-
background-color: #fff;
4796-
border-color: #ddd;
4797-
}
4798-
.pagination > .disabled > a:hover, .pagination > .disabled > a:focus {
4799-
color: #777777;
4800-
cursor: not-allowed;
4801-
background-color: #fff;
4802-
border-color: #ddd;
4803-
}
4804-
4805-
.pagination-lg > li > a, .pagination-lg > li > span {
4806-
padding: 10px 16px;
4807-
font-size: 18px;
4808-
line-height: 1.3333333;
4809-
}
4810-
.pagination-lg > li:first-child > a, .pagination-lg > li:first-child > span {
4811-
border-top-left-radius: 6px;
4812-
border-bottom-left-radius: 6px;
4813-
}
4814-
.pagination-lg > li:last-child > a, .pagination-lg > li:last-child > span {
4815-
border-top-right-radius: 6px;
4816-
border-bottom-right-radius: 6px;
4817-
}
4818-
4819-
.pagination-sm > li > a, .pagination-sm > li > span {
4820-
padding: 5px 10px;
4821-
font-size: 12px;
4822-
line-height: 1.5;
4823-
}
4824-
.pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span {
4825-
border-top-left-radius: 3px;
4826-
border-bottom-left-radius: 3px;
4827-
}
4828-
.pagination-sm > li:last-child > a, .pagination-sm > li:last-child > span {
4829-
border-top-right-radius: 3px;
4830-
border-bottom-right-radius: 3px;
4774+
color: #1a5668;
4775+
background-color: #e9ecef;
4776+
outline: 0;
4777+
box-shadow: 0 0 0 0.25rem rgba(32, 107, 130, 0.25);
48314778
}
48324779

48334780
.page-item:not(:first-child) .page-link {
@@ -13805,6 +13752,7 @@ td.diff_header {
1380513752
border-width: 0;
1380613753
box-shadow: 0;
1380713754
border-radius: 0;
13755+
display: -webkit-box;
1380813756
display: -webkit-flex;
1380913757
display: flex;
1381013758
-webkit-box-orient: vertical;
@@ -14924,4 +14872,4 @@ br.line-height2 {
1492414872
right: auto;
1492514873
left: 0;
1492614874
}
14927-
}
14875+
}

‎ckan/public/base/css/main.css‎

Lines changed: 29 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,8 @@ progress {
664664
flex-shrink: 0;
665665
width: 100%;
666666
max-width: 100%;
667+
padding-right: calc(var(--bs-gutter-x) * 0.5);
668+
padding-left: calc(var(--bs-gutter-x) * 0.5);
667669
margin-top: var(--bs-gutter-y);
668670
}
669671

@@ -4741,93 +4743,38 @@ textarea.form-control-lg {
47414743
color: #6c757d;
47424744
}
47434745

4744-
.pagination > li {
4745-
display: inline-flex;
4746+
.pagination {
4747+
display: flex;
4748+
padding-left: 0;
4749+
list-style: none;
47464750
}
4747-
.pagination > li > a, .pagination > li > span {
4751+
4752+
.page-link {
47484753
position: relative;
4749-
float: left;
4750-
padding: 6px 12px;
4751-
margin-left: -1px;
4752-
line-height: 1.42857143;
4754+
display: block;
47534755
color: #206b82;
4754-
text-decoration: none;
47554756
background-color: #fff;
4756-
border: 1px solid #ddd;
4757-
}
4758-
.pagination > li > a:hover, .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus {
4759-
z-index: 2;
4760-
color: #113845;
4761-
background-color: #eeeeee;
4762-
border-color: #ddd;
4757+
border: 1px solid #dee2e6;
4758+
transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
47634759
}
4764-
.pagination > li:first-child > a, .pagination > li:first-child > span {
4765-
margin-left: 0;
4766-
border-top-left-radius: 4px;
4767-
border-bottom-left-radius: 4px;
4760+
@media (prefers-reduced-motion: reduce) {
4761+
.page-link {
4762+
transition: none;
4763+
}
47684764
}
4769-
.pagination > li:last-child > a, .pagination > li:last-child > span {
4770-
border-top-right-radius: 4px;
4771-
border-bottom-right-radius: 4px;
4765+
.page-link:hover {
4766+
z-index: 2;
4767+
color: #1a5668;
4768+
text-decoration: none;
4769+
background-color: #e9ecef;
4770+
border-color: #dee2e6;
47724771
}
4773-
.pagination > .active > a, .pagination > .active > span, .pagination > .active > a:hover, .pagination > .active > span:hover, .pagination > .active > a:focus, .pagination > .active > span:focus {
4772+
.page-link:focus {
47744773
z-index: 3;
4775-
color: #fff;
4776-
cursor: default;
4777-
background-color: #206b82;
4778-
border-color: #206b82;
4779-
}
4780-
.pagination > .disabled > span {
4781-
color: #777777;
4782-
cursor: not-allowed;
4783-
background-color: #fff;
4784-
border-color: #ddd;
4785-
}
4786-
.pagination > .disabled > span:hover, .pagination > .disabled > span:focus {
4787-
color: #777777;
4788-
cursor: not-allowed;
4789-
background-color: #fff;
4790-
border-color: #ddd;
4791-
}
4792-
.pagination > .disabled > a {
4793-
color: #777777;
4794-
cursor: not-allowed;
4795-
background-color: #fff;
4796-
border-color: #ddd;
4797-
}
4798-
.pagination > .disabled > a:hover, .pagination > .disabled > a:focus {
4799-
color: #777777;
4800-
cursor: not-allowed;
4801-
background-color: #fff;
4802-
border-color: #ddd;
4803-
}
4804-
4805-
.pagination-lg > li > a, .pagination-lg > li > span {
4806-
padding: 10px 16px;
4807-
font-size: 18px;
4808-
line-height: 1.3333333;
4809-
}
4810-
.pagination-lg > li:first-child > a, .pagination-lg > li:first-child > span {
4811-
border-top-left-radius: 6px;
4812-
border-bottom-left-radius: 6px;
4813-
}
4814-
.pagination-lg > li:last-child > a, .pagination-lg > li:last-child > span {
4815-
border-top-right-radius: 6px;
4816-
border-bottom-right-radius: 6px;
4817-
}
4818-
4819-
.pagination-sm > li > a, .pagination-sm > li > span {
4820-
padding: 5px 10px;
4821-
font-size: 12px;
4822-
line-height: 1.5;
4823-
}
4824-
.pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span {
4825-
border-top-left-radius: 3px;
4826-
border-bottom-left-radius: 3px;
4827-
}
4828-
.pagination-sm > li:last-child > a, .pagination-sm > li:last-child > span {
4829-
border-top-right-radius: 3px;
4830-
border-bottom-right-radius: 3px;
4774+
color: #1a5668;
4775+
background-color: #e9ecef;
4776+
outline: 0;
4777+
box-shadow: 0 0 0 0.25rem rgba(32, 107, 130, 0.25);
48314778
}
48324779

48334780
.page-item:not(:first-child) .page-link {
@@ -13805,6 +13752,7 @@ td.diff_header {
1380513752
border-width: 0;
1380613753
box-shadow: 0;
1380713754
border-radius: 0;
13755+
display: -webkit-box;
1380813756
display: -webkit-flex;
1380913757
display: flex;
1381013758
-webkit-box-orient: vertical;
@@ -13823,6 +13771,7 @@ td.diff_header {
1382313771
-webkit-order: 2;
1382413772
order: 2;
1382513773
}
13774+
1382613775
.js .main .secondary .filters {
1382713776
display: none;
1382813777
position: fixed;
@@ -14798,4 +14747,4 @@ br.line-height2 {
1479814747

1479914748
.input-group-btn:last-child > .btn {
1480014749
z-index: 0;
14801-
}
14750+
}

0 commit comments

Comments
 (0)