Skip to content
This repository was archived by the owner on Nov 16, 2018. It is now read-only.

sponsor logo parts was updated for smartphone and tablet adaption #164

Open
amazarashi wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

sponsor logo parts was updated for smartphone and tablet adaption #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9062096
sponsor logo:adaption to smartphone
amazarashi Jun 23, 2016
3d1671e
clear conflict and fixed sum bug
amazarashi Jun 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions source/assets/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,15 @@ a.navbar-brand:hover{
font-size: 1.5em;
}

.eqh{
float: none;
display: table-cell;
}

img.eqhadaption{
width: 100%;
max-width: 280px;
}
/* footer */
.footerback{
position: relative;
Expand Down Expand Up @@ -523,4 +532,11 @@ tbody.programtable tr td{
width: 100px;
height: 100px;
}
.eqh{
display: inline-block;
float: none;
}
img.eqhadaption{
width: 100%;
}
}
64 changes: 33 additions & 31 deletions source/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,11 +304,11 @@
<img src="/assets/img/mithril.png" alt="">
</div>
<% data.index.prise.mithril.each_slice(1) do |prise| %>
<div class="col-md-12">
<div class="col-md-12 col-sm-12 col-xs-12">
<% prise.each do |p| %>
<div class="col-md-4 col-md-offset-4">
<div class="col-md-4 col-sm-4 col-xs-12 eqh">
<a class="linkwhite" href="<%= p.url %>">
<img src="/assets/img/sponsor/<%= p.imgname %>" alt="<%= p.sponsorname %>" class="sponsor-img sponsor-size-mithril" <%= (p.zoom.nil?)?"":"style=\"width:"+p.zoom+"\"" %> >
<img src="assets/img/sponsor/<%= p.imgname %>" alt="<%= p.sponsorname %>" class="sponsor-img sponsor-size-mithril eqhadaption" <%= (p.zoom.nil?)?"":"style=\"width:"+p.zoom+"\"" %> >
</a>
</div>
<% end %>
Expand All @@ -319,12 +319,12 @@
<div class="col-md-8 col-md-offset-2 col-sm-12 col-xs-12 prise-title platinum">
<img src="/assets/img/platinum.png" alt="">
</div>
<% data.index.prise.platinum.each_slice(1) do |prise| %>
<div class="col-md-12">
<% data.index.prise.platinum.each_slice(3) do |prise| %>
<div class="col-md-12 col-sm-12 col-xs-12">
<% prise.each do |p| %>
<div class="col-md-4 col-md-offset-4">
<div class="col-md-4 col-sm-4 col-xs-12 eqh">
<a class="linkwhite" href="<%= p.url %>">
<img src="/assets/img/sponsor/<%= p.imgname %>" alt="<%= p.sponsorname %>" class="sponsor-img sponsor-size-platinum" <%= (p.zoom.nil?)?"":"style=\"width:"+p.zoom+"\"" %> >
<img src="assets/img/sponsor/<%= p.imgname %>" alt="<%= p.sponsorname %>" class="sponsor-img sponsor-size-platinum eqhadaption" <%= (p.zoom.nil?)?"":"style=\"width:"+p.zoom+"\"" %> >
</a>
</div>
<% end %>
Expand All @@ -335,12 +335,12 @@
<div class="col-md-8 col-md-offset-2 col-sm-12 col-xs-12 prise-title gold">
<img src="/assets/img/gold.png" alt="">
</div>
<% data.index.prise.gold.each_slice(1) do |prise| %>
<div class="col-md-12">
<% data.index.prise.gold.each_slice(3) do |prise| %>
<div class="col-md-12 col-sm-12 col-xs-12">
<% prise.each do |p| %>
<div class="col-md-4 col-md-offset-4">
<div class="col-md-4 col-sm-4 col-xs-12 eqh">
<a class="linkwhite" href="<%= p.url %>">
<img src="/assets/img/sponsor/<%= p.imgname %>" alt="<%= p.sponsorname %>" class="sponsor-img sponsor-size-gold" <%= (p.zoom.nil?)?"":"style=\"width:"+p.zoom+"\"" %> >
<img src="assets/img/sponsor/<%= p.imgname %>" alt="<%= p.sponsorname %>" class="sponsor-img sponsor-size-gold eqhadaption" <%= (p.zoom.nil?)?"":"style=\"width:"+p.zoom+"\"" %> >
</a>
</div>
<% end %>
Expand All @@ -352,25 +352,27 @@
<div class="col-md-8 col-md-offset-2 col-sm-12 col-xs-12 prise-title silver">
<img src="/assets/img/silver.png" alt="">
</div>
<% data.index.prise.silver.each_slice(1) do |prise| %>
<div class="col-md-12">
<% data.index.prise.silver.each_slice(3) do |prise| %>
<div class="row">
<div class="col-md-12 col-sm-12 col-xs-12">
<% prise.each do |p| %>
<div class="col-md-4 col-md-offset-4">
<div class="col-md-4 col-sm-4 col-xs-12 eqh">
<a class="linkwhite" href="<%= p.url %>">
<img src="/assets/img/sponsor/<%= p.imgname %>" alt="<%= p.sponsorname %>" class="sponsor-img sponsor-size-silver" <%= (p.zoom.nil?)?"":"style=\"width:"+p.zoom+"\"" %> >
<img src="assets/img/sponsor/<%= p.imgname %>" alt="<%= p.sponsorname %>" class="sponsor-img sponsor-size-silver eqhadaption" <%= (p.zoom.nil?)?"":"style=\"width:"+p.zoom+"\"" %> >
</a>
</div>
<% end %>
</div>
</div>
<% end %>
<% end %>
<% unless data.index.prise.mono.nil? %>
<% data.index.prise.mono.each_slice(1) do |prise| %>
<div class="col-md-12">
<% data.index.prise.mono.each_slice(3) do |prise| %>
<div class="col-md-12 col-sm-12 col-xs-12">
<% prise.each do |p| %>
<div class="col-md-4 col-md-offset-4">
<div class="col-md-4 col-sm-4 col-xs-12 eqh">
<a class="linkwhite" href="<%= p.url %>">
<img src="/assets/img/sponsor/<%= p.imgname %>" alt="<%= p.sponsorname %>" class="sponsor-img sponsor-size-mono" <%= (p.zoom.nil?)?"":"style=\"width:"+p.zoom+"\"" %> >
<img src="assets/img/sponsor/<%= p.imgname %>" alt="<%= p.sponsorname %>" class="sponsor-img sponsor-size-mono eqhadaption" <%= (p.zoom.nil?)?"":"style=\"width:"+p.zoom+"\"" %> >
</a>
</div>
<% end %>
Expand All @@ -382,12 +384,12 @@
<div class="col-md-8 col-md-offset-2 col-sm-12 col-xs-12 prise-title backsupport">
<img src="/assets/img/backsupport.png" alt="">
</div>
<% data.index.prise.backsupport.each_slice(1) do |prise| %>
<div class="col-md-12">
<% data.index.prise.backsupport.each_slice(3) do |prise| %>
<div class="col-md-12 col-sm-12 col-xs-12">
<% prise.each do |p| %>
<div class="col-md-4 col-md-offset-4">
<div class="col-md-4 col-sm-4 col-xs-12 eqh">
<a class="linkwhite" href="<%= p.url %>">
<img src="/assets/img/sponsor/<%= p.imgname %>" alt="<%= p.sponsorname %>" class="sponsor-img sponsor-size-backsupport" <%= (p.zoom.nil?)?"":"style=\"width:"+p.zoom+"\"" %> >
<img src="assets/img/sponsor/<%= p.imgname %>" alt="<%= p.sponsorname %>" class="sponsor-img sponsor-size-backsupport eqhadaption" <%= (p.zoom.nil?)?"":"style=\"width:"+p.zoom+"\"" %> >
</a>
</div>
<% end %>
Expand All @@ -398,12 +400,12 @@
<div class="col-md-8 col-md-offset-2 col-sm-12 col-xs-12 prise-title cohost">
<img src="/assets/img/cohost.png" alt="">
</div>
<% data.index.prise.cohost.each_slice(1) do |prise| %>
<div class="col-md-12">
<% data.index.prise.cohost.each_slice(3) do |prise| %>
<div class="col-md-12 col-sm-12 col-xs-12">
<% prise.each do |p| %>
<div class="col-md-4 col-md-offset-4">
<div class="col-md-4 col-sm-4 col-xs-12 eqh">
<a class="linkwhite" href="<%= p.url %>">
<img src="/assets/img/sponsor/<%= p.imgname %>" alt="<%= p.sponsorname %>" class="sponsor-img sponsor-size-cohost" <%= (p.zoom.nil?)?"":"style=\"width:"+p.zoom+"\"" %> >
<img src="assets/img/sponsor/<%= p.imgname %>" alt="<%= p.sponsorname %>" class="sponsor-img sponsor-size-cohost eqhadaption" <%= (p.zoom.nil?)?"":"style=\"width:"+p.zoom+"\"" %> >
</a>
</div>
<% end %>
Expand All @@ -414,12 +416,12 @@
<div class="col-md-8 col-md-offset-2 col-sm-12 col-xs-12 prise-title medias">
<img src="/assets/img/media.png" alt="">
</div>
<% data.index.prise.media.each_slice(1) do |prise| %>
<div class="col-md-12">
<% data.index.prise.media.each_slice(3) do |prise| %>
<div class="col-md-12 col-sm-12 col-xs-12">
<% prise.each do |p| %>
<div class="col-md-4 col-md-offset-4">
<div class="col-md-4 col-sm-4 col-xs-12 eqh">
<a class="linkwhite" href="<%= p.url %>">
<img src="/assets/img/sponsor/<%= p.imgname %>" alt="<%= p.sponsorname %>" class="sponsor-img sponsor-size-medias" <%= (p.zoom.nil?)?"":"style=\"width:"+p.zoom+"\"" %> >
<img src="assets/img/sponsor/<%= p.imgname %>" alt="<%= p.sponsorname %>" class="sponsor-img sponsor-size-medias eqhadaption" <%= (p.zoom.nil?)?"":"style=\"width:"+p.zoom+"\"" %> >
</a>
</div>
<% end %>
Expand Down