mirror of
https://github.com/ENSL/ensl.org.git
synced 2025-01-14 05:41:00 +00:00
Updated logo to opaque version
This commit is contained in:
parent
b6956c89c0
commit
9c2cdcf7fa
5 changed files with 11 additions and 3 deletions
BIN
app/assets/images/logo-trans.png
Normal file
BIN
app/assets/images/logo-trans.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 95 KiB |
Binary file not shown.
Before Width: | Height: | Size: 95 KiB After Width: | Height: | Size: 153 KiB |
|
@ -8,14 +8,21 @@ div
|
||||||
padding-bottom: 30px
|
padding-bottom: 30px
|
||||||
|
|
||||||
&#indexMain
|
&#indexMain
|
||||||
|
position: relative
|
||||||
margin: 0 auto 0 auto
|
margin: 0 auto 0 auto
|
||||||
width: 1200px
|
width: 1200px
|
||||||
padding-bottom: 20px
|
padding-bottom: 20px
|
||||||
|
|
||||||
|
&#logo
|
||||||
|
width: 480px
|
||||||
|
height: 353px
|
||||||
|
position: absolute
|
||||||
|
top: 5px
|
||||||
|
background: image-url('logo.png') left -85px no-repeat
|
||||||
|
|
||||||
&#indexBanner
|
&#indexBanner
|
||||||
width: 100%
|
width: 100%
|
||||||
height: 194px
|
height: 194px
|
||||||
background: image-url('logo.png') left -55px no-repeat
|
|
||||||
position: relative
|
position: relative
|
||||||
|
|
||||||
&#indexLogo
|
&#indexLogo
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
<body>
|
<body>
|
||||||
<div id="indexContainer">
|
<div id="indexContainer">
|
||||||
<div id="indexMain">
|
<div id="indexMain">
|
||||||
|
<div id="logo"></div>
|
||||||
<%= render :partial => "layouts/header" %>
|
<%= render :partial => "layouts/header" %>
|
||||||
|
|
||||||
<div id="indexMainarea">
|
<div id="indexMainarea">
|
||||||
|
|
|
@ -14,7 +14,7 @@ Capybara.register_driver :poltergeist do |app|
|
||||||
Capybara::Poltergeist::Driver.new(app, :phantomjs_logger => File.open('/dev/null'))
|
Capybara::Poltergeist::Driver.new(app, :phantomjs_logger => File.open('/dev/null'))
|
||||||
end
|
end
|
||||||
|
|
||||||
Capybara.javascript_driver = :selenium
|
Capybara.javascript_driver = :poltergeist
|
||||||
|
|
||||||
Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
|
Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ RSpec.configure do |config|
|
||||||
|
|
||||||
config.before(:each) do
|
config.before(:each) do
|
||||||
if example.metadata[:type] == :feature
|
if example.metadata[:type] == :feature
|
||||||
Capybara.current_driver = :selenium
|
Capybara.current_driver = :poltergeist
|
||||||
else
|
else
|
||||||
Capybara.use_default_driver
|
Capybara.use_default_driver
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue