From 3968ae493531ab66be7e7b088defa296364f31c3 Mon Sep 17 00:00:00 2001 From: Matt Stratton Date: Fri, 20 May 2016 20:23:47 -0500 Subject: [PATCH] Move social links from top nav to footer Related to #420 --- .../layouts/partials/footer.html | 6 +++++- .../layouts/partials/header.html | 11 ----------- themes/devopsdays-responsive/static/css/site.css | 2 +- themes/devopsdays-responsive/static/css/site.css.map | 2 +- themes/devopsdays-responsive/static/site.less | 11 +++++++++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/themes/devopsdays-responsive/layouts/partials/footer.html b/themes/devopsdays-responsive/layouts/partials/footer.html index 1c4a4b1e37b..d776f4f8587 100644 --- a/themes/devopsdays-responsive/layouts/partials/footer.html +++ b/themes/devopsdays-responsive/layouts/partials/footer.html @@ -1,6 +1,10 @@
-

Copyright © 2009-2016 devopsdays

+
+ + + +
diff --git a/themes/devopsdays-responsive/layouts/partials/header.html b/themes/devopsdays-responsive/layouts/partials/header.html index c8aefaf2ad3..b93dcb40653 100644 --- a/themes/devopsdays-responsive/layouts/partials/header.html +++ b/themes/devopsdays-responsive/layouts/partials/header.html @@ -52,17 +52,6 @@

The conference that brings development and operations together.


  • Sponsor

  • Organizing
    • - diff --git a/themes/devopsdays-responsive/static/css/site.css b/themes/devopsdays-responsive/static/css/site.css index 815c0ace275..094f12dd705 100644 --- a/themes/devopsdays-responsive/static/css/site.css +++ b/themes/devopsdays-responsive/static/css/site.css @@ -1 +1 @@ -.upcoming-headline h3{color:#333;font-weight:700;background-color:#D7D7D7;padding:10px;font-size:19px;text-align:center}.upcoming-headline a{color:#333;text-decoration:none}h1{font-family:'Crete Round',serif;font-weight:400}.event-navigation h3{color:#333;font-weight:700;background-color:#D7D7D7;padding:10px;font-size:19px;text-align:center}.event-navigation a{color:#333;text-decoration:none}.company-logo{display:inline-block;float:left;height:100px;width:100px;border:1px solid #18b;padding:2px!important;margin:2px}.dropdown-submenu{position:relative}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px;border-radius:0 6px 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropdown-submenu>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#ccc;margin-top:5px;margin-right:-10px}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.footer,.push{height:30px;background-color:#1581AB;text-align:center;padding-top:5px;color:#fff;margin-top:10px}.navbar-nav li a{text-align:center}/*# sourceMappingURL=site.css.map */ \ No newline at end of file +.upcoming-headline h3{color:#333;font-weight:700;background-color:#D7D7D7;padding:10px;font-size:19px;text-align:center}.upcoming-headline a{color:#333;text-decoration:none}h1{font-family:'Crete Round',serif;font-weight:400}.event-navigation h3{color:#333;font-weight:700;background-color:#D7D7D7;padding:10px;font-size:19px;text-align:center}.event-navigation a{color:#333;text-decoration:none}.company-logo{display:inline-block;float:left;height:100px;width:100px;border:1px solid #18b;padding:2px!important;margin:2px}.dropdown-submenu{position:relative}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px;border-radius:0 6px 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropdown-submenu>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#ccc;margin-top:5px;margin-right:-10px}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.footer,.push{height:50px;background-color:#1581AB;text-align:center;padding-top:10px;color:#fff;margin-top:10px}.navbar-nav li a{text-align:center}.social-links{color:#fff;margin-top:25px;margin-left:25px;margin-right:25px}/*# sourceMappingURL=site.css.map */ \ No newline at end of file diff --git a/themes/devopsdays-responsive/static/css/site.css.map b/themes/devopsdays-responsive/static/css/site.css.map index 7081f3f7610..bbf6218dbc4 100644 --- a/themes/devopsdays-responsive/static/css/site.css.map +++ b/themes/devopsdays-responsive/static/css/site.css.map @@ -1 +1 @@ -{"version":3,"sources":["../site.less"],"names":[],"mappings":"AAAmB,sBAClB,MAAA,KACA,YAAA,IACA,iBAAA,QACA,QAAA,KACA,UAAA,KACA,WAAA,OAGkB,qBAClB,MAAA,KACA,gBAAA,KAGD,GACC,YAAA,cAAa,MACb,YAAA,IAGiB,qBACjB,MAAA,KACA,YAAA,IACA,iBAAA,QACA,QAAA,KACA,UAAA,KACA,WAAA,OAGiB,oBACjB,MAAA,KACA,gBAAA,KAGD,cACE,QAAA,aACD,MAAA,KACA,OAAA,MACA,MAAA,MACA,OAAA,IAAA,MAAA,KACA,QAAA,cACA,OAAA,IAID,kBACI,SAAA,SAGa,iCACb,IAAA,EACA,KAAA,KACA,WAAA,KACA,YAAA,KACA,sBAAA,EAAA,IAAA,IAAA,IACA,mBAAA,EAAA,IAAA,IACA,cAAA,EAAA,IAAA,IAAA,IAGmB,uCACnB,QAAA,MAGe,0BACf,QAAA,MACA,QAAA,IACA,MAAA,MACA,MAAA,EACA,OAAA,EACA,aAAA,YACA,aAAA,MACA,aAAA,IAAA,EAAA,IAAA,IACA,kBAAA,KACA,WAAA,IACA,aAAA,MAGqB,gCACrB,kBAAA,KAGa,4BACb,MAAA,KAGuB,2CACvB,KAAA,MACA,YAAA,KACA,sBAAA,IAAA,EAAA,IAAA,IACA,mBAAA,IAAA,EAAA,IAAA,IACA,cAAA,IAAA,EAAA,IAAA,IAGJ,QAAS,MACL,OAAA,KACF,iBAAA,QACA,WAAA,OACA,YAAA,IACA,MAAA,KACA,WAAA,KAGa,iBACX,WAAA"} \ No newline at end of file +{"version":3,"sources":["../site.less"],"names":[],"mappings":"AAAmB,sBAClB,MAAA,KACA,YAAA,IACA,iBAAA,QACA,QAAA,KACA,UAAA,KACA,WAAA,OAGkB,qBAClB,MAAA,KACA,gBAAA,KAGD,GACC,YAAA,cAAa,MACb,YAAA,IAGiB,qBACjB,MAAA,KACA,YAAA,IACA,iBAAA,QACA,QAAA,KACA,UAAA,KACA,WAAA,OAGiB,oBACjB,MAAA,KACA,gBAAA,KAGD,cACE,QAAA,aACD,MAAA,KACA,OAAA,MACA,MAAA,MACA,OAAA,IAAA,MAAA,KACA,QAAA,cACA,OAAA,IAID,kBACI,SAAA,SAGa,iCACb,IAAA,EACA,KAAA,KACA,WAAA,KACA,YAAA,KACA,sBAAA,EAAA,IAAA,IAAA,IACA,mBAAA,EAAA,IAAA,IACA,cAAA,EAAA,IAAA,IAAA,IAGmB,uCACnB,QAAA,MAGe,0BACf,QAAA,MACA,QAAA,IACA,MAAA,MACA,MAAA,EACA,OAAA,EACA,aAAA,YACA,aAAA,MACA,aAAA,IAAA,EAAA,IAAA,IACA,kBAAA,KACA,WAAA,IACA,aAAA,MAGqB,gCACrB,kBAAA,KAGa,4BACb,MAAA,KAGuB,2CACvB,KAAA,MACA,YAAA,KACA,sBAAA,IAAA,EAAA,IAAA,IACA,mBAAA,IAAA,EAAA,IAAA,IACA,cAAA,IAAA,EAAA,IAAA,IAGJ,QAAS,MACL,OAAA,KACF,iBAAA,QACA,WAAA,OACA,YAAA,KACA,MAAA,KACA,WAAA,KAGa,iBACX,WAAA,OAGJ,cACE,MAAA,KACA,WAAA,KACA,YAAA,KACA,aAAA"} \ No newline at end of file diff --git a/themes/devopsdays-responsive/static/site.less b/themes/devopsdays-responsive/static/site.less index fe4509545d6..aac95f101bd 100644 --- a/themes/devopsdays-responsive/static/site.less +++ b/themes/devopsdays-responsive/static/site.less @@ -91,10 +91,10 @@ h1 { } .footer, .push { - height: 30px; /* .push must be the same height as .footer */ + height: 50px; /* .push must be the same height as .footer */ background-color: #1581AB; text-align: center; - padding-top: 5px; + padding-top: 10px; color: #fff; margin-top: 10px; } @@ -102,3 +102,10 @@ h1 { .navbar-nav li a { text-align: center; } + +.social-links { + color: #fff; + margin-top: 25px; + margin-left: 25px; + margin-right: 25px; +}