diff --git a/Gemfile.lock b/Gemfile.lock index c5d3747707..e719353e07 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,34 +1,73 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.4) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + base64 (0.3.0) + bigdecimal (3.3.1) colorator (1.1.0) - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.5) + csv (3.3.5) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.15.5) + ffi (1.17.2) + ffi (1.17.2-aarch64-linux-gnu) + ffi (1.17.2-aarch64-linux-musl) + ffi (1.17.2-arm-linux-gnu) + ffi (1.17.2-arm-linux-musl) + ffi (1.17.2-arm64-darwin) + ffi (1.17.2-x86-linux-gnu) + ffi (1.17.2-x86-linux-musl) + ffi (1.17.2-x86_64-darwin) + ffi (1.17.2-x86_64-linux-gnu) + ffi (1.17.2-x86_64-linux-musl) forwardable-extended (2.6.0) - google-protobuf (3.25.5) - google-protobuf (3.25.5-arm64-darwin) - google-protobuf (3.25.5-x86_64-darwin) - google-protobuf (3.25.5-x86_64-linux) + google-protobuf (4.33.1) + bigdecimal + rake (>= 13) + google-protobuf (4.33.1-aarch64-linux-gnu) + bigdecimal + rake (>= 13) + google-protobuf (4.33.1-aarch64-linux-musl) + bigdecimal + rake (>= 13) + google-protobuf (4.33.1-arm64-darwin) + bigdecimal + rake (>= 13) + google-protobuf (4.33.1-x86-linux-gnu) + bigdecimal + rake (>= 13) + google-protobuf (4.33.1-x86-linux-musl) + bigdecimal + rake (>= 13) + google-protobuf (4.33.1-x86_64-darwin) + bigdecimal + rake (>= 13) + google-protobuf (4.33.1-x86_64-linux-gnu) + bigdecimal + rake (>= 13) + google-protobuf (4.33.1-x86_64-linux-musl) + bigdecimal + rake (>= 13) http_parser.rb (0.8.0) - i18n (1.13.0) + i18n (1.14.7) concurrent-ruby (~> 1.0) - jekyll (4.3.2) + jekyll (4.4.1) addressable (~> 2.4) + base64 (~> 0.2) colorator (~> 1.0) + csv (~> 3.0) em-websocket (~> 0.5) i18n (~> 1.0) jekyll-sass-converter (>= 2.0, < 4.0) jekyll-watch (~> 2.0) + json (~> 2.6) kramdown (~> 2.3, >= 2.3.1) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (>= 0.3.6, < 0.5) + mercenary (~> 0.3, >= 0.3.6) pathutil (~> 0.9) rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) @@ -36,41 +75,86 @@ GEM webrick (~> 1.7) jekyll-feed (0.17.0) jekyll (>= 3.7, < 5.0) - jekyll-sass-converter (3.0.0) - sass-embedded (~> 1.54) + jekyll-sass-converter (3.1.0) + sass-embedded (~> 1.75) jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (2.4.0) - rexml + json (2.16.0) + kramdown (2.5.1) + rexml (>= 3.3.9) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.4) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (5.0.1) - rake (13.0.6) + public_suffix (6.0.2) + rake (13.3.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.4.2) - rouge (4.1.0) + rexml (3.4.4) + rouge (4.6.1) safe_yaml (1.0.5) - sass-embedded (1.62.1) - google-protobuf (~> 3.21) - rake (>= 10.0.0) + sass-embedded (1.94.2) + google-protobuf (~> 4.31) + rake (>= 13) + sass-embedded (1.94.2-aarch64-linux-android) + google-protobuf (~> 4.31) + sass-embedded (1.94.2-aarch64-linux-gnu) + google-protobuf (~> 4.31) + sass-embedded (1.94.2-aarch64-linux-musl) + google-protobuf (~> 4.31) + sass-embedded (1.94.2-arm-linux-androideabi) + google-protobuf (~> 4.31) + sass-embedded (1.94.2-arm-linux-gnueabihf) + google-protobuf (~> 4.31) + sass-embedded (1.94.2-arm-linux-musleabihf) + google-protobuf (~> 4.31) + sass-embedded (1.94.2-arm64-darwin) + google-protobuf (~> 4.31) + sass-embedded (1.94.2-riscv64-linux-android) + google-protobuf (~> 4.31) + sass-embedded (1.94.2-riscv64-linux-gnu) + google-protobuf (~> 4.31) + sass-embedded (1.94.2-riscv64-linux-musl) + google-protobuf (~> 4.31) + sass-embedded (1.94.2-x86_64-darwin) + google-protobuf (~> 4.31) + sass-embedded (1.94.2-x86_64-linux-android) + google-protobuf (~> 4.31) + sass-embedded (1.94.2-x86_64-linux-gnu) + google-protobuf (~> 4.31) + sass-embedded (1.94.2-x86_64-linux-musl) + google-protobuf (~> 4.31) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - unicode-display_width (2.4.2) - webrick (1.8.2) + unicode-display_width (2.6.0) + webrick (1.9.1) PLATFORMS - darwin - freebsd - x86_64-linux + aarch64-linux-android + aarch64-linux-gnu + aarch64-linux-musl + arm-linux-androideabi + arm-linux-gnu + arm-linux-gnueabihf + arm-linux-musl + arm-linux-musleabihf + arm64-darwin + riscv64-linux-android + riscv64-linux-gnu + riscv64-linux-musl + ruby + x86-linux-gnu + x86-linux-musl + x86_64-darwin + x86_64-linux-android + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES jekyll @@ -79,4 +163,4 @@ DEPENDENCIES webrick BUNDLED WITH - 2.2.22 + 2.7.2 diff --git a/_includes/theme-toggle.html b/_includes/theme-toggle.html new file mode 100644 index 0000000000..86556754f8 --- /dev/null +++ b/_includes/theme-toggle.html @@ -0,0 +1,63 @@ + \ No newline at end of file diff --git a/_includes/themes/apache/_navigation.html b/_includes/themes/apache/_navigation.html index fafdbfd4de..83f097935a 100644 --- a/_includes/themes/apache/_navigation.html +++ b/_includes/themes/apache/_navigation.html @@ -36,6 +36,18 @@
  • Thanks
    • +
  • +
    + +
    +
    • diff --git a/_includes/themes/apache/default.html b/_includes/themes/apache/default.html index 8a5356dc80..8fdc379a50 100644 --- a/_includes/themes/apache/default.html +++ b/_includes/themes/apache/default.html @@ -26,7 +26,7 @@ --> - + @@ -46,7 +46,138 @@ + + diff --git a/_sass/_base.scss b/_sass/_base.scss index 4eb9050523..934d4e619a 100644 --- a/_sass/_base.scss +++ b/_sass/_base.scss @@ -17,14 +17,15 @@ dl, dd, ol, ul, figure { */ body { font: $base-font-weight list.slash($base-font-size, $base-line-height) $base-font-family; - color: $text-color; - background-color: $background-color; + color: var(--text-primary); + background-color: var(--bg-primary); -webkit-text-size-adjust: 100%; -webkit-font-feature-settings: "kern" 1; -moz-font-feature-settings: "kern" 1; -o-font-feature-settings: "kern" 1; font-feature-settings: "kern" 1; font-kerning: normal; + transition: background-color 0.3s ease, color 0.3s ease; } @@ -93,15 +94,15 @@ h1, h2, h3, h4, h5, h6 { * Links */ a { - color: $brand-color; + color: var(--link-color); text-decoration: none; &:visited { - color: darken($brand-color, 15%); + color: var(--link-color); } &:hover { - color: $text-color; + color: var(--link-hover); text-decoration: underline; } } @@ -112,8 +113,8 @@ a { * Blockquotes */ blockquote { - color: $grey-color; - border-left: 4px solid $grey-color-light; + color: var(--text-secondary); + border-left: 4px solid var(--border-color); padding-left: $spacing-unit * 0.5; font-size: 18px; letter-spacing: -1px; @@ -132,9 +133,9 @@ blockquote { pre, code { font-size: 15px; - border: 1px solid $grey-color-light; + border: 1px solid var(--border-color); border-radius: 3px; - background-color: #eef; + background-color: var(--code-bg); } code { @@ -202,7 +203,7 @@ pre { vertical-align: middle; path { - fill: $grey-color; + fill: var(--text-secondary); } } } diff --git a/_sass/_layout.scss b/_sass/_layout.scss index c332f6c0ed..f48658e61a 100644 --- a/_sass/_layout.scss +++ b/_sass/_layout.scss @@ -2,9 +2,11 @@ * Site header */ .site-header { - border-top: 5px solid $grey-color-dark; - border-bottom: 1px solid $grey-color-light; + border-top: 5px solid var(--header-bg); + border-bottom: 1px solid var(--border-color); min-height: 56px; + background-color: var(--header-bg); + color: var(--header-text); // Positioning context for the mobile navigation icon position: relative; @@ -20,7 +22,7 @@ &, &:visited { - color: $grey-color-dark; + color: var(--header-text); } } @@ -33,7 +35,7 @@ } .page-link { - color: $text-color; + color: var(--header-text); line-height: $base-line-height; // Gaps between nav items, but not on the last one @@ -46,8 +48,8 @@ position: absolute; top: 9px; right: $spacing-unit * 0.5; - background-color: $background-color; - border: 1px solid $grey-color-light; + background-color: var(--bg-primary); + border: 1px solid var(--border-color); border-radius: 5px; text-align: right; @@ -65,7 +67,7 @@ height: 15px; path { - fill: $grey-color-dark; + fill: var(--header-text); } } } @@ -98,8 +100,10 @@ * Site footer */ .site-footer { - border-top: 1px solid $grey-color-light; + border-top: 1px solid var(--border-color); padding: $spacing-unit 0; + background-color: var(--footer-bg); + color: var(--footer-text); } .footer-heading { @@ -115,7 +119,7 @@ .footer-col-wrapper { font-size: 15px; - color: $grey-color; + color: var(--footer-text); margin-left: -$spacing-unit * 0.5; @extend %clearfix; } @@ -186,7 +190,7 @@ .post-meta { font-size: $small-font-size; - color: $grey-color; + color: var(--text-secondary); } .post-link { diff --git a/_sass/custom/_mixins.scss b/_sass/custom/_mixins.scss new file mode 100644 index 0000000000..627c7230ad --- /dev/null +++ b/_sass/custom/_mixins.scss @@ -0,0 +1,2 @@ +// Custom mixins for NuttX website +// Add any custom mixins here if needed diff --git a/_sass/custom/_themes.scss b/_sass/custom/_themes.scss new file mode 100644 index 0000000000..efea3c861e --- /dev/null +++ b/_sass/custom/_themes.scss @@ -0,0 +1,40 @@ +// CSS Custom Properties for Theming +:root { + // Light theme (default) + --bg-primary: #ffffff; + --bg-secondary: #f8f9fa; + --bg-tertiary: #e9ecef; + --text-primary: #212529; + --text-secondary: #6c757d; + --link-color: #007bff; + --link-hover: #0056b3; + --border-color: #dee2e6; + --code-bg: #f8f9fa; + --header-bg: #343a40; + --header-text: #ffffff; + --footer-bg: #f8f9fa; + --footer-text: #6c757d; + --card-bg: #ffffff; + --table-bg: #ffffff; + --table-border: #dee2e6; +} + +[data-theme="dark"] { + // Dark theme + --bg-primary: #121212; + --bg-secondary: #1e1e1e; + --bg-tertiary: #2d3748; + --text-primary: #e9ecef; + --text-secondary: #adb5bd; + --link-color: #4dabf7; + --link-hover: #74c0fc; + --border-color: #495057; + --code-bg: #2d3748; + --header-bg: #212529; + --header-text: #f8f9fa; + --footer-bg: #1a1a1a; + --footer-text: #adb5bd; + --card-bg: #1e1e1e; + --table-bg: #1e1e1e; + --table-border: #495057; +} \ No newline at end of file diff --git a/_sass/custom/_variables.scss b/_sass/custom/_variables.scss new file mode 100644 index 0000000000..1ee3354c8b --- /dev/null +++ b/_sass/custom/_variables.scss @@ -0,0 +1,2 @@ +// Custom variables for NuttX website +// Add any custom variables here if needed diff --git a/community-members.md b/community-members.md index b78db7e3fc..268ff90b4b 100644 --- a/community-members.md +++ b/community-members.md @@ -41,7 +41,7 @@ limitations under the License. {% for member in site.data.contributors %} - + {{ member.name }} {{member.name}} {{member.apacheId}} {{ member.githubId }} diff --git a/css/main.scss b/css/main.scss index f2e566e2a1..7a6fa88aaa 100644 --- a/css/main.scss +++ b/css/main.scss @@ -1,6 +1,9 @@ --- # Only the main Sass file needs front matter (the dashes are enough) --- +@import "custom/variables"; +@import "custom/mixins"; +@import "custom/themes"; @charset "utf-8"; diff --git a/static/images/community/avatars/Apache9.png b/static/images/community/avatars/Apache9.png new file mode 100644 index 0000000000..29c1e04a95 Binary files /dev/null and b/static/images/community/avatars/Apache9.png differ diff --git a/static/images/community/avatars/Donny9.png b/static/images/community/avatars/Donny9.png new file mode 100644 index 0000000000..6f4cfa9ad5 Binary files /dev/null and b/static/images/community/avatars/Donny9.png differ diff --git a/static/images/community/avatars/GUIDINGLI.png b/static/images/community/avatars/GUIDINGLI.png new file mode 100644 index 0000000000..26f3acc614 Binary files /dev/null and b/static/images/community/avatars/GUIDINGLI.png differ diff --git a/static/images/community/avatars/JunpingDu.png b/static/images/community/avatars/JunpingDu.png new file mode 100644 index 0000000000..3dfa8cee19 Binary files /dev/null and b/static/images/community/avatars/JunpingDu.png differ diff --git a/static/images/community/avatars/Ouss4.png b/static/images/community/avatars/Ouss4.png new file mode 100644 index 0000000000..fcf49c18f0 Binary files /dev/null and b/static/images/community/avatars/Ouss4.png differ diff --git a/static/images/community/avatars/acassis.png b/static/images/community/avatars/acassis.png new file mode 100644 index 0000000000..00cac227c2 Binary files /dev/null and b/static/images/community/avatars/acassis.png differ diff --git a/static/images/community/avatars/adamfeuer.png b/static/images/community/avatars/adamfeuer.png new file mode 100644 index 0000000000..909d838e20 Binary files /dev/null and b/static/images/community/avatars/adamfeuer.png differ diff --git a/static/images/community/avatars/anchao.png b/static/images/community/avatars/anchao.png new file mode 100644 index 0000000000..98e8aec602 Binary files /dev/null and b/static/images/community/avatars/anchao.png differ diff --git a/static/images/community/avatars/antmerlino.png b/static/images/community/avatars/antmerlino.png new file mode 100644 index 0000000000..645133a2ba Binary files /dev/null and b/static/images/community/avatars/antmerlino.png differ diff --git a/static/images/community/avatars/asifdxtreme.png b/static/images/community/avatars/asifdxtreme.png new file mode 100644 index 0000000000..bb0cd6c829 Binary files /dev/null and b/static/images/community/avatars/asifdxtreme.png differ diff --git a/static/images/community/avatars/btashton.png b/static/images/community/avatars/btashton.png new file mode 100644 index 0000000000..1d1b997809 Binary files /dev/null and b/static/images/community/avatars/btashton.png differ diff --git a/static/images/community/avatars/cederom.png b/static/images/community/avatars/cederom.png new file mode 100644 index 0000000000..af130cf8cf Binary files /dev/null and b/static/images/community/avatars/cederom.png differ diff --git a/static/images/community/avatars/davids5.png b/static/images/community/avatars/davids5.png new file mode 100644 index 0000000000..c289c8871e Binary files /dev/null and b/static/images/community/avatars/davids5.png differ diff --git a/static/images/community/avatars/fpj.png b/static/images/community/avatars/fpj.png new file mode 100644 index 0000000000..286a8ecaaa Binary files /dev/null and b/static/images/community/avatars/fpj.png differ diff --git a/static/images/community/avatars/gustavonihei.png b/static/images/community/avatars/gustavonihei.png new file mode 100644 index 0000000000..824aafb729 Binary files /dev/null and b/static/images/community/avatars/gustavonihei.png differ diff --git a/static/images/community/avatars/hartmannathan.png b/static/images/community/avatars/hartmannathan.png new file mode 100644 index 0000000000..79fe30b34d Binary files /dev/null and b/static/images/community/avatars/hartmannathan.png differ diff --git a/static/images/community/avatars/jerpelea.png b/static/images/community/avatars/jerpelea.png new file mode 100644 index 0000000000..b646394be4 Binary files /dev/null and b/static/images/community/avatars/jerpelea.png differ diff --git a/static/images/community/avatars/johannes-nivus.png b/static/images/community/avatars/johannes-nivus.png new file mode 100644 index 0000000000..c90ff5d529 Binary files /dev/null and b/static/images/community/avatars/johannes-nivus.png differ diff --git a/static/images/community/avatars/justinmclean.png b/static/images/community/avatars/justinmclean.png new file mode 100644 index 0000000000..a7e3234d9f Binary files /dev/null and b/static/images/community/avatars/justinmclean.png differ diff --git a/static/images/community/avatars/linguini1.png b/static/images/community/avatars/linguini1.png new file mode 100644 index 0000000000..c648e7a8b4 Binary files /dev/null and b/static/images/community/avatars/linguini1.png differ diff --git a/static/images/community/avatars/liuguo09.png b/static/images/community/avatars/liuguo09.png new file mode 100644 index 0000000000..0ba24b024a Binary files /dev/null and b/static/images/community/avatars/liuguo09.png differ diff --git a/static/images/community/avatars/lupyuen.png b/static/images/community/avatars/lupyuen.png new file mode 100644 index 0000000000..937c1ca1b2 Binary files /dev/null and b/static/images/community/avatars/lupyuen.png differ diff --git a/static/images/community/avatars/masayuki2009.png b/static/images/community/avatars/masayuki2009.png new file mode 100644 index 0000000000..4eb7d61821 Binary files /dev/null and b/static/images/community/avatars/masayuki2009.png differ diff --git a/static/images/community/avatars/patacongo.png b/static/images/community/avatars/patacongo.png new file mode 100644 index 0000000000..0fae749c70 Binary files /dev/null and b/static/images/community/avatars/patacongo.png differ diff --git a/static/images/community/avatars/pkarashchenko.png b/static/images/community/avatars/pkarashchenko.png new file mode 100644 index 0000000000..91b60f57aa Binary files /dev/null and b/static/images/community/avatars/pkarashchenko.png differ diff --git a/static/images/community/avatars/protobits.png b/static/images/community/avatars/protobits.png new file mode 100644 index 0000000000..23bed7dc67 Binary files /dev/null and b/static/images/community/avatars/protobits.png differ diff --git a/static/images/community/avatars/raiden00pl.png b/static/images/community/avatars/raiden00pl.png new file mode 100644 index 0000000000..1e9ceb6d25 Binary files /dev/null and b/static/images/community/avatars/raiden00pl.png differ diff --git a/static/images/community/avatars/saramonteiro.png b/static/images/community/avatars/saramonteiro.png new file mode 100644 index 0000000000..5b54ba30f7 Binary files /dev/null and b/static/images/community/avatars/saramonteiro.png differ diff --git a/static/images/community/avatars/sebastianene07.png b/static/images/community/avatars/sebastianene07.png new file mode 100644 index 0000000000..e4966a47b4 Binary files /dev/null and b/static/images/community/avatars/sebastianene07.png differ diff --git a/static/images/community/avatars/tmedicci.png b/static/images/community/avatars/tmedicci.png new file mode 100644 index 0000000000..f172b9c5e8 Binary files /dev/null and b/static/images/community/avatars/tmedicci.png differ diff --git a/static/images/community/avatars/xiaoxiang781216.png b/static/images/community/avatars/xiaoxiang781216.png new file mode 100644 index 0000000000..61777df852 Binary files /dev/null and b/static/images/community/avatars/xiaoxiang781216.png differ diff --git a/static/images/community/avatars/yamt.png b/static/images/community/avatars/yamt.png new file mode 100644 index 0000000000..d1e23ec4d2 Binary files /dev/null and b/static/images/community/avatars/yamt.png differ