Skip to content

Commit

Permalink
Middleman and font-awesome were updated. Some contents were changed.
Browse files Browse the repository at this point in the history
  • Loading branch information
tayfunoziserikan committed Feb 17, 2015
1 parent de975ca commit f9f230d
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 100 deletions.
16 changes: 8 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@
# the following line to use "https"
source 'https://rubygems.org'

gem 'middleman', '~> 3.3.6'
gem 'middleman', '~> 3.3.8'

# Live-reloading plugin
gem 'middleman-livereload', '~> 3.3.4'
gem 'middleman-livereload', '~> 3.4.2'

# Middleman-sprockets
gem 'middleman-sprockets', '~> 3.3.10'
gem 'middleman-sprockets', '~> 3.4.1'

# Deploy plugin
gem 'middleman-deploy', '~> 0.3.0'
gem 'middleman-deploy', '~> 1.0.0'

# For faster file watcher updates on Windows:
gem 'wdm', '~> 0.1.0', :platforms => [:mswin, :mingw]

# Twitter Bootstrap
gem 'bootstrap-sass', '~> 3.2.0.2'
gem 'bootstrap-sass', '~> 3.3.3'

gem 'middleman-blog', '~> 3.5.3'
gem 'middleman-syntax', '~> 1.2.1'
gem 'redcarpet', '~> 3.1.2'
gem 'nokogiri', '~> 1.6.3.1'
gem 'middleman-syntax', '~> 2.0.0'
gem 'redcarpet', '~> 3.2.2'
gem 'nokogiri', '~> 1.6.6.2'

# For feed.xml.builder
gem 'builder', '~> 3.2.2'
115 changes: 59 additions & 56 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,31 +1,35 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (4.1.6)
activesupport (4.1.9)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
addressable (2.3.6)
bootstrap-sass (3.2.0.2)
sass (~> 3.2)
addressable (2.3.7)
autoprefixer-rails (5.1.5)
execjs
json
bootstrap-sass (3.3.3)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.2.19)
builder (3.2.2)
celluloid (0.16.0)
timers (~> 4.0.0)
chunky_png (1.3.1)
chunky_png (1.3.4)
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.8.0)
compass (1.0.1)
coffee-script-source (1.9.0)
compass (1.0.3)
chunky_png (~> 1.2)
compass-core (~> 1.0.1)
compass-core (~> 1.0.2)
compass-import-once (~> 1.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
sass (>= 3.3.13, < 3.5)
compass-core (1.0.1)
compass-core (1.0.3)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
Expand All @@ -34,101 +38,100 @@ GEM
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.2.1)
eventmachine (1.0.7)
execjs (2.3.0)
ffi (1.9.6)
haml (4.0.5)
haml (4.0.6)
tilt
hike (1.2.3)
hitimes (1.2.2)
hooks (0.4.0)
uber (~> 0.0.4)
http_parser.rb (0.6.0)
i18n (0.6.11)
json (1.8.1)
kramdown (1.4.2)
listen (2.7.11)
i18n (0.7.0)
json (1.8.2)
kramdown (1.5.0)
listen (2.8.5)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
middleman (3.3.6)
middleman (3.3.8)
coffee-script (~> 2.2)
compass (>= 1.0.0, < 2.0.0)
compass-import-once (= 1.0.5)
execjs (~> 2.0)
haml (>= 4.0.5)
kramdown (~> 1.2)
middleman-core (= 3.3.6)
middleman-core (= 3.3.8)
middleman-sprockets (>= 3.1.2)
sass (>= 3.4.0, < 4.0)
uglifier (~> 2.5)
middleman-blog (3.5.3)
addressable (~> 2.3.5)
middleman-core (~> 3.2)
tzinfo (>= 0.3.0)
middleman-core (3.3.6)
middleman-core (3.3.8)
activesupport (~> 4.1.0)
bundler (~> 1.1)
erubis
hooks (~> 0.3)
i18n (~> 0.6.9)
i18n (~> 0.7.0)
listen (>= 2.7.9, < 3.0)
padrino-helpers (~> 0.12.3)
rack (>= 1.4.5, < 2.0)
rack-test (~> 0.6.2)
thor (>= 0.15.2, < 2.0)
tilt (~> 1.4.1, < 2.0)
middleman-deploy (0.3.0)
middleman-deploy (1.0.0)
middleman-core (>= 3.2)
net-sftp
ptools
middleman-livereload (3.3.4)
middleman-livereload (3.4.2)
em-websocket (~> 0.5.1)
middleman-core (~> 3.2)
middleman-core (>= 3.3)
rack-livereload (~> 0.3.15)
middleman-sprockets (3.3.10)
middleman-core (~> 3.3)
middleman-sprockets (3.4.1)
middleman-core (>= 3.3)
sprockets (~> 2.12.1)
sprockets-helpers (~> 1.1.0)
sprockets-sass (~> 1.2.0)
middleman-syntax (1.2.1)
middleman-core (~> 3.0)
rouge (~> 0.3.0)
mini_portile (0.6.0)
minitest (5.4.2)
sprockets-sass (~> 1.3.0)
middleman-syntax (2.0.0)
middleman-core (~> 3.2)
rouge (~> 1.0)
mini_portile (0.6.2)
minitest (5.5.1)
multi_json (1.10.1)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.9.1)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
padrino-helpers (0.12.3)
net-ssh (2.9.2)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
padrino-helpers (0.12.4)
i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.12.3)
padrino-support (= 0.12.4)
tilt (~> 1.4.1)
padrino-support (0.12.3)
padrino-support (0.12.4)
activesupport (>= 3.1)
ptools (1.2.6)
rack (1.5.2)
ptools (1.3.2)
rack (1.6.0)
rack-livereload (0.3.15)
rack
rack-test (0.6.2)
rack-test (0.6.3)
rack (>= 1.0)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
redcarpet (3.1.2)
rouge (0.3.10)
thor
sass (3.4.5)
sprockets (2.12.2)
redcarpet (3.2.2)
rouge (1.8.0)
sass (3.4.12)
sprockets (2.12.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-helpers (1.1.0)
sprockets (~> 2.0)
sprockets-sass (1.2.0)
sprockets-sass (1.3.1)
sprockets (~> 2.0)
tilt (~> 1.1)
thor (0.19.1)
Expand All @@ -138,23 +141,23 @@ GEM
hitimes
tzinfo (1.2.2)
thread_safe (~> 0.1)
uber (0.0.9)
uglifier (2.5.3)
uber (0.0.13)
uglifier (2.7.0)
execjs (>= 0.3.0)
json (>= 1.8.0)

PLATFORMS
ruby

DEPENDENCIES
bootstrap-sass (~> 3.2.0.2)
bootstrap-sass (~> 3.3.3)
builder (~> 3.2.2)
middleman (~> 3.3.6)
middleman (~> 3.3.8)
middleman-blog (~> 3.5.3)
middleman-deploy (~> 0.3.0)
middleman-livereload (~> 3.3.4)
middleman-sprockets (~> 3.3.10)
middleman-syntax (~> 1.2.1)
nokogiri (~> 1.6.3.1)
redcarpet (~> 3.1.2)
middleman-deploy (~> 1.0.0)
middleman-livereload (~> 3.4.2)
middleman-sprockets (~> 3.4.1)
middleman-syntax (~> 2.0.0)
nokogiri (~> 1.6.6.2)
redcarpet (~> 3.2.2)
wdm (~> 0.1.0)
50 changes: 15 additions & 35 deletions source/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@
.member-info.popover-content
%h4.title Onur Ozgur OZKAN | Co-founder
%p.content
I graduated in economics. I am the creator of Kebab Project, co-founder & CEO at Lab2023 and Bulutfon, public speaker, open source developer.
I graduated in economics. I am the creator of Kebab Project, co-founder & CEO at Lab2023 and Bulutfon,
public speaker, open source developer.

%li{ data: {toggle: :popover, placement: :top} }
= link_to 'http://www.twitter.com/toziserikan', target: '_blank' do
Expand All @@ -126,43 +127,22 @@
The Co-Founder of Lab2023 Information Technologies Inc.
and Bulutfon Telecommunication Inc.

%li{ data: {toggle: :popover, placement: :top} }
= 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
%h4.title Murat Kemal BAYGUN | COO
%p.content
He loves software development and leading software development. He supports continuous improvement and lean software development. He has a daughter and a son.

%li{ data: {toggle: :popover, placement: :top} }
= 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
%h4.title Muhammet DILEK | Web &amp; Mobile Developer
%h4.title Muhammet DILEK | COO &amp; Web - Mobile Developer
%p.content
He likes to develop web based applications with Ruby on Rails. He extremely likes Apple products.
He is blogging in his spare time.

%li{ data: {toggle: :popover, placement: :top} }
= 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
%h4.title Hamit Turku KAYA | Web &amp; Mobile Developer
%p.content
He likes to develop web &amp; mobile applications also he is interesting with game development.
He works with Ruby on Rails, PHP and Javascript Frameworks on web based applications and Java(Android), Objective - C (IOS)
on mobile applications.


%li{ data: {toggle: :popover, placement: :top} }
= 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
%h4.title Serdar YAGCI | Web Developer
%h4.title Serdar YAGCI | Web - Mobile Developer
%p.content
He knows PHP, Objective - C and Javascript Frameworks. He is photographer and traveler.

Expand Down Expand Up @@ -191,7 +171,9 @@
.member-info.popover-content
%h4.title Ahmet Sezgin DURAN | Web Developer
%p.content
Web Developer. Interested in high-level programming languages such as Ruby, Python and Java. Supports free software and uses GNU/Linux. Likes back-end coding and developing-playing indie games. Fan of Nintendo and Valve games and a true Otaku.
Web Developer. Interested in high-level programming languages such as Ruby, Python and Java. Supports
free software and uses GNU/Linux. Likes back-end coding and developing-playing indie games.
Fan of Nintendo and Valve games and a true Otaku.

%li{ data: {toggle: :popover, placement: :top} }
= link_to 'http://www.twitter.com/klapancg', target: '_blank' do
Expand All @@ -200,7 +182,9 @@
.member-info.popover-content
%h4.title Clara Isabel PANTOJA | Graphic Designer
%p.content
Creative and proactive person of graphic communication design and emphasis in multimedia design. Interested in interactive design and information technology projects. Has great motivation for photography, visual effects and web design. Likes music, museums and the integration of art and technology in her work.
Creative and proactive person of graphic communication design and emphasis in multimedia design.
Interested in interactive design and information technology projects. Has great motivation for photography,
visual effects and web design. Likes music, museums and the integration of art and technology in her work.

%li{ data: {toggle: :popover, placement: :top} }
= link_to 'https://twitter.com/kamilagareeva1', target: '_blank' do
Expand All @@ -223,14 +207,7 @@
He works hard on developing his skills on every aspects of web development.
But his main area of interest is backend systems.
He is a Hot Wheels collectionner and one of the biggest Top Gear fans.
%li{ data: {toggle: :popover, placement: :top} }
= link_to 'http://www.twitter.com/isoakbudak', target: '_blank' do
.image-filter
= image_tag 'team/ismail-akbudak.jpg', class: 'img-circle'
.member-info.popover-content
%h4.title Ismail AKBUDAK | Web Developer
%p.content
Software Developer, PHP, CodeIgniter, Ruby On Rails, JavaScript, JQuery, Founder Of Hepgezelim. I love to use Ubuntu, to follow new technologies and electronics.

%p.extra
= link_to 'mailto:[email protected]', class: 'btn btn-primary big-buttons' do
%strong Want to join our team?
Expand Down Expand Up @@ -269,7 +246,10 @@
%i.fa.fa-flickr.fa-3x
%li{'data-toggle' => 'tooltip', title: 'YouTube'}
= link_to 'http://www.youtube.com/user/thelab2023', target: '_blank' do
%i.fa.fa-youtube.fa-3x
%i.fa.fa-youtube-square.fa-3x
%li{'data-toggle' => 'tooltip', title: 'Vimeo'}
= link_to 'http://www.vimeo.com/lab2023', target: '_blank' do
%i.fa.fa-vimeo-square.fa-3x
%li{'data-toggle' => 'tooltip', title: 'RSS'}
= link_to 'http://lab2023.com/feed.xml', target: '_blank' do
%i.fa.fa-rss.fa-3x
Expand Down
2 changes: 1 addition & 1 deletion source/layouts/partials/_head.haml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
%meta{content: 'Designers and developers for hire', name: 'description'}/
%meta{content: 'design, ruby, ruby on rails, ios, android, sencha, istanbul, ankara, denizli, turkey', name: 'keywords'}/

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

= yield_content :head

0 comments on commit f9f230d

Please sign in to comment.