aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorLuc Donnet2014-10-22 10:35:18 +0200
committerLuc Donnet2014-10-22 10:35:18 +0200
commit1129e0f12f054615907d3810ef96e2035fd9bf4f (patch)
tree6461843b4d875a7e3c338a4e542ce002a4aab284 /app
parent1b58515640be1140fc3dde5fa00d0f32ee3b391a (diff)
downloadchouette-core-1129e0f12f054615907d3810ef96e2035fd9bf4f.tar.bz2
Change chouette logo for an amazing owl
Diffstat (limited to 'app')
-rw-r--r--app/assets/images/logo_chouette.pngbin5631 -> 2539 bytes
-rw-r--r--app/assets/stylesheets/main/layout.css.scss13
-rw-r--r--app/views/shared/_header.erb2
3 files changed, 11 insertions, 4 deletions
diff --git a/app/assets/images/logo_chouette.png b/app/assets/images/logo_chouette.png
index f5064d3cd..2b2040113 100644
--- a/app/assets/images/logo_chouette.png
+++ b/app/assets/images/logo_chouette.png
Binary files differ
diff --git a/app/assets/stylesheets/main/layout.css.scss b/app/assets/stylesheets/main/layout.css.scss
index f55a7c90f..90da0cc6d 100644
--- a/app/assets/stylesheets/main/layout.css.scss
+++ b/app/assets/stylesheets/main/layout.css.scss
@@ -27,13 +27,20 @@ ol.breadcrumb{
img {
height: 40px;
}
+
+ .brand_name{
+ margin-left: 3px;
+ margin-right: 3px;
+ font-size: 20px;
+ font-family: monospace;
+ font-weight: bold;
+ }
.version
- {
- margin-left: 3px;
+ {
vertical-align: text-top;
color: white;
- font-size: 13px;
+ font-size: 12px;
}
}
diff --git a/app/views/shared/_header.erb b/app/views/shared/_header.erb
index 81d75d1ae..0c3cf3bc6 100644
--- a/app/views/shared/_header.erb
+++ b/app/views/shared/_header.erb
@@ -10,7 +10,7 @@
<span class="icon-bar version"><%= APP_VERSION %></span>
</button>
<%= link_to referentials_path, :class =>"navbar-brand" do %>
- <%= image_tag("logo_chouette.png") %> <span class="version"><%= APP_VERSION %></span>
+ <%= image_tag("logo_chouette.png") %><span class="brand_name">CHOUETTE</span></i><span class="version"><%= APP_VERSION %></span>
<% end %>
</div>