diff options
-rw-r--r-- | website/static/css/bootstrap.css | 12 | ||||
-rw-r--r-- | website/static/css/freelancer.css | 3 | ||||
-rw-r--r-- | website/static/img/andreas.png | bin | 0 -> 209420 bytes | |||
-rw-r--r-- | website/static/img/calendar.png | bin | 0 -> 5224 bytes | |||
-rw-r--r-- | website/static/img/jarrod.png | bin | 0 -> 235437 bytes | |||
-rw-r--r-- | website/templates/base.html | 12 |
6 files changed, 22 insertions, 5 deletions
diff --git a/website/static/css/bootstrap.css b/website/static/css/bootstrap.css index 572c097..a920210 100644 --- a/website/static/css/bootstrap.css +++ b/website/static/css/bootstrap.css @@ -1601,8 +1601,9 @@ pre code { padding-right: 15px; } .row { - margin-left: -15px; + margin-left: -45px; margin-right: -15px; + width: 107%; } .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { position: relative; @@ -2105,7 +2106,14 @@ pre code { width: 58.33333333%; } .col-lg-6 { - width: 50%; + width: 660px; + margin-left: -30px; + margin-top: -80px; + } + .col-lg-6-right { + width: 540px; + float: right; + margin-top: -100px; } .col-lg-5 { width: 41.66666667%; diff --git a/website/static/css/freelancer.css b/website/static/css/freelancer.css index 8aa7e00..f5d72b2 100644 --- a/website/static/css/freelancer.css +++ b/website/static/css/freelancer.css @@ -88,6 +88,7 @@ header { header .container { padding-top: 100px; padding-bottom: 50px; + height: 620px; } header img { @@ -119,7 +120,7 @@ header .intro-text .skills { } header .intro-text .skills { - font-size: 1.75em; + font-size: 2.5em; } } diff --git a/website/static/img/andreas.png b/website/static/img/andreas.png Binary files differnew file mode 100644 index 0000000..5023082 --- /dev/null +++ b/website/static/img/andreas.png diff --git a/website/static/img/calendar.png b/website/static/img/calendar.png Binary files differnew file mode 100644 index 0000000..b132c97 --- /dev/null +++ b/website/static/img/calendar.png diff --git a/website/static/img/jarrod.png b/website/static/img/jarrod.png Binary files differnew file mode 100644 index 0000000..46e1703 --- /dev/null +++ b/website/static/img/jarrod.png diff --git a/website/templates/base.html b/website/templates/base.html index f2a3ab2..40184e1 100644 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -75,11 +75,19 @@ <header> <div class="container"> <div class="row"> - <div class="col-lg-12"> + <div class="col-lg-6"> <img class="img-responsive" src="{% static 'img/profile.png' %}" alt=""> <div class="intro-text"> <span class="name">SciPy India 2015</span> - <span class="skills">DEC. 18, 19, 20</span> + <hr> + <span class="skills">DECEMBER 18, 19 & 20</span> + </div> + </div> + <div class="col-lg-6-right"> + <h2>Python for Scientific Computing</h2> + <hr> + <p align="center">SciPy India is a conference providing opportunities to spread the use of the Python programming language in the Scientific Computing community in India. + </p> </div> </div> </div> |