Repository: incubator-systemml-website Updated Branches: refs/heads/master 0e699197b -> cdf04aeb8
Move and update white paper awards banner Closes #61, Closes #44. Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/commit/cdf04aeb Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/tree/cdf04aeb Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/diff/cdf04aeb Branch: refs/heads/master Commit: cdf04aeb873ea4ff0d2fb1f9bbd49c7cb855c7e4 Parents: 0e69919 Author: Jeremy Anderson <[email protected]> Authored: Tue May 30 12:45:41 2017 -0700 Committer: Deron Eriksson <[email protected]> Committed: Tue May 30 12:45:41 2017 -0700 ---------------------------------------------------------------------- _src/_includes/themes/apache/home.html | 21 +++++++++++++++------ _src/_sass/_banners.scss | 20 ++++++++++++++++++++ _src/_sass/_buttons.scss | 15 --------------- _src/_sass/_layout.scss | 2 +- 4 files changed, 36 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/blob/cdf04aeb/_src/_includes/themes/apache/home.html ---------------------------------------------------------------------- diff --git a/_src/_includes/themes/apache/home.html b/_src/_includes/themes/apache/home.html index ba8a9e1..c104604 100644 --- a/_src/_includes/themes/apache/home.html +++ b/_src/_includes/themes/apache/home.html @@ -34,18 +34,16 @@ limitations under the License. </section> -<!-- Awards --> -<section class="full-stripe full-stripe--alternate"> +<!-- Announcements Banner --> +<!-- <section class="full-stripe full-stripe--alternate"> <div class="ml-container ml-container--narrow"> - <div class="col col-4 content-group content-group--center-content" id="award"> - <!-- <a href="http://vldb2016.persistent.com/awards.php";></a> --> - </div> + <div class="col col-4 content-group content-group--center-content vldb2016" id="award"></div> <div class="col col-8 content-group content-group--center-align content-group--center-content"> <h3>VLDB 2016 Best Paper</h3> <p>Read Compressed Linear Algebra for Large-Scale Machine Learning.<a href="http://www.vldb.org/pvldb/vol9/p960-elgohary.pdf"; target="_blank"> Download Paper</a></p> </div> </div> -</section> +</section> --> <!-- About --> <section class="full-stripe"> @@ -80,6 +78,17 @@ limitations under the License. </section> +<!-- Awards --> +<section class="full-stripe full-stripe--alternate-2"> + <div class="ml-container ml-container--narrow"> + <div class="col col-4 content-group content-group--center-content vldb2016" id="award"></div> + <div class="col col-8 content-group content-group--center-align content-group--center-content"> + <h3>VLDB 2016 Best Paper</h3> + <p>Read Compressed Linear Algebra for Large-Scale Machine Learning.<a href="http://www.vldb.org/pvldb/vol9/p960-elgohary.pdf"; target="_blank"> Download Paper</a></p> + </div> + </div> +</section> + <!-- Contact Us --> <section class="full-stripe"> <div class="ml-container ml-container--horizontally-center"> http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/blob/cdf04aeb/_src/_sass/_banners.scss ---------------------------------------------------------------------- diff --git a/_src/_sass/_banners.scss b/_src/_sass/_banners.scss index 9ac7f9e..4dac43c 100644 --- a/_src/_sass/_banners.scss +++ b/_src/_sass/_banners.scss @@ -8,6 +8,9 @@ &--alternate { background-color: #f9f9fb; } + &--alternate-2 { + background-color: #f0f2f4; + } // front page hero background &--video { @@ -247,6 +250,23 @@ } } +//Announcement banner + +.vldb2016 { + background-image: url("/assets/img/mobile-award.png"); + background-size: 167px 47px; + width: 167px; + height: 47px; + margin-bottom: 2em; + + @media (min-width: 64em) { + background-image: url("/assets/img/award.png"); + background-size: 170px 100px; + width: 170px; + height: 100px; + } +} + .site-footer { text-align: center; font-size: 12px; http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/blob/cdf04aeb/_src/_sass/_buttons.scss ---------------------------------------------------------------------- diff --git a/_src/_sass/_buttons.scss b/_src/_sass/_buttons.scss index 9830d2d..ab43211 100644 --- a/_src/_sass/_buttons.scss +++ b/_src/_sass/_buttons.scss @@ -19,18 +19,3 @@ border-color: $color-systemml-accent2-dark; } } - -#award { - background-image: url("/assets/img/mobile-award.png"); - background-size: 167px 47px; - width: 167px; - height: 47px; - margin-bottom: 2em; - - @media (min-width: 64em) { - background-image: url("/assets/img/award.png"); - background-size: 170px 100px; - width: 170px; - height: 100px; - } -} http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/blob/cdf04aeb/_src/_sass/_layout.scss ---------------------------------------------------------------------- diff --git a/_src/_sass/_layout.scss b/_src/_sass/_layout.scss index 222448d..62e0feb 100644 --- a/_src/_sass/_layout.scss +++ b/_src/_sass/_layout.scss @@ -77,7 +77,7 @@ @media (min-width: 64em) { width: 40em; padding: 1em; - #award { + .vldb2016 { margin-bottom: 0; } h3, p{
