From: Jakub Steiner <[email protected]>
---
src/app/stylesheets/_base.scss | 3 ++
src/app/stylesheets/aggregator.scss | 23 ++++++++++++++++++
src/app/views/layouts/_header.haml | 3 +-
src/app/views/layouts/aggregator.haml | 42 ++++++++++++++++----------------
src/public/images/dc_logo.png | Bin 0 -> 426 bytes
src/public/images/rh_logo.png | Bin 0 -> 1032 bytes
6 files changed, 49 insertions(+), 22 deletions(-)
create mode 100644 src/public/images/dc_logo.png
create mode 100644 src/public/images/rh_logo.png
diff --git a/src/app/stylesheets/_base.scss b/src/app/stylesheets/_base.scss
index e2d01c9..2467b50 100644
--- a/src/app/stylesheets/_base.scss
+++ b/src/app/stylesheets/_base.scss
@@ -4,6 +4,9 @@ $screenfont: "Liberation Sans", "Droid Sans", Helvetica, Arial,
sans-serif;
/* $headlinefont: "Roadgeek E", Interstate, sans-serif; */
$headlinefont: FreeWay, Interstate, sans-serif;
+/* colors */
+$headerbg: #0B3559;
+
@import "text";
@mixin border-radius($radius) {
diff --git a/src/app/stylesheets/aggregator.scss
b/src/app/stylesheets/aggregator.scss
index fa031f2..d4427ad 100644
--- a/src/app/stylesheets/aggregator.scss
+++ b/src/app/stylesheets/aggregator.scss
@@ -3,3 +3,26 @@
html {
}
+
+#head {
+ background-color: $headerbg;
+ border-bottom: 1px solid rgba(255,255,255,.15);
+ overflow: hidden;
+ #header {
+ h1 {
+ text-transform: uppercase;
+ font-size: 110%;
+ color: #fff;
+ margin: 2px 0 0;
+ padding: 6px 0 4px 67px;
+ background: url(/images/rh_logo.png) no-repeat left center;
+ position: relative;
+ img.dc {
+ position: absolute;
+ left: 33px;
+ top: 7px;
+ }
+ }
+ }
+}
+
diff --git a/src/app/views/layouts/_header.haml
b/src/app/views/layouts/_header.haml
index 6155b48..54511cc 100644
--- a/src/app/views/layouts/_header.haml
+++ b/src/app/views/layouts/_header.haml
@@ -1,4 +1,5 @@
-%h1 Red Hat Deltacloud
+%h1
+ %img.dc{:src => '/images/dc_logo.png'} Cloud Aggregator
- unless @current_user.nil?
%ul
%li.about
diff --git a/src/app/views/layouts/aggregator.haml
b/src/app/views/layouts/aggregator.haml
index 2264191..b998804 100644
--- a/src/app/views/layouts/aggregator.haml
+++ b/src/app/views/layouts/aggregator.haml
@@ -1,5 +1,5 @@
-!!!
-%html{html_attrs}
+<!DOCTYPE html>
+%html
%head
%meta(http-equiv="Content-Type" content="text/html; charset=UTF-8")
%title
@@ -25,25 +25,25 @@
- else
- section_id = ""
%body{:id => section_id}
- .container_16
- %header
+ %div#head
+ %div#header.container_16
= render :partial => '/layouts/header'
- - if current_user.nil?
- #formwindow
- = yield
- - else
- #search.prefix_10
- %form
- %input{ :name => "s", :type => "search", :placeholder => "Search
Cloud Aggregator", :value => "Search Deltacloud Aggregator"}
- %p
- %a{ :href => "" }
- = t(:advanced_search)
- %nav
- = render_navigation(:expand_all => true, :level => 1..2)
- #subnav.content_16
- = render_navigation(:expand_all => true, :level => 3)
- #content.container_16
- = render :partial => '/layouts/notification'
- = (yield(:content) or yield) # content is set if we're using a sub
template
+ - if current_user.nil?
+ #formwindow
+ = yield
+ - else
+ #search.prefix_10
+ %form
+ %input{ :name => "s", :type => "search", :placeholder => "Search
Cloud Aggregator", :value => "Search Deltacloud Aggregator"}
+ %p
+ %a{ :href => "" }
+ = t(:advanced_search)
+ %nav
+ = render_navigation(:expand_all => true, :level => 1..2)
+ #subnav.content_16
+ = render_navigation(:expand_all => true, :level => 3)
+ #content.container_16
+ = render :partial => '/layouts/notification'
+ = (yield(:content) or yield) # content is set if we're using a sub
template
%footer
= render :partial => "layouts/footer"
diff --git a/src/public/images/dc_logo.png b/src/public/images/dc_logo.png
new file mode 100644
index
0000000000000000000000000000000000000000..ae983676d66d632bf3f2d0799bcd9a5de852cea5
GIT binary patch
literal 426
zcmV;b0agBqP)<h;3K|lk000e1njltq000^q000j...@s6`cdej00004b3#c}2nyxw
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaahuua%y?...@h10vhdbk~y-6wbval)nOC|@dg-tl...@tql9|5%KSvaB%e%2-0|+
zBHC&e6@&<V1rE{faB(q...@c7)8(xeDlMkwmn!6&TS`1^I>aK6v^9?qBZoQFq}*Gc?u
z...@^esqkyvlg5b$no%tu;-oBT(lVqUIi5_6S;j0x?zf3q...@n3y2c@%V+v1jhEK(z
zwjC|v5;ngx...@fgidi%a1-zf1*3hewxuybki0xrf^*llk;>6AmgKs;vgIT_CErN0
zRq|I!CaMZ;mS#su9(Qq%l6)<Er|Q);OWebcF7CqJo}g7#=)A-c^mTE)cvkSQszPrN
z4B`Wxmi!RbFj>w^b$mgq`P+W}fp3y*Bq7Pmib9f1C;6CUKgmIoZ%N)K8U9^!3)w3V
U-XzofKL7v#07*qoM6N<$g3PwGr~m)}
literal 0
HcmV?d00001
diff --git a/src/public/images/rh_logo.png b/src/public/images/rh_logo.png
new file mode 100644
index
0000000000000000000000000000000000000000..4174b0c43c62bf69bbbc40301fc25d09f5470d63
GIT binary patch
literal 1032
zcmV+j1o!)iP)<h;3K|lk000e1njltq000#l000y...@s6vop>200004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaahuua%y?...@h11bfrmk~y-6jg)u_rdpe0kfm...@pqe+_sfbimxwzg+}}cwpuqy
zQPCo-Aka6-r09)rQY*w4^`<2#Bm^z$g}#b(u...@uw6vgxvz5~v(?(;px!tb...@dw
z_dLDW?(u...@bjyc>a...@9+ejag>o#...@dw}{%qp|%UM9asYlAzV?YLD%=c%Vx88
zR+?4!lGfKp9+$HIiJ<nZxUGu2C=R7kna}S_>NxfR1t$P|gKqF_AVN%Oi}k;Jk0^?v
zvdfR|8~_5}=(^XHOcutMkvfk3nu4B6;e+TyY|;(tYDoVqdkmLLw3#9HWv3}r1&u_a
zR?Ec1L;*mXCv*}DPF6aCO0iitIhadwFqh<uVjh4d-Qc-E1V?Ff1|qd5-k8tlx)+rK
znqyo2DB3E?h*I?0kB}Ch2#SzW%M4A4&#RefN>uihmln...@z%=vdi~6+iar0kc>G5
z(q2Qm8Rk$f$<J;Pe;M68;!0ze8C;UnG&wf^#oqz&QZULo&A?F_uLPqc#plD>G<&mm
zc&~7m(XzXYc!O^8VlYxYiO`~yGL&Omy(l`j83Epp#EC34cnFu=B7LO-zj-CrY6d-4
z...@pgu8(^jg0to<&sSMWl(;La%^h?#iR3^4UUE#nsj4{qFE7c`yQKgV+m<3PS0gH
zs1cgvr...@g<EBh1GyQF<WusiS6UnhE5#PwT$Rv87;xwNHBmtgxL(`P-qGIQGkE2n
zqi$~O^<0wg-MLjS3t-wW(_P3g?t1|EO5Iekn0;CyZ)ln}6AA_Y)pf(Yb$e{1X`1H1
zz%MuVbaXUWP~W5*tk(=4({x-qd?wewwq...@m@N5y0=dC^_}l%Zr=83B9T}NaQN_B
z{ad$e4e#5(e<wgDlgXXv?jAG(rfO_#G$$t~-B2i~hKH|vz30#EULsq#oJwb&L_`pg
z%klu^^Le>=;ez~e<A#Wc96x^S2PbApZNzQ+nYy~V=E^l60WRIgI>O;FF~=buj{|V_
z%-Lul5Ey&D^M$e2*4EIq->(gyJay`8%d#G>C`Clx6cPVHibX`;edq1|L}LBbsi~=%
zh195sg*q~1alk_s3htu...@o{se%phjy^in`h>3QIxqz61!k(=R+Uy_mxx^aAA)B^
zq+3ls_i`-z^vgsacp2ed5dmam...@dob>iR4gLr5UimBj3%VKr0000<MNUMnLSTY7
CDdYVB
literal 0
HcmV?d00001
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
