Merge branch 'release/0.5'

asterism612 · Oct 9, 2013 · 8522693 · 8522693
2 parents 3916ed8 + 5d5f1e8
commit 8522693
Show file tree

Hide file tree

Showing 18 changed files with 47 additions and 52 deletions.
diff --git a/_/css/style.css b/_/css/style.css
diff --git a/_/images/static/team/asikkema.jpg b/_/images/static/team/asikkema.jpg
diff --git a/_/images/static/team/avasilenko.jpg b/_/images/static/team/avasilenko.jpg
diff --git a/_/images/static/team/devseev.jpg b/_/images/static/team/devseev.jpg
diff --git a/_/images/static/team/ievseeva.jpg b/_/images/static/team/ievseeva.jpg
diff --git a/_/images/static/team/ifuld.jpg b/_/images/static/team/ifuld.jpg
diff --git a/_/images/static/team/ngraf.jpg b/_/images/static/team/ngraf.jpg
diff --git a/_/images/static/team/tperucci.jpg b/_/images/static/team/tperucci.jpg
diff --git a/_/images/static/team/vborodean.jpg b/_/images/static/team/vborodean.jpg
diff --git a/_/sass/application/modules/_bubble.scss b/_/sass/application/modules/_bubble.scss
@@ -24,6 +24,7 @@
 }
 
 .bubble-main {
+  @include backface-visibility(hidden);
   @include size(135px);
   cursor: default;
   position: relative;
@@ -74,4 +75,4 @@
   font-style: italic;
   vertical-align: middle;
   width: 95px;
-}
+}
diff --git a/_/sass/application/modules/_diptych.scss b/_/sass/application/modules/_diptych.scss
@@ -1,5 +1,7 @@
 .diptych {
   margin: 0 0 55px;
+  border-top: 1px solid #eee;
+  border-bottom: 1px solid #eee;
 
   &.diptych-inset {
     background: #f7f7f7;

diff --git a/_/sass/application/modules/home/_blog.scss b/_/sass/application/modules/home/_blog.scss
@@ -1,5 +1,6 @@
 .home-blog {
-  margin: 0 0 50px;
+
+  margin-bottom: 0px;
 
   h2 {
     @include font-height(22px, 26px);
@@ -12,22 +13,14 @@
   }
 }
 
-.home-blog-inner {
-  @extend .clearfix;
-}
-
 .home-blog-section {
-  float: left;
-  width: 46%;
-
-  &:first-child {
-    margin-right: 5%;
-    width: 49%;
-  }
-
   img {
     display: none;
   }
+  .home-blog-section-title {
+    display: block;
+    margin-bottom: 25px;
+  }
 }
 
 .home-blog-more {

diff --git a/_includes/blog/tags.html b/_includes/blog/tags.html
@@ -1,8 +1,7 @@
 <div class="tags">
   <h2>Tags</h2>
   <ul>
-    {% for tag in site.tags %}
-    <li><a href="/blog/tags.html#{{ tag[0] | downcase }}">{{ tag[0] }}</a></li>
-    {% endfor %}
+    {% assign tags_list = site.tags %}
+    {% include blog/tags_list %}
   </ul>
 </div>
diff --git a/_includes/blog/tags_list b/_includes/blog/tags_list
@@ -18,7 +18,7 @@ Usage:
 -->{% endcomment %}
 
 {% for tag in tags_list %}
-    <li><a href="#{{ tag[0] }}">{{ tag[0] }} <span>{{ tag[1].size }}</span></a></li>
+    <li><a href="/blog/tags.html#{{ tag[0] }}">{{ tag[0] }}&nbsp;<span>[{{ tag[1].size }}]</span></a></li>
 {% endfor %}
 
 {% assign tags_list = nil %}
diff --git a/_includes/home/blog.html b/_includes/home/blog.html
@@ -1,7 +1,9 @@
-<div class="home-blog">
-  <h2>Latest blog entries</h2>
-  <div class="home-blog-inner">
-    <div class="home-blog-section">
+<div class="diptych diptych-inset home-blog">
+  <div class="arkush diptych-inner ">
+
+
+    <div class="home-blog-section diptych-section">
+      <h2 class="home-blog-section-title">Latest post</h2>
       <div class="article">
         {% assign post = site.posts[0] %}
         <div class="article-date">{{ post.date | date: '%B&nbsp;%d, %Y' }}</div>
@@ -12,9 +14,10 @@ <h3><a href="{{ post.url }}">{{ post.title }}</a></h3>
         </p>
       </div>
     </div>
-    <div class="home-blog-section">
+    <div class="home-blog-section diptych-section">
+      <h2 class="home-blog-section-title">Older posts</h2>
       <div class="blog text-bound">
-        {% for post in site.posts limit: 3 %}
+        {% for post in site.posts offset: 1 limit: 5 %}
           {% include blog/post.html %}
         {% endfor %}
       </div>

diff --git a/_includes/home/team.html b/_includes/home/team.html
@@ -29,29 +29,29 @@ <h1>Meet the StarterSquad team</h1>
     <div class="bubble">
       <div class="bubble-main">
         <div class="bubble-backside">
-          <div class="bubble-backside-text">UX magician and agile master</div>
+          <div class="bubble-backside-text">Look and feel artist, eye for detail</div>
         </div>
-        <img height="135" src="/_/images/static/team/ngraf.jpg" width="135">
+        <img height="135" src="/_/images/static/team/vborodean.jpg" width="135">
       </div>
-      <div class="bubble-footer">Nikolaus Graf</div>
+      <div class="bubble-footer">Vadim Borodean</div>
     </div>
     <div class="bubble">
       <div class="bubble-main">
         <div class="bubble-backside">
-          <div class="bubble-backside-text">Look and feel artist, eye for detail</div>
+          <div class="bubble-backside-text">Back-end developer, Scala magician (80lvl)</div>
         </div>
-        <img height="135" src="/_/images/static/team/vborodean.jpg" width="135">
+        <img height="135" src="/_/images/static/team/tperucci.jpg" width="135">
       </div>
-      <div class="bubble-footer">Vadim Borodean</div>
+      <div class="bubble-footer">Tiziano Perucci</div>
     </div>
     <div class="bubble">
       <div class="bubble-main">
         <div class="bubble-backside">
-          <div class="bubble-backside-text">Front-end developer, cracker of hard nuts</div>
+          <div class="bubble-backside-text">Natural born artist and UX geek</div>
         </div>
-        <img height="135" src="/_/images/static/team/avasilenko.jpg" width="135">
+        <img height="135" src="/_/images/static/team/ievseeva.jpg" width="135">
       </div>
-      <div class="bubble-footer">Alex Vasilenko</div>
+      <div class="bubble-footer">Iryna Evseeva</div>
     </div>
   </div>
-</div>
+</div>
diff --git a/_includes/team/bubbles.html b/_includes/team/bubbles.html
@@ -16,7 +16,7 @@
     <div class="bubble-main">
       <div class="bubble-backside">
         <div class="social social-inverse">
-          <a class="social-link social-link-github" href="//github.com/kradmiy">GITHUB</a>
+          <a class="social-link social-link-github" href="//github.com/dmitryevseev">GITHUB</a>
           <a class="social-link social-link-twitter" href="//twitter.com/devseev">TWITTER</a>
           <a class="social-link social-link-linkedin" href="//www.linkedin.com/in/dmitryevseev">LINKEDIN</a>
         </div>
@@ -29,37 +29,34 @@
     <div class="bubble-main">
       <div class="bubble-backside">
         <div class="social social-inverse">
-          <a class="social-link social-link-github" href="//github.com/nikgraf">GITHUB</a>
-          <a class="social-link social-link-twitter" href="//twitter.com/ngraf">TWITTER</a>
+          <a class="social-link social-link-github" href="//github.com/borodean">GITHUB</a>
         </div>
       </div>
-      <img height="135" src="/_/images/static/team/ngraf.jpg" width="135">
+      <img height="135" src="/_/images/static/team/vborodean.jpg" width="135">
     </div>
-    <div class="bubble-footer">Nikolaus Graf</div>
+    <div class="bubble-footer">Vadim Borodean</div>
   </div>
   <div class="bubble">
     <div class="bubble-main">
       <div class="bubble-backside">
         <div class="social social-inverse">
-          <a class="social-link social-link-github" href="//github.com/vborodean">GITHUB</a>
-          <a class="social-link social-link-linkedin" href="//linkedin.com/vborodean">LINKEDIN</a>
+          <a class="social-link social-link-github" href="//github.com/TizianoPerrucci">GITHUB</a>
+          <a class="social-link social-link-linkedin" href="//www.linkedin.com/in/tizianoperrucci">LINKEDIN</a>
         </div>
       </div>
-      <img height="135" src="/_/images/static/team/vborodean.jpg" width="135">
+      <img height="135" src="/_/images/static/team/tperucci.jpg" width="135">
     </div>
-    <div class="bubble-footer">Vadim Borodean</div>
+    <div class="bubble-footer">Tiziano Perucci</div>
   </div>
   <div class="bubble">
     <div class="bubble-main">
       <div class="bubble-backside">
         <div class="social social-inverse">
-          <a class="social-link social-link-github" href="http:///github.com/alexnodejs">GITHUB</a>
-          <a class="social-link social-link-linkedin" href="http://ua.linkedin.com/pub/alexander-vasilenko/63/152/5a0">
-              LINKEDIN</a>
+          <a class="social-link social-link-linkedin" href="ua.linkedin.com/pub/iryna-evseeva/33/90a/a98">LINKEDIN</a>
         </div>
       </div>
-      <img height="135" src="/_/images/static/team/avasilenko.jpg" width="135">
+      <img height="135" src="/_/images/static/team/ievseeva.jpg" width="135">
     </div>
-    <div class="bubble-footer">Alex Vasilenko</div>
+    <div class="bubble-footer">Iryna Evseeva</div>
   </div>
-</div>
+</div>
diff --git a/index.html b/index.html
@@ -22,5 +22,5 @@
 {% include home/challenge.html %}
 <div class="arkush">
   {% include home/benefits.html %}
-  {% include home/blog.html %}
-</div>
+</div>
+{% include home/blog.html %}