Skip to content
This repository has been archived by the owner on May 18, 2021. It is now read-only.

Commit

Permalink
Merge branch 'feature/198-partners-changes' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@dvislov
dvislov committed Mar 19, 2013
2 parents 050d948 + aae2638 commit a20fa07
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 96 deletions.
102 changes: 39 additions & 63 deletions app/assets/stylesheets/custom/_sponsors.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,16 @@
}
.sponsors .logo-wrapper {
border: 1px solid #e3e3e3;
padding: 30px 0 30px 45px;
padding: 30px 0px 30px 45px;
margin-right: 40px;
}
.sponsors .line {
margin-bottom: 35px;
}
.sponsors .line:last-child {
margin-bottom: 0;
overflow: hidden;
}
.sponsors .line img {
margin-right: 44px;
float: left;
display: inline-block;
padding: 15px 0;
vertical-align: middle;
position: relative;
}
.sponsors .line sup {
float: left;
Expand All @@ -54,26 +52,6 @@
margin: 22px 0;
}

// info sponsors
.info-sponsors-first-line {
height: 62px;
}
.info-sponsors-second-line {
height: 57px;
}
.info-sponsors-third-line {
height: 54px;
}
.info-sponsors-4th-line {
height: 67px;
}
.info-sponsors-5th-line {
height: 80px;
}
.info-sponsors-6th-line {
height: 53px;
}

// star sponsors
.star-sponsors {
.item {
Expand Down Expand Up @@ -119,50 +97,48 @@
}

// custom logo position
.platidoma {
position: relative;
top: -6px;
}
.ultop {
position: relative;
top: 10px;
.simtech {
top: -3px;
}
.hackday {
position: relative;
top: -4px;
.platidoma {
top: -16px;
}
.ulpeople {
position: relative;
top: 9px;
top: 6px;
}
.rubyflow {
position: relative;
top: -12px;
.regru {
top: -2px;
}
.softline {
position: relative;
top: 22px;
.rubyjobs {
top: -6px;
}
.allintop {
position: relative;
top: -4px;
}
.free-lance {
position: relative;
top: 26px;
}
.dailycomm {
position: relative;
top: 12px;
top: -8px;
}
.cru {
padding-top: 10px;
}
.raec {
position: relative;
top: 10px;
}
.rocid {
position: relative;
top: 10px;

@media (max-width: 960px) {
.sponsors {
.left-column {
width: 100%;
float: none;
border-right: none;
margin-bottom: 40px;
}
.logo-wrapper {
margin-right: 0;
}
.right-column {
width: 100%;
}
.star-sponsors {
.item {
display: inline-block;
padding-right: 30px;
margin-right: 40px;
}
}
}
}
56 changes: 23 additions & 33 deletions app/views/layouts/web/shared/_sponsors.html.haml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,21 @@
%img{:src => "/images/logo-srit.jpg", :width => 440, :height => 48, :alt => "НП СРИТ", :class => "logo-srit"}

.logo-wrapper
.line.first-line
.line
%a{:href => "http://m-st.ru/", :target => "_blank"}
%img{:src => "/images/logo-mst.jpg", :width => 108, :height => 78, :alt => "MST Digital Agency"}
%a{:href => "http://i-dt.ru/", :target => "_blank"}
%img{:src => "/images/logo-interra.jpg", :width => 86, :height => 78, :alt => "interra-group"}
%a{:href => "http://itmcompany.ru/", :target => "_blank"}
%img{:src => "/images/logo-itm.jpg", :width => 124, :height => 78, :alt => "ITM Company"}
%a{:href => "http://simtech.ru/", :target => "_blank"}
%img{:src => "/images/logo-simtech.jpg", :width => 131, :height => 78, :alt => "Simtech"}
.line.second-line
%img.simtech{:src => "/images/logo-simtech.jpg", :width => 131, :height => 78, :alt => "Simtech"}
%a{:href => "http://kaize.ru/", :target => "_blank"}
%img{:src => "/images/logo-kaize.jpg", :width => 130, :height => 42, :alt => "Кайдзен"}
%a{:href => "http://simbirsoft.com/", :target => "_blank"}
%img{:src => "/images/logo-simbirsoft.jpg", :width => 140, :height => 42, :alt => "SimbirSoft"}
%a{:href => "http://mymediacompany.ru/", :target => "_blank"}
%img{:src => "/images/logo-mymedia.jpg", :width => 147, :height => 42, :alt => "My Media Company"}
.line.third-line
%a{:href => "http://turnkeye.com/", :target => "_blank"}
%img{:src => "/images/logo-turnkey.jpg", :width => 155, :height => 51, :alt => "Turnkey"}
%a{:href => "http://platidoma.ru/", :target => "_blank"}
Expand All @@ -35,55 +33,47 @@
%br
%h4 Информационные партнеры
.logo-wrapper
.line.info-sponsors-first-line
.line
%a{:href => "http://rocid.ru/", :target => "_blank"}
%img.rocid{:src => "/images/logo-rocid.png", :width => 150, :height => 53, :alt => "ROCID"}
%a{:href => "http://in-numbers.ru/", :target => "_blank"}
%img{:src => "/images/logo-innumbers.png", :width => 150, :height => 36, :alt => "inNumbers"}
%a{:href => "http://ultop.ru/", :target => "_blank"}
%img.ultop{:src => "/images/logo-ultop.jpg", :width => 160, :height => 40, :alt => "Ultop"}
%img{:src => "/images/logo-ultop.jpg", :width => 160, :height => 40, :alt => "Ultop"}
%a{:href => "http://weblancer.net/", :target => "_blank"}
%img{:src => "/images/logo-weblancer.jpg", :width => 119, :height => 62, :alt => "Weblancer"}
%a{:href => "http://reg.ru/", :target => "_blank"}
%img{:src => "/images/logo-regru.jpg", :width => 174, :height => 62, :alt => "Reg.ru"}

-#%a{:href => "http://mkechinov.ru/", :target => "_blank"}
-#%img{:src => "/images/logo-kechinov.jpg", :width => 104, :height => 62, :alt => "Mkechinov"}

.line.info-sponsors-second-line
%img.regru{:src => "/images/logo-regru.jpg", :width => 174, :height => 62, :alt => "Reg.ru"}
%a{:href => "http://rubyflow.ru/", :target => "_blank"}
%img{:src => "/images/logo-rubyflow.png", :width => 160, :height => 78, :alt => "RubyFlow"}
%a{:href => "http://www.cmsmagazine.ru/", :target => "_blank"}
%img{:src => "/images/logo-cmsmagazine.jpg", :width => 230, :height => 57, :alt => "CMSmagazine"}
%a{:href => "http://hackday.ru/", :target => "_blank"}
%img.hackday{:src => "/images/logo-hackday.jpg", :width => 178, :height => 54, :alt => "Hackday"}

.line.info-sponsors-third-line
%img{:src => "/images/logo-hackday.jpg", :width => 178, :height => 54, :alt => "Hackday"}
%a{:href => "http://www.cnews.ru/", :target => "_blank"}
%img.cnews{:src => "/images/logo-cnews.jpg", :width => 144, :height => 54, :alt => "Cnews"}
%img{:src => "/images/logo-cnews.jpg", :width => 144, :height => 54, :alt => "Cnews"}
%a{:href => "http://ul-people.ru/", :target => "_blank"}
%img.ulpeople{:src => "/images/logo-ulpeople.jpg", :width => 160, :height => 36, :alt => "ul-people"}
%a{:href => "http://rubyflow.ru/", :target => "_blank"}
%img.rubyflow{:src => "/images/logo-rubyflow.png", :width => 160, :height => 78, :alt => "RubyFlow"}


.line.info-sponsors-4th-line
%a{:href => "http://rubyjobs.ru/", :target => "_blank"}
%img.rubyjobs{:src => "/images/logo-rubyjobs.png", :width => 77, :height => 67, :alt => "RubyJobs"}
%a{:href => "http://softline.ru/", :target => "_blank"}
%img.softline{:src => "/images/logo-softline.png", :width => 143, :height => 28, :alt => "SoftLine"}
%img{:src => "/images/logo-softline.png", :width => 143, :height => 28, :alt => "SoftLine"}
%a{:href => "http://www.allintop.ru/", :target => "_blank"}
%img.allintop{:src => "/images/logo-allintop.png", :width => 155, :height => 60, :alt => "All-In-Top"}

.line.info-sponsors-5th-line
%a{:href => "http://www.epochta.ru/", :target => "_blank"}
%img{:src => "/images/logo-epochta.png", :width => 80, :height => 80, :alt => "ePochta"}
%a{:href => "http://www.free-lance.ru/", :target => "_blank"}
%img.free-lance{:src => "/images/logo-freelanceru.png", :width => 200, :height => 24, :alt => "Free-lance.ru"}
%img{:src => "/images/logo-freelanceru.png", :width => 200, :height => 24, :alt => "Free-lance.ru"}
%a{:href => "http://www.dailycomm.ru/", :target => "_blank"}
%img.dailycomm{:src => "/images/logo-dailycomm.jpeg", :width => 180, :height => 54, :alt => "DailyComm"}
%img{:src => "/images/logo-dailycomm.jpeg", :width => 180, :height => 54, :alt => "DailyComm"}

%br
%h4 При поддержке
.logo-wrapper
.line
%a{:href => "http://raec.ru/commission/323/", :target => "_blank"}
%img{:src => "/images/logo-raec.png", :width => 160, :height => 29, :alt => "РАЭК"}

.line.info-sponsors-6th-line
%a{:href => "http://rocid.ru/", :target => "_blank"}
%img.rocid{:src => "/images/logo-rocid.png", :width => 150, :height => 53, :alt => "ROCID"}
%a{:href => "http://raec.ru/", :target => "_blank"}
%img.raec{:src => "/images/logo-raec.png", :width => 160, :height => 29, :alt => "РАЭК"}
%a{:href => "http://in-numbers.ru/", :target => "_blank"}
%img{:src => "/images/logo-innumbers.png", :width => 150, :height => 36, :alt => "inNumbers"}

.right-column
%h4 Спонсоры
Expand Down

0 comments on commit a20fa07

Please sign in to comment.