mirror of
https://git.selfprivacy.org/SelfPrivacy/selfprivacy.org.git
synced 2025-01-15 13:26:37 +00:00
Merge remote-tracking branch 'upstream/master' into fix-tabs
This commit is contained in:
commit
27ac23f9ac
|
@ -129,13 +129,3 @@ a.nav-link.sp-coming-soon {
|
||||||
border-radius: .1rem;
|
border-radius: .1rem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
a.nav-link.sp-coming-soon::after {
|
|
||||||
content: "Coming soon!";
|
|
||||||
display: inline-block;
|
|
||||||
background-color: #616161;
|
|
||||||
color: $dark;
|
|
||||||
margin-left: .5rem;
|
|
||||||
padding: .1rem .5rem;
|
|
||||||
border-radius: .1rem;
|
|
||||||
}
|
|
|
@ -144,6 +144,7 @@ li:has(input[type="checkbox"]) {
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
.tab-content {
|
.tab-content {
|
||||||
.tab-pane {
|
.tab-pane {
|
||||||
border: none !important;
|
border: none !important;
|
||||||
|
@ -182,6 +183,8 @@ li:has(input[type="checkbox"]) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> upstream/master
|
||||||
@media (min-width: 768px) {
|
@media (min-width: 768px) {
|
||||||
.td-sidebar {
|
.td-sidebar {
|
||||||
padding-top: 5rem;
|
padding-top: 5rem;
|
||||||
|
|
Loading…
Reference in a new issue