diff --git a/ChangeLog b/ChangeLog index 9a546b9af12906cedc3572d56b939fcbaeb385b5..245d20964c8af2516c948e2778d5894fd6f94842 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ train-2012.02.02: * (hotfix 2012.02.07) Modify build process to pick up locales from a .json file * (hotfix 2012.02.07) fix production-locales.sh script to defer to the environment for configuration * (hotfix 2012.02.13) fix for IE users not seeing error screens sometimes: #1087 + * (hotfix 2012.02.22) add banner announcing brand change train-2012.01.18: * support for 3rd party primary identity providers: #761, #904, #865 diff --git a/resources/static/css/m.css b/resources/static/css/m.css index c8004bb1d30b84a130f6c05e4d63c6dd2e37ac25..66274ef26d56b47b296906d4d9c91ba91a02b8c0 100644 --- a/resources/static/css/m.css +++ b/resources/static/css/m.css @@ -99,7 +99,7 @@ padding: 0 10px; font-size: 16px; line-height: 21px; - margin: 122px 0 122px; + margin: 0 0 90px; /* Add a bottom margin so the footer is never overlapped. */ } #signUp p { @@ -231,4 +231,8 @@ float: right; } + #newsbanner { + margin: 115px 0 28px 0; /* put a margin-top on so that it does not go under the header */ + + } } diff --git a/resources/static/css/style.css b/resources/static/css/style.css index 2b75378bdbc0a133fc700aa3f456892252a6f32d..331aa333afc6d16a58452994d5472cb74a988021 100644 --- a/resources/static/css/style.css +++ b/resources/static/css/style.css @@ -809,6 +809,7 @@ footer { } #newsbanner { + margin-top: 60px; /* put a margin-top on so that it does not go under the header */ background-color: #faca33; line-height: 32px; border-radius: 4px; diff --git a/scripts/browserid.spec b/scripts/browserid.spec index 6ed39bbfd82a3d7c4c310e7b9d8de75e05742771..e1bc7df0d3118dad98e3a4c3dfa02734007cd6a6 100644 --- a/scripts/browserid.spec +++ b/scripts/browserid.spec @@ -34,7 +34,7 @@ echo "locale svn r$SVN_REVISION" >> resources/static/ver.txt %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_rootdir} -for f in bin lib locale node_modules resources scripts *.json; do +for f in bin config lib locale node_modules resources scripts *.json; do cp -rp $f %{buildroot}%{_rootdir}/ done mkdir -p %{buildroot}%{_rootdir}/config