nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove alpha branding

Browse source
This commit is contained in:
Steffen van Bergerem 2013-06-12 22:58:01 +02:00
parent c7909a39cb
commit 21ef1c8e41
6 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -20,6 +20,7 @@
* Don't show hovercards for current user in comments [#3999](https://github.com/diaspora/diaspora/issues/3999) * Don't show hovercards for current user in comments [#3999](https://github.com/diaspora/diaspora/issues/3999)
* Replace mentions of out-of-aspect people with markdown links [#4161](https://github.com/diaspora/diaspora/pull/4161) * Replace mentions of out-of-aspect people with markdown links [#4161](https://github.com/diaspora/diaspora/pull/4161)
* Unify hide and ignore [#3828](https://github.com/diaspora/diaspora/issues/3828) * Unify hide and ignore [#3828](https://github.com/diaspora/diaspora/issues/3828)
* Remove alpha branding [#4196](https://github.com/diaspora/diaspora/issues/4196)
## Features ## Features

BIN
app/assets/images/branding/logo_large.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.6 KiB

BIN
app/assets/images/branding/logo_small.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.7 KiB

4
app/assets/stylesheets/application.css.sass
View file

@ -153,10 +153,6 @@ header
:display inline-block :display inline-block
:margin-top 5px :margin-top 5px
.branding-logo_small
:height 16px
:width 161px
a a
:color #CCC :color #CCC
:color rgb(147,147,147) :color rgb(147,147,147)

2
app/views/layouts/_header.html.haml
View file

@ -5,7 +5,7 @@
%header %header
- unless current_user - unless current_user
.container{:style => "position:relative;"} .container{:style => "position:relative;"}
= link_to content_tag(:div, nil, :class => 'branding-logo_small'), root_path = link_to content_tag(:div, nil, :class => 'diaspora_header_logo branding-header-logo'), root_path
%ul#landing_nav %ul#landing_nav
%li= link_to '@joindiaspora', "http://twitter.com/joindiaspora" %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"

2
public/500.html
View file

@ -34,7 +34,7 @@
<body> <body>
<!-- This file lives in public/500.html --> <!-- This file lives in public/500.html -->
<header> <header>
<img id="diaspora_logo" src="/assets/branding/logo_large.png"/> <img id="diaspora_logo" src="/assets/branding/white2x.png"/>
</header> </header>
<h1> <h1>