replace logo with a new hexagon design #55

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

Merged

edolstra merged 4 commits into NixOS:master from timbertson:master

Oct 20, 2015

Makefile

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -66,7 +66,7 @@ endif
  
    all: $(HTML) favicon.png $(subst .png,-small.png,$(filter-out %-small.png,$(wildcard nixos/screenshots/*)))

    favicon.png: logo/nixos-logo-only-hires.png

    	convert -adaptive-resize 16x16! $< $@

    	convert -resize 16x16 -background none -gravity center -extent 16x16 $< $@

    %-small.png: %.png

    	convert -resize 200 $< $@

css/nixos-site.css

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -27,14 +27,14 @@ p {
  
    }

    .logo {

        margin-top: -10px;

        margin-top: -5px;

        height: 25px;

    }

    .right-logo {

        width: 14em;

        float: left;

        margin-right: 3em;

        margin: 1em 3em 1em 0em;

    }

    h2, div.docbook h1 {

favicon.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

layout.tt

-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,8 @@ @@
         <link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" />
+        <link rel="shortcut icon" type="image/png" href="/favicon.png" />
       </head>
       <body>
@@ Expand Down @@

logo/nix-wiki.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

logo/nixos-hex.svg

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

logo/nixos-hires-print.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

logo/nixos-hires.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

logo/nixos-logo-only-hires-print.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

logo/nixos-logo-only-hires.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

logo/nixos-lores-no-alpha.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

logo/nixos-lores.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

0 logo/nixos.svg → logo/nixos-old.svg

File renamed without changes