Skip to content

Commit

Permalink
Blog layout and contents was improved
Browse files Browse the repository at this point in the history
  • Loading branch information
tayfunoziserikan committed Mar 26, 2014
1 parent c368e2f commit 74acc45
Show file tree
Hide file tree
Showing 51 changed files with 272 additions and 302 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ gem 'bootstrap-sass', '~> 3.1.1.0'
gem 'middleman-blog', '~> 3.5.1'
gem 'middleman-syntax'
gem 'redcarpet'
gem 'nokogiri', '~> 1.6.1'

# For feed.xml.builder
gem 'builder', '~> 3.0'
4 changes: 4 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,13 @@ GEM
middleman-syntax (2.0.0)
middleman-core (~> 3.2)
rouge (~> 1.0)
mini_portile (0.5.2)
multi_json (1.9.2)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.8.0)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
ptools (1.2.4)
rack (1.5.2)
rack-livereload (0.3.15)
Expand Down Expand Up @@ -126,5 +129,6 @@ DEPENDENCIES
middleman-deploy (~> 0.2.3)
middleman-livereload (~> 3.1.0)
middleman-syntax
nokogiri (~> 1.6.1)
redcarpet
wdm (~> 0.1.0)
1 change: 1 addition & 0 deletions config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
blog.permalink = '{title}'
blog.taglink = 'tag/{tag}.html'
blog.tag_template = 'tag.html'
blog.summary_separator = /READMORE/
end

activate :syntax
Expand Down
14 changes: 7 additions & 7 deletions data/authors.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
authors:
onurozgurozkan: Onur Özgür ÖZKAN
toziserikan: Tayfun Öziş Erikan
baygunm: Murat Kemal Baygün
leylakapi: Leyla Kapi
marjinal1st: Ahmet Sezgin Duran
safiyesepetci: Safiye Sepetci
hamitturkukaya: Hamit Türkü Kaya
dilekmuhammet: Muhammet Dilek
toziserikan: Tayfun Öziş ERİKAN
baygunm: Murat Kemal BAYGÜN
leylakapi: Leyla KAPİ
marjinal1st: Ahmet Sezgin DURAN
safiyesepetci: Safiye SEPETCİ
hamitturkukaya: Hamit Türkü KAYA
dilekmuhammet: Muhammet DİLEK
yazemo: Ahmet Urel
Binary file not shown.
52 changes: 52 additions & 0 deletions source/assets/stylesheets/application.css.sass
Original file line number Diff line number Diff line change
Expand Up @@ -200,3 +200,55 @@ footer
.popover.top
margin-top: -15px


// Blog page overrides
body#blog
color: $base-font-color
font-size: 1.4em
line-height: 1.5em
text-rendering: optimizeLegibility
font-weight: 200

header.header
border-top: 5px solid $base-color
padding-top: 100px
margin-bottom: 100px
img.logo
width: 110px
height: 110px
h1
margin-bottom: 0
p
padding: 0
margin: 0
a
font-size: .8em
color: lighten($base-font-color, .2)

article.posts, article.post
margin-bottom: 10px
h1
color: darken($base-font-color, 30)
font-size: 1.5em
margin-top: 0
font-weight: 300

article.post
h1
margin-bottom: 20px
font-weight: 600

.article-meta
text-align: right

span.tag
display: block
a
color: $base-font-color
&:hover
text-decoration: underline
color: $base-color

h4, h5
font-weight: 400
margin-top: 4px
13 changes: 8 additions & 5 deletions source/blog.html.haml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
%section#posts
- page_articles.each_with_index do |article, i|
%article
%span= article.date.strftime('%B %e, %Y')
= link_to article.title, article.url
%section
- page_articles.each_with_index do |article, i|
%article.posts.row
.col-lg-2.col-lg-offset-1
%span.pull-right= article.date.strftime('%B %e, %Y')
.col-lg-8
%h1= link_to article.title, article.url
/= article.summary
42 changes: 21 additions & 21 deletions source/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
After shipping software, we measure and maintain
use of software. See some examples below.
%p
= link_to 'https://www.github.com/lab2023/playbook', target: :blank do
= link_to 'https://www.github.com/lab2023/playbook', target: '_blank' do
Read more in our playbook
%i.fa.fa-arrow-circle-right

Expand All @@ -25,10 +25,10 @@
Our services are: voip calls, ip pbx, ivr, voice mail, fax, voice recording and development tools
for developers (API, SDK). All software infrastructure of Bulutfon is developed by Lab2023.
%p
= link_to 'https://www.bulutfon.com/', target: :blank do
= link_to 'https://www.bulutfon.com/', target: '_blank' do
Visit project
%i.fa.fa-arrow-circle-right
= link_to 'https://www.bulutfon.com/', target: :blank do
= link_to 'https://www.bulutfon.com/', target: '_blank' do
= image_tag 'works/bulutfon.png', class: 'img-responsive'

%hr.divider/
Expand All @@ -41,10 +41,10 @@
directs you to the appropriate specialist. We develop web, iPhone, iPad apps for end
users and admin panel for admins.
%p
= link_to 'http://www.diagnoscope.com/', target: :blank do
= link_to 'http://www.diagnoscope.com/', target: '_blank' do
Visit project
%i.fa.fa-arrow-circle-right
= link_to 'http://www.diagnoscope.com/', target: :blank do
= link_to 'http://www.diagnoscope.com/', target: '_blank' do
= image_tag 'works/diagnoscope.png', class: 'img-responsive'

%p.extra
Expand All @@ -63,19 +63,19 @@
%br/
We are active contributors to open source software.
%p
= link_to 'https://github.com/lab2023', target: :blank do
= link_to 'https://github.com/lab2023', target: '_blank' do
Use our open source software
%i.fa.fa-arrow-circle-right
|
= link_to 'https://github.com/kebab-project', target: :blank do
= link_to 'https://github.com/kebab-project', target: '_blank' do
Visit our open software toolbox
%i.fa.fa-arrow-circle-right

.row
.col-lg-10.col-lg-offset-1
%ul.team-members
%li{ data: {toggle: :popover, placement: :top} }
= link_to 'http://www.twitter.com/onurozgurozkan', target: :blank do
= link_to 'http://www.twitter.com/onurozgurozkan', target: '_blank' do
.image-filter
= image_tag 'team/onur-ozgur-ozkan.jpg', class: 'img-circle'
.member-info.popover-content
Expand All @@ -84,7 +84,7 @@
He is co-founder of Lab2023 information technologies inc. He knows PHP, Ruby, JavaScript, C and LUA.

%li{ data: {toggle: :popover, placement: :top} }
= link_to 'http://www.twitter.com/toziserikan', target: :blank do
= link_to 'http://www.twitter.com/toziserikan', target: '_blank' do
.image-filter
= image_tag 'team/tayfun-ozis-erikan.jpg', class: 'img-circle'
.member-info.popover-content
Expand All @@ -95,7 +95,7 @@
Also he is interested in swimming, playing guitar, taking photography and extreme sports.

%li{ data: {toggle: :popover, placement: :top} }
= link_to 'http://www.twitter.com/baygunm', target: :blank do
= link_to 'http://www.twitter.com/baygunm', target: '_blank' do
.image-filter
= image_tag 'team/murat-kemal-baygun.jpg', class: 'img-circle'
.member-info.popover-content
Expand All @@ -105,7 +105,7 @@
He always being in favor of development lean software. He has a daughter and son.

%li{ data: {toggle: :popover, placement: :top} }
= link_to 'http://www.twitter.com/dilekmuhammet', target: :blank do
= link_to 'http://www.twitter.com/dilekmuhammet', target: '_blank' do
.image-filter
= image_tag 'team/muhammet-dilek.jpg', class: 'img-circle'
.member-info.popover-content
Expand All @@ -115,7 +115,7 @@
In spare time, he write blogging.

%li{ data: {toggle: :popover, placement: :top} }
= link_to 'http://www.twitter.com/hamitturkukaya', target: :blank do
= link_to 'http://www.twitter.com/hamitturkukaya', target: '_blank' do
.image-filter
= image_tag 'team/hamit-turku-kaya.jpg', class: 'img-circle'
.member-info.popover-content
Expand All @@ -124,7 +124,7 @@
He knows Ruby on Rails, PHP, Objective - C and Javascript Frameworks.

%li{ data: {toggle: :popover, placement: :top} }
= link_to 'http://www.twitter.com/Sevliya', target: :blank do
= link_to 'http://www.twitter.com/Sevliya', target: '_blank' do
.image-filter
= image_tag 'team/serdar-yagci.jpg', class: 'img-circle'
.member-info.popover-content
Expand All @@ -133,7 +133,7 @@
He knows PHP, Objective - C and Javascript Frameworks. He is photographer and traveler.

%li{ data: {toggle: :popover, placement: :top} }
= link_to 'http://www.twitter.com/safiyesepetci', target: :blank do
= link_to 'http://www.twitter.com/safiyesepetci', target: '_blank' do
.image-filter
= image_tag 'team/safiye-sepetci.jpg', class: 'img-circle'
.member-info.popover-content
Expand All @@ -142,7 +142,7 @@
She likes to use front-end technologies like HTML5, CSS3, Haml, Sass, Javascript.

%li{ data: {toggle: :popover, placement: :top} }
= link_to 'http://www.twitter.com/leylakapi', target: :blank do
= link_to 'http://www.twitter.com/leylakapi', target: '_blank' do
.image-filter
= image_tag 'team/leyla-kapi.jpg', class: 'img-circle'
.member-info.popover-content
Expand All @@ -151,7 +151,7 @@
She likes to use front-end technologies like HTML5, CSS3, Haml, Sass, Javascript.

%li{ data: {toggle: :popover, placement: :top} }
= link_to 'http://www.twitter.com/marjinal1st', target: :blank do
= link_to 'http://www.twitter.com/marjinal1st', target: '_blank' do
.image-filter
= image_tag 'team/ahmet-sezgin-duran.jpg', class: 'img-circle'
.member-info.popover-content
Expand All @@ -162,7 +162,7 @@
He is a complete Otaku.

%li{ data: {toggle: :popover, placement: :top} }
= link_to 'http://www.twitter.com/klapancg', target: :blank do
= link_to 'http://www.twitter.com/klapancg', target: '_blank' do
.image-filter
= image_tag 'team/clara-isabel-pantoja.jpg', class: 'img-circle'
.member-info.popover-content
Expand All @@ -189,16 +189,16 @@

%ul.social
%li{'data-toggle' => 'tooltip', title: 'GitHub'}
= link_to 'https://github.com/lab2023', target: :blank do
= link_to 'https://github.com/lab2023', target: '_blank' do
%i.fa.fa-github-square.fa-3x
%li{'data-toggle' => 'tooltip', title: 'Twitter'}
= link_to 'https://twitter.com/lab2023', target: :blank do
= link_to 'https://twitter.com/lab2023', target: '_blank' do
%i.fa.fa-twitter-square.fa-3x
%li{'data-toggle' => 'tooltip', title: 'Facebook'}
= link_to 'https://www.facebook.com/lab2023', target: :blank do
= link_to 'https://www.facebook.com/lab2023', target: '_blank' do
%i.fa.fa-facebook-square.fa-3x
%li{'data-toggle' => 'tooltip', title: 'YouTube'}
= link_to 'http://www.youtube.com/user/thelab2023', target: :blank do
= link_to 'http://www.youtube.com/user/thelab2023', target: '_blank' do
%i.fa.fa-youtube-square.fa-3x
%p.extra
= link_to 'mailto:[email protected]', class: 'btn btn-primary big-buttons' do
Expand Down
57 changes: 5 additions & 52 deletions source/layouts/layout.haml
Original file line number Diff line number Diff line change
@@ -1,63 +1,16 @@
!!!5
%html{lang: 'en', class: 'no-js'}
%head
%meta{charset: 'utf-8'}/
/ Always force latest IE rendering engine or request Chrome Frame
%meta{content: 'IE=edge,chrome=1', 'http-equiv' => 'X-UA-Compatible'}/
%title= yield_content :title || 'lab2023'

= stylesheet_link_tag 'application', '//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css'
= favicon_tag 'favicon.png'
= yield_content :head
= partial 'layouts/partials/head'

%body#home{'data-spy' => 'scroll', 'data-target' => '#navigation'}

%header#header.header
.wrapper
.heroes
= image_tag 'logo.png', class: 'logo'
%h1
SAY HELLO TO
%strong LAB2023
%hr
%h2
People who loved
%strong
%span.a designing
%span.b & developing
product
%p.scroll-down
%a{href: '#our-works'}
%span SCROLL DOWN
%i.fa.fa-angle-down.fa-5x
%body#home{'data-spy' => 'scroll', 'data-target' => '#navigation'}

%nav#navigation.navbar.navbar-default.navbar-fixed-top{role: 'navigation'}
.container
.navbar-header
%button.navbar-toggle{'data-target' => '.navbar-collapse', 'data-toggle' => 'collapse', type: 'button'}
%span.sr-only Toggle navigation
%span.icon-bar
%span.icon-bar
%span.icon-bar
%a.navbar-brand{href: '#home'}
.collapse.navbar-collapse
%ul.nav.navbar-nav.navbar-right
%li=link_to 'Our Works', '#our-works'
%li=link_to 'Our Team', '#our-team'
-#%li=link_to 'Blog', '/blog.html'
%li=link_to 'Contact Us', '#contact-us'
%li=link_to 'Hire Us', 'mailto:[email protected]', class: 'btn'
= partial 'layouts/partials/header'

= yield

%footer.footer
%h4 © 2014 LAB2023, CORP.
%p The all designs, materials and contents trademarks of lab2023, corp.

= partial 'layouts/partials/trackers'
= partial 'layouts/partials/footer'

/ Javascripts
= yield_content :foot
= javascript_include_tag '//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js',
'//cdnjs.cloudflare.com/ajax/libs/modernizr/2.7.1/modernizr.min.js',
'application'
= partial 'layouts/partials/foot'
13 changes: 13 additions & 0 deletions source/layouts/partials/_blog_header.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
%header.header
.container
.row
.col-lg-2.col-lg-offset-1
= link_to '/blog' do
= image_tag 'logo.png', class: 'logo pull-right'
.col-lg-8
%h1
=link_to 'lab2023\'s blog posts', '/blog'
%p
= link_to '/' do
%i.fa.fa-arrow-circle-left
lab2023.com
8 changes: 8 additions & 0 deletions source/layouts/partials/_foot.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/ Javascripts
= yield_content :foot

= javascript_include_tag '//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js',
'//cdnjs.cloudflare.com/ajax/libs/modernizr/2.7.1/modernizr.min.js',
'application'

= partial 'layouts/partials/trackers'
3 changes: 3 additions & 0 deletions source/layouts/partials/_footer.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
%footer.footer
%h4 © 2014 LAB2023, CORP.
%p The all designs, materials and contents trademarks of lab2023, corp.
8 changes: 8 additions & 0 deletions source/layouts/partials/_head.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
%meta{charset: 'utf-8'}/
%meta{content: 'IE=edge,chrome=1', 'http-equiv' => 'X-UA-Compatible'}/
%title= "lab2023#{yield_content :title}"

= stylesheet_link_tag 'application', '//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css'
= favicon_tag 'favicon.png'

= yield_content :head
Loading

0 comments on commit 74acc45

Please sign in to comment.