#27 More changes to the new flocktofedora website
Merged 7 years ago by ryanlerch. Opened 7 years ago by ryanlerch.

@@ -10,19 +10,33 @@ 

  

    <body class="home" data-spy="scroll" data-target="#flocknav">

      <xi:include href="../templates/head.html" />

-     <div id="welcome" class="jumbotron flock-groupimg text-center">

+     <div id="welcome" class="non-jumbo flock-groupimg text-center">

    	  <div class="container">

          <div class="row">

-           <div class="col-xs-10 col-xs-offset-1 col-sm-6 col-sm-offset-3 col-md-4 col-md-offset-4">

-           <img src="${path}/static/images/index/coverimage.png" width="100%"/>

-           </div>

            <div class="col-xs-12 col-md-8 col-md-offset-2">

-             <h2>Welcome to Flock 2016</h2>

+             <div class="alert alert-info" role="alert">

+               <strong>Flock Travel Advisory:</strong> due to World Youth Day festivities in Krakow, Poland will

+               <a href="http://www.pope2016.com/en/wyd-2016/security/news,458023,poland-to-restore-border-controls-july-2-31.html">impose border controls at all of its national borders from

+               July 4 to August 2.</a>

+             </div>

              <p>

                Welcome to Flock 2016 in Krakow! Now in its fourth year, Flock is a fun and productive

                event which brings the Fedora community together to discuss new ideas — and to put

                those ideas into practice in hackfests and workshops.

              </p>

+             <br/>

+           </div>

+           <div class="col-xs-10 col-xs-offset-1 col-sm-6 col-sm-offset-3 col-md-4 col-md-offset-4">

+           <img src="${path}/static/images/index/coverimage.png" width="100%"/>

+           </div>

+           <div class="col-xs-12 col-md-8 col-md-offset-2">

+             <br/>

+             <p>

+               <small><strong>Attendance at Flock is free and open to all.</strong> Pre-registration is closed but

+               anyone is still welcome to attend. However, unregistered attendees may miss out on swag

+               or the evening events as these are booked based on pre-registration. If you did pre-register, can view

+               your information on the <a href="https://register.flocktofedora.org/">registration page.</a></small>

+             </p>

            </div>

          </div>

    	  </div>
@@ -95,7 +109,6 @@ 

      </div>

      </div>

  

- 

      <div id="venue" class="non-jumbo text-center">

        <div class="container">

        <div class="row">

@@ -111,6 +111,12 @@ 

  		<div class="col-xs-12 col-sm-2">

  		  <a href="https://www.unixstickers.com"><img src="../../../static/images/unixstickers.png"/></a>

  		</div>

+ 		<div class="col-xs-12 col-sm-2">

+ 		  <img src="../../../static/images/sticker-mule.png"/>

+ 		</div>

+ 		<div class="col-xs-12 col-sm-2">

+ 		  <img src="../../../static/images/unixstickers.png"/>

+ 		</div>

  	      </div>

  	    </div>

  	  </div>

@@ -18,7 +18,7 @@ 

              <span class="icon-bar"></span>

            </button>

            <a id="index_menu" class="navbar-brand" href="/">

-             <img src="${path}/static/images/flocklogo.png" height="40px"/>

+             <img src="${path}/static/images/flocklogo.png" height="30px"/>

            </a>

          </div>

          <div class="collapse navbar-collapse">

@@ -1,6 +1,6 @@ 

  body{

    position:relative;

-   margin-top:70px;

+   margin-top:55px;

  }

  

  .flock-groupimg {
@@ -15,13 +15,21 @@ 

  }

  

  .flock-navbar ul.nav {

-     margin-top:0.4em;

+     margin-top:0.6em;

  }

  

  .navbar {

    margin-bottom: 0 !important;

  }

  

+ .nav > li > a {

+   padding: 5px 10px;

+ }

+ 

+ .navbar-brand{

+   padding: 10px 15px;

+ }

+ 

  .flock-info-item {

    text-align: center;

  }
@@ -58,7 +66,7 @@ 

  }

  

  .non-jumbo p{

-   font-size: 1.3em;

+   font-size: 1.1em;

  }

  

  
@@ -86,3 +94,8 @@ 

    border-top: 2px solid white;

  

  }

+ 

+ #welcome

+ {

+   padding-top: 1em;

+ }

Added back the travel advisory in a note item at the top of the page.

Added the bit about flock being free

reduced the size of the topbar a little.

1 new commit added

  • merge conflicting commits and we are ready to go - thx ryanlerch
7 years ago

Hi Ryan, not sure why the branch diverged heavily, but it should be all set now and ready to go. We will probably get conflicts again when merging into master, but anyway, if you are happy please let us know and we will get it live when you say GO! (or you can go for it)

http://imgur.com/a/3lv4a

Pull-Request has been merged by ryanlerch

7 years ago