Skip to content

Commit

Permalink
Merge pull request duckdb#4249 from Franz-Kafka/main
Browse files Browse the repository at this point in the history
css prefixes, color corrections
  • Loading branch information
szarnyasg authored Dec 3, 2024
2 parents 0027909 + ea4fc01 commit 90354e3
Show file tree
Hide file tree
Showing 5 changed files with 187 additions and 63 deletions.
4 changes: 2 additions & 2 deletions _data/secondarymenu.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@
},
{
"page": "Events",
"url": "/events"
"url": "/events/"
},
{
"page": "Media",
"url": "/media"
"url": "/media/"
}
]
},
Expand Down
19 changes: 9 additions & 10 deletions _sass/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,11 @@ $docuh5: 18px;
--main-codebox-dropshadow: #0000000d;
--main-codebox-main-background-color: var(--grey-transparent-98);
--main-codebox-sub-background-color: var(--grey-transparent-90);
--main-highlight-purple-text-color: var(--purple-70);
--main-highlight-purple-text-color: var(--purple-80);
--main-highlight-yellow-background-color: var(--grey-10);
--main-highlight-yellow-text-color: var(--yellow-50);
--main-infobox-background-color: var(--purple-transparent-98);
--main-infobox-border-start-color: var(--purple-transparent-90);
--main-infobox-border-color: var(--purple-transparent-90);
--main-marker-background-color: var(--yellow-transparent-60);
--main-marker-border-color: var(--yellow-45);
--main-section-background-gradient-end-color: var(--grey-95);
Expand All @@ -237,8 +237,8 @@ $docuh5: 18px;
--menu-dropdown-border-color: var(--grey-90);
--menu-dropdown-item-background-hover: var(--grey-90);
--menu-topmenu-background-color: var(--grey-transparent-98);
--menu-topmenu-border-color: var(--grey-transparent-90);
--menu-topmenu-searchbar-border-color: var(--grey-90);
--menu-topmenu-border-color: #e6e6e64d;
--menu-topmenu-searchbar-border-color: var(--grey-transparent-85);
--menu-topmenu-searchbar-shortcut-background-color: var(--grey-transparent-90);
--menu-topmenu-searchbar-shortcut-text-color: var(--grey-60);
--menu-topmenu-searchbar-text-color: var(--grey-transparent-30);
Expand Down Expand Up @@ -303,11 +303,11 @@ html.darkmode {
--main-codebox-dropshadow: #fff10012;
--main-codebox-main-background-color: var(--grey-transparent-05);
--main-codebox-sub-background-color: var(--grey-transparent-20);
--main-highlight-purple-text-color: var(--purple-70);
--main-highlight-purple-text-color: var(--purple-80);
--main-highlight-yellow-background-color: var(--yellow-50);
--main-highlight-yellow-text-color: var(--grey-10);
--main-infobox-background-color: var(--grey-transparent-15);
--main-infobox-border-start-color: var(--grey-transparent-20);
--main-infobox-border-color: var(--grey-transparent-20);
--main-marker-background-color: var(--yellow-transparent-30);
--main-marker-border-color: var(--yellow-transparent-40);
--main-section-background-gradient-end-color: var(--grey-10);
Expand All @@ -319,8 +319,8 @@ html.darkmode {
--menu-dropdown-border-color: var(--grey-20);
--menu-dropdown-item-background-hover: var(--grey-15);
--menu-topmenu-background-color: var(--grey-transparent-10);
--menu-topmenu-border-color: var(--grey-transparent-15);
--menu-topmenu-searchbar-border-color: var(--grey-20);
--menu-topmenu-border-color: #2626264d;
--menu-topmenu-searchbar-border-color: var(--grey-transparent-15);
--menu-topmenu-searchbar-shortcut-background-color: var(--grey-transparent-30);
--menu-topmenu-searchbar-shortcut-text-color: var(--grey-60);
--menu-topmenu-searchbar-text-color: var(--grey-transparent-85);
Expand All @@ -332,5 +332,4 @@ html.darkmode {
--social-thumbnail-button-background-color: var(--yellow-50);
--social-thumbnail-button-text-color: var(--grey-02);
--social-thumbnail-text-color: var(--grey-95);
}

}
109 changes: 84 additions & 25 deletions css/docu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ body.documentation{
margin-left: 2px;
font-family: $fontSans;
font-weight: 500;
-webkit-transition: background .2s;
-o-transition: background .2s;
transition: background .2s;
white-space: nowrap;
&::after{
Expand All @@ -52,8 +54,12 @@ body.documentation{
main .wrap{
width: calc(100% - 275px);
min-height: 100vh;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
justify-content: space-between;
-webkit-box-pack: justify;
-ms-flex-pack: justify;
justify-content: space-between;
max-width: unset;
margin-left: 275px;
padding: 0 0 0 30px;
Expand All @@ -78,7 +84,7 @@ body.documentation{
margin-top: 0px;
}
}
/*#all-available-extensions td > a:first-of-type{
/*#all-available-extensions td > a:first-of-type{
margin-right: 8px;
}*/
table a.nobg:hover{
Expand All @@ -90,7 +96,7 @@ body.documentation{
margin-top: 0;
margin-bottom: 8px;
}
@media only screen and (max-width: 1200px) {
@media only screen and (max-width: 1200px) {
width: 100%;
max-width: 100%;
}
Expand Down Expand Up @@ -205,17 +211,26 @@ body.documentation{
.wrap a{
color: var(--text-primary-color);
text-decoration: underline;
-webkit-transition: color .3s;
-o-transition: color .3s;
transition: color .3s;
&:hover{
color: $blue;
}
}
.headlinebar{
width: 100%;
flex-wrap: wrap;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
justify-content: space-between;
align-items: center;
-webkit-box-pack: justify;
-ms-flex-pack: justify;
justify-content: space-between;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
position: relative;
margin-bottom: 20px;
z-index: 800;
Expand All @@ -242,7 +257,7 @@ body.documentation{
position: relative;
width: 22%;
padding: 100px 20px 20px 20px;
@media only screen and (max-width: 1200px) {
@media only screen and (max-width: 1200px) {
display: none;
}
}
Expand All @@ -251,7 +266,7 @@ body.documentation{
top: 100px;
height: calc(100vh - 100px);
overflow: auto;
-ms-overflow-style: none;
-ms-overflow-style: none;
scrollbar-width: none;
&::-webkit-scrollbar {
display: none;
Expand Down Expand Up @@ -297,7 +312,8 @@ body.documentation{
/*background: $black50;*/
border-radius: 100px;
display: inline-block;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
max-width: 100%;
Expand All @@ -317,14 +333,17 @@ body.documentation{
display: inline-block;
background-size: contain;
background-repeat: no-repeat;
flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
}
a{
font-size: 13px;
padding: 4px 9px;
border: 1px solid white;
border-radius: 50px;
white-space: nowrap;
-webkit-transition: all .3s;
-o-transition: all .3s;
transition: all .3s;
&:hover{
background: white;
Expand All @@ -333,9 +352,15 @@ body.documentation{
}
}
.content{
display: -webkit-box;
display: -ms-flexbox;
display: flex;
column-gap: 20px;
align-items: center;
-webkit-column-gap: 20px;
-moz-column-gap: 20px;
column-gap: 20px;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
}
}
main .banner{
Expand All @@ -362,9 +387,15 @@ body.documentation{
}
div.versionselect{
position: relative;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
justify-content: flex-end;
align-items: flex-start;
-webkit-box-pack: end;
-ms-flex-pack: end;
justify-content: flex-end;
-webkit-box-align: start;
-ms-flex-align: start;
align-items: flex-start;
gap: 10px;
}
div.version{
Expand All @@ -385,9 +416,15 @@ body.documentation{
width: auto;
height: 40px;
color: var(--main-text-secondary-color, #666);
display: -webkit-box;
display: -ms-flexbox;
display: flex;
align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
gap: 5px;
-webkit-transition: border .3s;
-o-transition: border .3s;
transition: border .3s;
&:hover{
border: 1px solid var(--menu-topmenu-text-color-hover, #6A58DA);
Expand All @@ -402,10 +439,16 @@ body.documentation{
background-size: contain;
background-repeat: no-repeat;
display: block;
-webkit-transition: -webkit-transform .3s;
transition: -webkit-transform .3s;
-o-transition: transform .3s;
transition: transform .3s;
transition: transform .3s, -webkit-transform .3s;
}
&.active span.arrow{
transform: rotate(-180deg);
-webkit-transform: rotate(-180deg);
-ms-transform: rotate(-180deg);
transform: rotate(-180deg);
}
}
}
Expand Down Expand Up @@ -446,6 +489,8 @@ body.documentation{
display: inline-block;
width: 100%;
color: var(--main-text-primary-color, #F2F2F2)!important;
-webkit-transition: background-color .3s;
-o-transition: background-color .3s;
transition: background-color .3s;
white-space: nowrap;
&:hover{
Expand All @@ -462,7 +507,9 @@ body.documentation{
}
}
&:hover{
transform: translateX(0px);
-webkit-transform: translateX(0px);
-ms-transform: translateX(0px);
transform: translateX(0px);
}
>span{
font-size: 14px;
Expand Down Expand Up @@ -500,7 +547,7 @@ body.documentation{
a{
color: var(--doc-sidebar-text-unselected, #262626);
text-decoration: none;
&:hover{
&:hover{
text-decoration: none;
}
}
Expand Down Expand Up @@ -700,15 +747,18 @@ code {
}

body.documentation code{
font-feature-settings: "ss19";
-webkit-font-feature-settings: "ss19";
font-feature-settings: "ss19";
}
pre code {
display: block;
-webkit-box-shadow: none;
box-shadow: none;
}
pre.highlight{
tab-size: 4;
-moz-tab-size: 4;
-o-tab-size: 4;
tab-size: 4;
white-space: pre;
overflow-x: auto;
padding-bottom: 0px;
Expand All @@ -735,6 +785,8 @@ div.highlight{
position: relative;
border-radius: 10px;
overflow: hidden;
-webkit-transition: border-color .3s;
-o-transition: border-color .3s;
transition: border-color .3s;
background: var(--doc-codebox-background-color, #F2F2F2);
border: 1px solid var(--doc-codebox-border-color, #D9D9D9);
Expand Down Expand Up @@ -800,7 +852,8 @@ table {
display: block;
overflow-x: auto;
font-variant-numeric: tabular-nums;
font-variant-ligatures: none;
-webkit-font-variant-ligatures: none;
font-variant-ligatures: none;
&::-webkit-scrollbar {
height: 5px;
}
Expand Down Expand Up @@ -1054,11 +1107,13 @@ body.documentation main .wrap a.pill{
background-repeat: no-repeat;
background-position: center center;
margin-left: auto;
flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
}
.symbol{
display: block;
flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
width: 40px;
height: 40px;
border-radius: 7.467px;
Expand Down Expand Up @@ -1277,8 +1332,12 @@ p img {
border-radius: 10px;
background: var(--doc-codebox-background-color, #F2F2F2);
padding: 20px;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
justify-content: space-between;
-webkit-box-pack: justify;
-ms-flex-pack: justify;
justify-content: space-between;
margin-top: 45px;
width: 100%;
h5{
Expand Down Expand Up @@ -1402,4 +1461,4 @@ body.documentation.installation{
max-width: 320px;
font-size: 14px;
}
}
}
Loading

0 comments on commit 90354e3

Please sign in to comment.