Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Rework the site styles without changing the appearance... #409

Closed
wants to merge 56 commits into from
Closed

[WIP] Rework the site styles without changing the appearance... #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
8a84847
Document how to test the output of a `nix-build`
samueldr Apr 15, 2020
57412f2
news: Use the "nixos" menu
samueldr Apr 16, 2020
4c4ddce
nix{,os}: Fix dead links to download page
samueldr Apr 17, 2020
07aa09b
nix{,os}: Add class to the jumbotron
samueldr Apr 17, 2020
226cf4d
governance, learn: Add class to distinguish
samueldr Apr 17, 2020
7ff1d48
donate: Review DOM for more semantic use
samueldr Apr 21, 2020
5dd083d
site-styles: Init with navbar mostly complete
samueldr Apr 16, 2020
08d1537
site-styles: Add to the site build
samueldr Apr 16, 2020
6f394dc
site-styles: navbar has the pull-right menu implemented
samueldr Apr 16, 2020
e9be690
site-styles: <hr />
samueldr Apr 16, 2020
454b5fa
site-styles: import bits from the old nixos-site.css
samueldr Apr 17, 2020
bfd81bf
site-styles: Add "theme" for the site's look
samueldr Apr 17, 2020
b955a0e
site-styles: Import page-specific rules from the old styles
samueldr Apr 17, 2020
2f159ec
site-styles: Fix font size root issue
samueldr Apr 17, 2020
91c6119
site-styles: Fix ordering z-index for navbar elements
samueldr Apr 17, 2020
23b46b7
site-styles: Add cloud icon
samueldr Apr 17, 2020
8fedc4c
site-styles: Add direct bootstrap 2 imports for complex styles
samueldr Apr 17, 2020
7603e2c
site-styles: Implement some fontawesome icons
samueldr Apr 17, 2020
80e8bf6
site-styles: Fix image height
samueldr Apr 17, 2020
a73f00b
site-styles: Fixes misc. gutter sizes
samueldr Apr 17, 2020
d1c8b53
site-styles: Fix responsive navbar that shouldn't stick
samueldr Apr 17, 2020
6cccca7
site-styles: Implement mostly compatible grid system
samueldr Apr 17, 2020
96b98f5
site-styles: Import misc. utility styles from bootstrap
samueldr Apr 17, 2020
d48e2d2
site-styles: Add more compatibility with bootstrap
samueldr Apr 17, 2020
d1109a8
site-styles: Import fade animation
samueldr Apr 17, 2020
15970bb
site-styles: Import popover from bootstrap
samueldr Apr 17, 2020
087d4c3
site-styles: Rework the "right-logo" jumbotrons
samueldr Apr 17, 2020
0f3fc72
site-styles: Align buttons to the end of the boxes
samueldr Apr 17, 2020
269f30a
site-styles: Import misc. bootstrap 2 styles
samueldr Apr 17, 2020
2965b08
site-styles: Change heading metrics
samueldr Apr 17, 2020
0432005
site-styles: Import alerts
samueldr Apr 17, 2020
d8ef51c
site-styles: Fix automatic font-size
samueldr Apr 17, 2020
aa347ae
site-styles: Add more imports + fix units
samueldr Apr 17, 2020
77f3834
site-styles: Fix units
samueldr Apr 17, 2020
0446171
site-styles: Import table from bootstrap
samueldr Apr 17, 2020
59914f4
site-styles: Import form elements
samueldr Apr 17, 2020
452b3ce
site-styles: Misc fixes
samueldr Apr 17, 2020
bc3a9d2
site-styles: Import Tabs
samueldr Apr 18, 2020
efff57a
site-styles: Implement what's missing for tabs
samueldr Apr 18, 2020
c61193e
site-styles: Fix download page
samueldr Apr 18, 2020
86a4497
site-styles: Import labels
samueldr Apr 18, 2020
78d2807
site-styles: Fix b/strong
samueldr Apr 18, 2020
c13d57b
site-styles: Cull some useless rules
samueldr Apr 18, 2020
c191fd1
site-styles: Cull old IE hacks from imported styles
samueldr Apr 18, 2020
d28f20e
site-styles: Cleanup more unused styles from imported bootstrap2
samueldr Apr 20, 2020
3beef11
site-styles: Port changes for news items
samueldr Apr 21, 2020
fb596ce
layout: Use site-styles instead of the previous styles
samueldr Apr 16, 2020
dbd03f2
layout: remove the un-semantic fontawesome icons
samueldr Apr 16, 2020
3c4cd0f
layout: Drop the <img> from the menu
samueldr Apr 16, 2020
1e37e31
Delete the bootstrap CSS
samueldr Apr 16, 2020
3f74b87
Delete now unused nixos-site css
samueldr Apr 21, 2020
bbcd69d
site-styles: Import styles for collapse
samueldr Apr 21, 2020
37e3de4
site-styles: Implement the responsive menu
samueldr Apr 21, 2020
0c0b5d1
site-styles: Fix donate page acknowledgments list
samueldr Apr 21, 2020
91b74ad
site-styles: Import missing overflow for tab contents
samueldr Apr 21, 2020
2a61c37
site-styles: Add bottom margin where missing and it made sense
samueldr Apr 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@
/robots.txt

/result*
/styles
11 changes: 11 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $(NIXPKGS_MANUAL_OUT): $(NIXPKGS_MANUAL_IN) bootstrapify-docbook.sh bootstrapify


all: $(HTML) favicon.png favicon.ico robots.txt $(subst .png,-small.png,$(filter-out %-small.png,$(wildcard nixos/screenshots/*))) \
styles \
nixos/packages-explorer.js \
nixpkgs/packages-channels.json

Expand Down Expand Up @@ -145,3 +146,13 @@ nixpkgs/packages-channels.json: Makefile

nixos/packages-explorer.js:
@ln -sfn $(PACKAGES_EXPLORER) $@

# The nix-built site will use the provided SITE_STYLES
ifeq ($(strip $(SITE_STYLES)),)
# But development `make` builds will nix-build.
styles: $(wildcard site-styles/*)
nix-build -A packages.x86_64-linux.siteStyles --out-link $@
else
styles:
@ln -sfn $(SITE_STYLES) $@
endif
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ To automatically rebuild on every change:

[nix-shell]$ git ls-files | entr make

To test the complete result from a nix-build:

$ nix-build
$ nix-shell --run 'python -m http.server 8000 --directory result'

## License

The content of the website is licensed under the [Creative Commons Attribution Share Alike 4.0 International](LICENSES/CC-BY-SA-4.0.txt) license.
Expand Down