Skip to content
Snippets Groups Projects
Commit 16d2f4f6 authored by Sid Sijbrandij's avatar Sid Sijbrandij
Browse files

Merge branch 'remove_sprite' into 'master' 

Better organized filenames

See merge request !574
parents 35c06b96 ec53e7f7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 54 additions and 54 deletions
source/index.html
+ 36
− 36
View file @ 16d2f4f6
@@ -126,95 +126,95 @@ extra_css:
<div class="container">
<div class="row text-center logos">
<div class="col-xs-6 col-md-2 logos-holder">
<div class="col-md-12 col-sm-12 logos-inner ibm">
<img alt="image" src="/images/organizations/ibm.png">
<div class="col-md-12 col-sm-12 logos-inner logo_1a">
<img alt="image" src="/images/organizations/logo_1a.png">
</div>
</div>
<div class="col-xs-6 col-md-2 logos-holder">
<div class="col-md-12 col-sm-12 logos-inner expedia">
<img alt="image" src="/images/organizations/expedia.png">
<div class="col-md-12 col-sm-12 logos-inner logo_2a">
<img alt="image" src="/images/organizations/logo_2a.png">
</div>
</div>
<div class="col-xs-6 col-md-2 logos-holder">
<div class="col-md-12 col-sm-12 logos-inner stack_exchange">
<img alt="image" src="/images/organizations/stack_exchange.png">
<div class="col-md-12 col-sm-12 logos-inner logo_3a">
<img alt="image" src="/images/organizations/logo_3a.png">
</div>
</div>
<div class="col-xs-6 col-md-2 logos-holder">
<div class="col-md-12 col-sm-12 logos-inner nasa">
<img alt="image" src="/images/organizations/nasa.png">
<div class="col-md-12 col-sm-12 logos-inner logo_4a">
<img alt="image" src="/images/organizations/logo_4a.png">
</div>
</div>
<div class="col-xs-6 col-md-2 logos-holder">
<div class="col-md-12 col-sm-12 logos-inner bell">
<img alt="image" src="/images/organizations/bell.png">
<div class="col-md-12 col-sm-12 logos-inner logo_5a">
<img alt="image" src="/images/organizations/logo_5a.png">
</div>
</div>
<div class="col-xs-6 col-md-2 logos-holder">
<div class="col-md-12 col-sm-12 logos-inner at_t">
<img alt="image" src="/images/organizations/at_t.png">
<div class="col-md-12 col-sm-12 logos-inner logo_6a">
<img alt="image" src="/images/organizations/logo_6a.png">
</div>
</div>
<hr />
<div class="col-xs-6 col-md-2 logos-holder">
<div class="col-md-12 col-sm-12 logos-inner alibaba">
<img alt="image" src="/images/organizations/alibaba.png">
<div class="col-md-12 col-sm-12 logos-inner logo_1b">
<img alt="image" src="/images/organizations/logo_1b.png">
</div>
</div>
<div class="col-xs-6 col-md-2 logos-holder">
<div class="col-md-12 col-sm-12 logos-inner spacex">
<img alt="image" src="/images/organizations/spacex.png">
<div class="col-md-12 col-sm-12 logos-inner logo_2b">
<img alt="image" src="/images/organizations/logo_2b.png">
</div>
</div>
<div class="col-xs-6 col-md-2 logos-holder">
<div class="col-md-12 col-sm-12 logos-inner redhat">
<img alt="image" src="/images/organizations/redhat.png">
<div class="col-md-12 col-sm-12 logos-inner logo_3b">
<img alt="image" src="/images/organizations/logo_3b.png">
</div>
</div>
<div class="col-xs-6 col-md-2 logos-holder">
<div class="col-md-12 col-sm-12 logos-inner qualcomm">
<img alt="image" src="/images/organizations/qualcomm.png">
<div class="col-md-12 col-sm-12 logos-inner logo_4b">
<img alt="image" src="/images/organizations/logo_4b.png">
</div>
</div>
<div class="col-xs-6 col-md-2 logos-holder">
<div class="col-md-12 col-sm-12 logos-inner archives">
<img alt="image" src="/images/organizations/national-archives.png">
<div class="col-md-12 col-sm-12 logos-inner logo_5b">
<img alt="image" src="/images/organizations/logo_5b.png">
</div>
</div>
<div class="col-xs-6 col-md-2 logos-holder">
<div class="col-md-12 col-sm-12 logos-inner nasdaq">
<img alt="image" src="/images/organizations/nasdaq.png">
<div class="col-md-12 col-sm-12 logos-inner logo_7b">
<img alt="image" src="/images/organizations/logo_7b.png">
</div>
</div>
<hr />
<div class="col-xs-6 col-md-2 logos-holder">
<div class="col-md-12 col-sm-12 logos-inner interpol">
<img alt="image" src="/images/organizations/interpol.png">
<div class="col-md-12 col-sm-12 logos-inner logo_1c">
<img alt="image" src="/images/organizations/logo_1c.png">
</div>
</div>
<div class="col-xs-6 col-md-2 logos-holder">
<div class="col-md-12 col-sm-12 logos-inner cern">
<img alt="image" src="/images/organizations/cern.png">
<div class="col-md-12 col-sm-12 logos-inner logo_2c">
<img alt="image" src="/images/organizations/logo_2c.png">
</div>
</div>
<div class="col-xs-6 col-md-2 logos-holder">
<div class="col-md-12 col-sm-12 logos-inner publicis">
<img alt="image" src="/images/organizations/publicis.png">
<div class="col-md-12 col-sm-12 logos-inner logo_3c">
<img alt="image" src="/images/organizations/logo_3c.png">
</div>
</div>
<div class="col-xs-6 col-md-2 logos-holder">
<div class="col-md-12 col-sm-12 logos-inner oreilly">
<img alt="image" src="/images/organizations/oreilly.png">
<div class="col-md-12 col-sm-12 logos-inner logo_4c">
<img alt="image" src="/images/organizations/logo_4c.png">
</div>
</div>
<div class="col-xs-6 col-md-2 logos-holder">
<div class="col-md-12 col-sm-12 logos-inner avg">
<img alt="image" src="/images/organizations/avg.png">
<div class="col-md-12 col-sm-12 logos-inner logo_5c">
<img alt="image" src="/images/organizations/logo_5c.png">
</div>
</div>
<div class="col-xs-6 col-md-2 logos-holder">
<div class="col-md-12 col-sm-12 logos-inner ucla">
<img alt="image" src="/images/organizations/ucla.png">
<div class="col-md-12 col-sm-12 logos-inner logo_7c">
<img alt="image" src="/images/organizations/logo_7c.png">
</div>
</div>
<br/>
source/stylesheets/landing.css
+ 18
− 18
View file @ 16d2f4f6
@@ -504,24 +504,24 @@
color: #a0c720;
}
 
.cern img {opacity: 0.5;}
.stack_exchange img { width: 177px; margin-top: -24px; opacity: 0.5; }
.expedia img { width: 118px; opacity: 0.5; }
.nasa img { width: 95px; margin-top: 12px; margin-left: 23px; opacity: 0.5; }
.bell img { width: 100px; margin-top: 25px; opacity: 0.5; }
.at_t img { margin-top: 23px; opacity: 0.5; }
.alibaba img { margin-top: 4px; width: 145px; opacity: 0.5; }
.spacex img { width: 170px; margin-top: 45px; opacity: 0.5; }
.redhat img { width: 139px; margin-top: 37px; opacity: 0.5; }
.qualcomm img { margin-top: 44px; opacity: 0.5; }
.archives img { margin-top: 45px; width: 161px; opacity: 0.5; }
.nasdaq img { margin-top: 47px; width: 166px; opacity: 0.5; }
.interpol img { width: 89px; opacity: 0.5; }
.ibm img { margin-top: 20px; opacity: 0.5; width: 125px; }
.publicis img { width: 155px; margin-top: 38px; opacity: 0.5; }
.oreilly img { width: 185px; margin-left: -26px; opacity: 0.5; }
.avg img { margin-top: 35px; opacity: 0.5; }
.ucla img { margin-top: 42px; opacity: 0.5; }
.logo_1a img { margin-top: 14px; opacity: 0.5; width: 171px; margin-left: -12px; }
.logo_2a img { width: 118px; opacity: 0.5; margin-left: 10px; }
.logo_3a img { width: 206px; margin-top: -24px; opacity: 0.5; margin-left: -21px }
.logo_4a img { width: 115px; margin-top: 12px; margin-left: 37px; opacity: 0.5; }
.logo_5a img { width: 100px; margin-top: 25px; opacity: 0.5; }
.logo_6a img { margin-top: 23px; opacity: 0.5; }
.logo_1b img { margin-top: 4px; width: 145px; opacity: 0.5; }
.logo_2b img { width: 170px; margin-top: 45px; opacity: 0.5; }
.logo_3b img { width: 139px; margin-top: 37px; opacity: 0.5; }
.logo_4b img { margin-top: 44px; opacity: 0.5; }
.logo_5b img { margin-top: 45px; width: 161px; opacity: 0.5; }
.logo_7b img { margin-top: 47px; width: 166px; opacity: 0.5; }
.logo_1c img { width: 89px; opacity: 0.5; }
.logo_2c img {opacity: 0.5;}
.logo_3c img { width: 155px; margin-top: 38px; opacity: 0.5; }
.logo_4c img { width: 185px; margin-left: -26px; opacity: 0.5; }
.logo_5c img { margin-top: 35px; opacity: 0.5; }
.logo_7c img { margin-top: 42px; opacity: 0.5; }
 
.logo-disclaimer {
font-family: 'Korolev-Light';
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment