From e19d796f02b57b9cc54b0fdaf0c144814e227b7a Mon Sep 17 00:00:00 2001 From: louismaximepiton Date: Tue, 12 Nov 2024 19:01:30 +0100 Subject: [PATCH] Some modifs + some OUDS mods --- scss/_reboot.scss | 3 ++- scss/_root.scss | 4 +++- scss/_type.scss | 18 ----------------- scss/_variables.scss | 20 ++++++++----------- site/assets/scss/_toc.scss | 10 +++++----- .../content/docs/0.0/examples/font/index.html | 2 +- site/content/docs/0.0/migration.md | 2 -- site/layouts/_default/docs.html | 2 +- site/layouts/_default/single.html | 2 +- site/layouts/partials/home/masthead.html | 2 +- 10 files changed, 22 insertions(+), 43 deletions(-) diff --git a/scss/_reboot.scss b/scss/_reboot.scss index e8fb54adf7..b113b40722 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -626,8 +626,9 @@ legend { width: 100%; padding: 0; margin-bottom: $legend-margin-bottom; - @extend %body-large; // OUDS mod: instead of `@include font-size($legend-font-size)` font-weight: $legend-font-weight; + // OUDS mod: no line-height + @extend %body-large; // OUDS mod: instead of `@include font-size($legend-font-size)` + * { clear: left; // 2 diff --git a/scss/_root.scss b/scss/_root.scss index 5bb2005e49..e29487b026 100644 --- a/scss/_root.scss +++ b/scss/_root.scss @@ -63,6 +63,7 @@ --#{$prefix}font-monospace: #{inspect($font-family-monospace)}; --#{$prefix}gradient: #{$gradient}; + // OUDS mod // scss-docs-start root-font-variables-ouds --#{$prefix}font-size-display-large: #{px-to-rem($ouds-font-size-display-large-mobile)}; --#{$prefix}font-size-display-medium: #{px-to-rem($ouds-font-size-display-medium-mobile)}; @@ -191,6 +192,7 @@ --#{$prefix}font-max-width-body-small: #{px-to-rem($ouds-size-max-width-type-body-small-desktop)}; } // scss-docs-end root-font-variables-ouds + // End mod // Root and body // scss-docs-start root-body-variables @@ -201,7 +203,7 @@ @include rfs($font-size-base, --#{$prefix}body-font-size); --#{$prefix}body-font-weight: #{$font-weight-base}; --#{$prefix}body-line-height: #{$line-height-base}; - --#{$prefix}body-letter-spacing: #{$letter-spacing-base}; + --#{$prefix}body-letter-spacing: #{$letter-spacing-base}; // OUDS mod @if $body-text-align != null { --#{$prefix}body-text-align: #{$body-text-align}; } diff --git a/scss/_type.scss b/scss/_type.scss index 3e141c4c94..46cd3fd906 100644 --- a/scss/_type.scss +++ b/scss/_type.scss @@ -43,24 +43,6 @@ @extend #{$font-size}; // OUDS mod: instead of `@include font-size($font-size)` } } - -// .display-1 { -// @extend %heading; -// font-weight: $display-font-weight; -// @extend %display-large; -// } - -// .display-2 { -// @extend %heading; -// font-weight: $display-font-weight; -// @extend %display-medium; -// } - -// .display-3 { -// @extend %heading; -// font-weight: $display-font-weight; -// @extend %display-small; -// } // End mod diff --git a/scss/_variables.scss b/scss/_variables.scss index c37ba7394e..d843f7e4b1 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -444,7 +444,7 @@ $enable-bootstrap-compatibility: false !default; // OUDS mod: used to enforce B $enable-dark-mode: true !default; $color-mode-type: data !default; // `data` or `media-query` -// Prefix for :root CSS variables has been moved to `_config.scss` +// OUDS mod: Prefix for :root CSS variables has been moved to `_config.scss` // Gradient // @@ -711,8 +711,8 @@ $aspect-ratios: ( // Font, line-height, and color for body text, headings, and more. // scss-docs-start font-variables -$font-family-sans-serif: $ouds-font-family-sans-serif-stack !default; -$font-family-monospace: $ouds-font-family-monospace-stack !default; +$font-family-sans-serif: $ouds-font-family-sans-serif-stack !default; // OUDS mod +$font-family-monospace: $ouds-font-family-monospace-stack !default; // OUDS mod $font-family-base: var(--#{$prefix}font-sans-serif) !default; $font-family-code: var(--#{$prefix}font-monospace) !default; @@ -741,9 +741,7 @@ $line-height-base: var(--#{$prefix}font-line-height-body-medium) !def $line-height-sm: var(--#{$prefix}font-line-height-body-small) !default; $line-height-lg: var(--#{$prefix}font-line-height-body-large) !default; -$letter-spacing-base: var(--#{$prefix}font-letter-spacing-body-medium) !default; -// $letter-spacing-sm: var(--#{$prefix}font-letter-spacing-body-small) !default; -$letter-spacing-lg: var(--#{$prefix}font-letter-spacing-body-large) !default; +$letter-spacing-base: var(--#{$prefix}font-letter-spacing-body-medium) !default; // OUDS mod $h1-font-size: var(--#{$prefix}font-size-heading-xlarge) !default; $h2-font-size: var(--#{$prefix}font-size-heading-large) !default; @@ -803,8 +801,6 @@ $display-line-height: $headings-line-height !default; // scss-docs-start type-variables $lead-font-size: $h5-font-size !default; $lead-font-weight: $ouds-font-weight-web-body-default !default; -// $lead-line-height: $line-height-lg !default; -// $lead-letter-spacing: $letter-spacing-lg !default; $small-font-size: .875em !default; @@ -817,9 +813,9 @@ $text-muted: var(--#{$prefix}secondary-color) !default; // Depr $initialism-font-size: $small-font-size !default; $blockquote-margin-y: $spacer !default; -// $blockquote-font-size: $font-size-lg !default; +// OUDS mod: no `$blockquote-font-size` $blockquote-footer-color: var(--#{$prefix}secondary-color) !default; // OUDS mod: instead of `$gray-600` -// $blockquote-footer-font-size: $small-font-size !default; +// OUDS mod: no `$blockquote-footer-font-size` $hr-margin-y: $spacer !default; $hr-color: inherit !default; @@ -838,14 +834,14 @@ $vr-border-width: 2px !default; // OUDS mod: instead of `var(--#{$pr // scss-docs-end vr-variables $legend-margin-bottom: $spacer * .25 !default; -// $legend-font-size: $font-size-lg !default; +// OUDS mod: no `$legend-font-size` $legend-font-weight: $font-weight-bold !default; $dt-font-weight: $font-weight-bold !default; $list-inline-padding: $spacer * .25 !default; -$mark-padding: .125em .1875em !default; // OUDS mod +$mark-padding: .125em !default; // OUDS mod: instead of `.1875rem` $mark-color: $white !default; // OUDS mod: instead of `$body-color` $mark-bg: $black !default; // OUDS mod: instead of `$yellow-100` // scss-docs-end type-variables diff --git a/site/assets/scss/_toc.scss b/site/assets/scss/_toc.scss index 3f4919173d..924124d86d 100644 --- a/site/assets/scss/_toc.scss +++ b/site/assets/scss/_toc.scss @@ -11,7 +11,7 @@ } nav { - @extend %label-small; // OUDS mod: instead of `.875rem` + @extend %label-medium; // OUDS mod: instead of `.875rem` ul { padding-left: 0; @@ -20,16 +20,16 @@ ul { padding-left: 1rem; - margin-left: -.5rem; // OUDS mod + margin-left: -$ouds-space-fixed-shorter; // OUDS mod } } a { display: block; - padding: .3125rem 0 .3125rem .75rem; // OUDS mod + padding: $ouds-space-fixed-shortest 0 $ouds-space-fixed-shortest $ouds-space-fixed-medium; // OUDS mod color: inherit; text-decoration: none; - border-left: .125rem solid transparent; + // OUDS mod: no border-left &:hover, &.active { @@ -64,7 +64,7 @@ .bd-toc-collapse { @include media-breakpoint-down(md) { nav { - padding: 1.25rem 1.25rem 1.25rem 1rem; + padding: $ouds-space-fixed-medium; // OUDS mod: instead of `1.25rem 1.25rem 1.25rem 1rem` background-color: var(--bs-tertiary-bg); border: 1px solid var(--bs-border-color); @include border-radius(var(--bs-border-radius)); diff --git a/site/content/docs/0.0/examples/font/index.html b/site/content/docs/0.0/examples/font/index.html index 02b2bbe913..f7db001ed7 100644 --- a/site/content/docs/0.0/examples/font/index.html +++ b/site/content/docs/0.0/examples/font/index.html @@ -7,7 +7,7 @@ ---
-

Page title.

+

Page title.

Description paragraph. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam molestie urna eget congue congue.

H2 title with code and a very very very very very very very very very very very very very very very very very very very very very very very very very very very long title

Default body paragraph. Code. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam molestie urna eget congue congue. Integer malesuada ullamcorper sem eu dignissim. Proin tristique bibendum tellus. Donec auctor in lectus non laoreet. Morbi placerat velit neque, vitae elementum justo blandit eu. Pellentesque ut blandit tellus. HTML Nunc blandit dolor lacus, sed venenatis erat maximus et. Default link Vestibulum eu mi nec elit finibus feugiat. Vestibulum commodo, leo quis hendrerit egestas, turpis eros ultrices diam, vitae volutpat leo nisl nec mauris. Vestibulum in quam et mauris bibendum efficitur. hIn porttitor enim consectetur odio mollis, at fermentum velit volutpat. Vestibulum facilisis, mauris eu viverra vestibulum, erat nunc volutpat justo, id finibus nisi purus ultricies ante. Mauris consectetur magna vel mollis fermentum. Aenean lacus mi, tempor at mi in, efficitur gravida lectus. Curabitur in massa ultrices, hendrerit nisl ut, lobortis elit. Ctrl \+ , Nunc sagittis nisi ut nulla eleifend iaculis. CO2 and 3m2

diff --git a/site/content/docs/0.0/migration.md b/site/content/docs/0.0/migration.md index 435906621e..965b4491dd 100644 --- a/site/content/docs/0.0/migration.md +++ b/site/content/docs/0.0/migration.md @@ -11,8 +11,6 @@ toc: true ## v0.0.4 -### Content - ### Layout - New Responsive flexbox grid system is now available with eight default responsive tiers defined at breakpoints `2xs`, `xs`, `sm`, `md`, `xl`, `2xl`, and `3xl`. diff --git a/site/layouts/_default/docs.html b/site/layouts/_default/docs.html index ce65fc026d..e178d3c6ad 100644 --- a/site/layouts/_default/docs.html +++ b/site/layouts/_default/docs.html @@ -42,7 +42,7 @@

On this page

-
+
{{ .TableOfContents }}
diff --git a/site/layouts/_default/single.html b/site/layouts/_default/single.html index 7ae2b3cdc0..c1f934c157 100644 --- a/site/layouts/_default/single.html +++ b/site/layouts/_default/single.html @@ -5,7 +5,7 @@
-

{{ .Title | markdownify }}

+

{{ .Title | markdownify }}

diff --git a/site/layouts/partials/home/masthead.html b/site/layouts/partials/home/masthead.html index 244ac0f85a..1677464f09 100644 --- a/site/layouts/partials/home/masthead.html +++ b/site/layouts/partials/home/masthead.html @@ -7,7 +7,7 @@ Color mode support, expanded color palette, and more!

--> -

Build fast, responsive sites with OUDS Web

+

Build fast, responsive sites with OUDS Web

Powerful, extensible, and feature-packed frontend toolkit. Build and customize with Sass, utilize prebuilt grid system and components, and bring projects to life with powerful JavaScript plugins.