Skip to content
Permalink
Browse files

Merge branch 'redesign' into build

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	_assets/stylesheets/_syntax.scss
	index.html
  • Loading branch information...
jodosha committed Feb 18, 2015
2 parents 3ca7774 + 521b2b0 commit a87fb532ec50e30fe94e9620b0d133ffadad8e02
Showing with 24,137 additions and 168 deletions.
  1. +17 −2 .gitignore
  2. +7 −7 Gemfile
  3. +129 −94 Gemfile.lock
  4. +22 −0 README.md
  5. +0 −60 _assets/stylesheets/_syntax.scss
  6. +136 −0 config.rb
  7. +0 −5 index.html
  8. 0 { → source}/CNAME
  9. +53 −0 source/_footer.erb
  10. +24 −0 source/_header.erb
  11. +29 −0 source/atom.xml.erb
  12. +23 −0 source/blog.html.erb
  13. +97 −0 source/blog/2015-01-01-a-new-roadmap-for-lotus.html.markdown
  14. BIN source/blog/2015-01-01-a-new-roadmap-for-lotus/cover.jpg
  15. +25 −0 source/community.html.erb
  16. BIN source/fonts/bootstrap/glyphicons-halflings-regular.eot
  17. +288 −0 source/fonts/bootstrap/glyphicons-halflings-regular.svg
  18. BIN source/fonts/bootstrap/glyphicons-halflings-regular.ttf
  19. BIN source/fonts/bootstrap/glyphicons-halflings-regular.woff
  20. BIN source/fonts/bootstrap/glyphicons-halflings-regular.woff2
  21. BIN source/fonts/icomoon.eot
  22. +12 −0 source/fonts/icomoon.svg
  23. BIN source/fonts/icomoon.ttf
  24. BIN source/fonts/icomoon.woff
  25. +24 −0 source/guides/getting-started.md
  26. +9 −0 source/guides/index.html.erb
  27. +45 −0 source/guides/introduction.md
  28. BIN source/images/code-example.png
  29. BIN source/images/cover.jpg
  30. BIN source/images/dnssimple.png
  31. +11 −0 source/images/down-circle.svg
  32. BIN source/images/envato.png
  33. BIN source/images/features.png
  34. BIN source/images/lotus-dark.png
  35. BIN source/images/lotus-dark@2x.png
  36. BIN source/images/lotus-light-large.png
  37. BIN source/images/lotus-light-large@2x.png
  38. BIN source/images/lotus-light.png
  39. BIN source/images/lotus-light@2x.png
  40. +31 −0 source/images/lotus-logo.svg
  41. BIN source/images/sample-photo.jpg
  42. BIN source/images/tsunami_dark@2x.png
  43. BIN source/images/tsunami_light.png
  44. +3 −0 source/index.html.erb
  45. +3 −0 source/javascripts/application.js
  46. +12 −0 source/javascripts/bootstrap-sprockets.js
  47. +2,306 −0 source/javascripts/bootstrap.js
  48. +7 −0 source/javascripts/bootstrap.min.js
  49. +162 −0 source/javascripts/bootstrap/affix.js
  50. +94 −0 source/javascripts/bootstrap/alert.js
  51. +116 −0 source/javascripts/bootstrap/button.js
  52. +237 −0 source/javascripts/bootstrap/carousel.js
  53. +211 −0 source/javascripts/bootstrap/collapse.js
  54. +161 −0 source/javascripts/bootstrap/dropdown.js
  55. +324 −0 source/javascripts/bootstrap/modal.js
  56. +113 −0 source/javascripts/bootstrap/popover.js
  57. +175 −0 source/javascripts/bootstrap/scrollspy.js
  58. +153 −0 source/javascripts/bootstrap/tab.js
  59. +472 −0 source/javascripts/bootstrap/tooltip.js
  60. +59 −0 source/javascripts/bootstrap/transition.js
  61. +140 −0 source/javascripts/main.js
  62. +777 −0 source/javascripts/plugins.js
  63. +5 −0 source/javascripts/vendor/jquery-1.11.2.min.js
  64. +4 −0 source/javascripts/vendor/modernizr-2.8.3.min.js
  65. +122 −0 source/layouts/blog.erb
  66. +55 −0 source/layouts/guides.erb
  67. +200 −0 source/layouts/home.erb
  68. +34 −0 source/layouts/layout.erb
  69. +7 −0 source/mailing-list.html.erb
  70. BIN source/ml/0001/images/calendar.jpg
  71. BIN source/ml/0001/images/cover.jpg
  72. BIN source/ml/0001/images/gist.jpg
  73. BIN source/ml/0001/images/helpers.jpg
  74. BIN source/ml/0001/images/img11.jpg
  75. BIN source/ml/0001/images/img8.jpg
  76. BIN source/ml/0001/images/img9.jpg
  77. BIN source/ml/0001/images/router.jpg
  78. BIN source/ml/0001/images/sinatra.jpg
  79. BIN source/ml/0001/images/twitter.jpg
  80. +1 −0 source/ml/0001/issue.html
  81. BIN source/ml/0002/images/calendar.jpg
  82. BIN source/ml/0002/images/controller.jpg
  83. BIN source/ml/0002/images/cover.jpg
  84. BIN source/ml/0002/images/gist.jpg
  85. BIN source/ml/0002/images/img11.jpg
  86. BIN source/ml/0002/images/img8.jpg
  87. BIN source/ml/0002/images/img9.jpg
  88. BIN source/ml/0002/images/thread-safety.jpg
  89. BIN source/ml/0002/images/twitter.jpg
  90. BIN source/ml/0002/images/view.jpg
  91. +1 −0 source/ml/0002/issue.html
  92. BIN source/ml/0003/images/calendar.jpg
  93. BIN source/ml/0003/images/cover.jpg
  94. BIN source/ml/0003/images/gist.jpg
  95. BIN source/ml/0003/images/img11.jpg
  96. BIN source/ml/0003/images/img8.jpg
  97. BIN source/ml/0003/images/img9.jpg
  98. BIN source/ml/0003/images/model.jpg
  99. BIN source/ml/0003/images/twitter.jpg
  100. +1 −0 source/ml/0003/issue.html
  101. BIN source/ml/0004/images/2014-retrospective.jpg
  102. BIN source/ml/0004/images/cover.jpg
  103. BIN source/ml/0004/images/img11.jpg
  104. BIN source/ml/0004/images/img8.jpg
  105. BIN source/ml/0004/images/img9.jpg
  106. BIN source/ml/0004/images/twitter.jpg
  107. +1 −0 source/ml/0004/issue.html
  108. +708 −0 source/sass/_bootstrap-variables-not-in-use.scss
  109. +63 −0 source/sass/_bootstrap-variables.scss
  110. +137 −0 source/sass/_prism.scss
  111. +54 −0 source/sass/layouts/_emailsignup.scss
  112. +81 −0 source/sass/layouts/_footer.scss
  113. +54 −0 source/sass/layouts/_header.scss
  114. +91 −0 source/sass/layouts/_navigation.scss
  115. +67 −0 source/sass/layouts/_terminal.scss
  116. +3,150 −0 source/sass/modules/_animate.scss
  117. +16 −0 source/sass/modules/_buttons.scss
  118. +3 −0 source/sass/modules/_colors.scss
  119. +60 −0 source/sass/modules/_typography.scss
  120. +4 −0 source/sass/modules/_variables.scss
  121. +19 −0 source/sass/pages/_blog.scss
  122. +50 −0 source/sass/pages/_docs.scss
  123. +190 −0 source/sass/pages/_index.scss
  124. +42 −0 source/sass/pages/_shared-ui.scss
  125. +59 −0 source/sass/styles.css
  126. +42 −0 source/sass/styles.scss
  127. +4 −0 source/stylesheets/application.css
  128. +1 −0 source/stylesheets/rrssb.css
  129. +12,304 −0 source/stylesheets/styles.css
@@ -1,3 +1,18 @@
.bundle/
# See http://help.github.com/ignore-files/ for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile ~/.gitignore_global

# Ignore bundler config
/.bundle

# Ignore the build directory
/build

# Ignore cache
/.sass-cache
/.cache

# Ignore .DS_store file
.DS_Store
_site
14 Gemfile
@@ -1,9 +1,9 @@
source 'https://rubygems.org'

gem 'jekyll'
gem 'jekyll-assets'
gem 'maruku'
gem 'rake'
gem 'sass'
gem 'uglifier'
gem 'github-pages'
gem 'middleman', '~> 3.3'
gem 'middleman-livereload', '~> 3.1'
gem 'middleman-blog', '~> 3.5'
gem 'middleman-syntax', '~> 2.0'
gem 'middleman-deploy', '~> 1.0'
gem 'bootstrap-sass', '~> 3.3', require: false
gem 'redcarpet', '~> 3.2'
@@ -1,120 +1,155 @@
GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
activesupport (4.1.0)
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)
blankslate (2.1.2.4)
classifier (1.3.4)
fast-stemmer (>= 1.0.0)
colorator (0.1)
commander (4.1.6)
highline (~> 1.6.11)
execjs (2.0.2)
fast-stemmer (1.0.2)
ffi (1.9.3)
gemoji (1.5.0)
github-pages (18)
RedCloth (= 4.2.9)
jekyll (= 1.5.1)
jekyll-mentions (= 0.0.6)
jekyll-redirect-from (= 0.3.1)
jekyll-sitemap (= 0.2.0)
jemoji (= 0.1.0)
kramdown (= 1.3.1)
liquid (= 2.5.5)
maruku (= 0.7.0)
rdiscount (= 2.1.7)
redcarpet (= 2.3.0)
highline (1.6.21)
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)
celluloid (0.16.0)
timers (~> 4.0.0)
chunky_png (1.3.3)
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.9.0)
compass (1.0.3)
chunky_png (~> 1.2)
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.3)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
erubis (2.7.0)
eventmachine (1.0.7)
execjs (2.3.0)
ffi (1.9.6)
haml (4.0.6)
tilt
hike (1.2.3)
html-pipeline (1.5.0)
activesupport (>= 2)
nokogiri (~> 1.4)
i18n (0.6.9)
jekyll (1.5.1)
classifier (~> 1.3)
colorator (~> 0.1)
commander (~> 4.1.3)
liquid (~> 2.5.5)
listen (~> 1.3)
maruku (= 0.7.0)
pygments.rb (~> 0.5.0)
redcarpet (~> 2.3.0)
safe_yaml (~> 1.0)
toml (~> 0.1.0)
jekyll-assets (0.7.7)
jekyll (~> 1.0)
sprockets (~> 2.10)
jekyll-mentions (0.0.6)
html-pipeline (~> 1.5.0)
jekyll (~> 1.4)
jekyll-redirect-from (0.3.1)
jekyll (~> 1.4)
jekyll-sitemap (0.2.0)
jekyll (~> 1.4)
jemoji (0.1.0)
gemoji (~> 1.5.0)
html-pipeline (~> 1.5.0)
jekyll (~> 1.4)
json (1.8.1)
kramdown (1.3.1)
liquid (2.5.5)
listen (1.3.1)
hitimes (1.2.2)
hooks (0.4.0)
uber (~> 0.0.4)
http_parser.rb (0.6.0)
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)
rb-kqueue (>= 0.2)
maruku (0.7.0)
mini_portile (0.5.3)
minitest (5.3.3)
multi_json (1.9.3)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
parslet (1.5.0)
blankslate (~> 2.0)
posix-spawn (0.3.8)
pygments.rb (0.5.4)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
rack (1.5.2)
rake (10.4.0)
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.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.8)
activesupport (~> 4.1.0)
bundler (~> 1.1)
erubis
hooks (~> 0.3)
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 (1.0.0)
middleman-core (>= 3.2)
net-sftp
ptools
middleman-livereload (3.4.2)
em-websocket (~> 0.5.1)
middleman-core (>= 3.3)
rack-livereload (~> 0.3.15)
middleman-sprockets (3.4.1)
middleman-core (>= 3.3)
sprockets (~> 2.12.1)
sprockets-helpers (~> 1.1.0)
sprockets-sass (~> 1.3.0)
middleman-syntax (2.0.0)
middleman-core (~> 3.2)
rouge (~> 1.0)
minitest (5.5.1)
multi_json (1.10.1)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.9.2)
padrino-helpers (0.12.4)
i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.12.4)
tilt (~> 1.4.1)
padrino-support (0.12.4)
activesupport (>= 3.1)
ptools (1.3.2)
rack (1.6.0)
rack-livereload (0.3.15)
rack
rack-test (0.6.3)
rack (>= 1.0)
rb-fsevent (0.9.4)
rb-inotify (0.9.4)
ffi (>= 0.5.0)
rb-kqueue (0.2.2)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rdiscount (2.1.7)
redcarpet (2.3.0)
safe_yaml (1.0.3)
sass (3.3.6)
sprockets (2.12.1)
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)
thread_safe (0.3.3)
sprockets-helpers (1.1.0)
sprockets (~> 2.0)
sprockets-sass (1.3.1)
sprockets (~> 2.0)
tilt (~> 1.1)
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
toml (0.1.1)
parslet (~> 1.5.0)
tzinfo (1.1.0)
timers (4.0.1)
hitimes
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.5.0)
uber (0.0.13)
uglifier (2.7.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
yajl-ruby (1.1.0)

PLATFORMS
ruby

DEPENDENCIES
github-pages
jekyll
jekyll-assets
maruku
rake
sass
uglifier
bootstrap-sass (~> 3.3)
middleman (~> 3.3)
middleman-blog (~> 3.5)
middleman-deploy (~> 1.0)
middleman-livereload (~> 3.1)
middleman-syntax (~> 2.0)
redcarpet (~> 3.2)
@@ -0,0 +1,22 @@
# Lotus website

## Setup

### Requirements

* Ruby 2+
* Bundler (`gem install bundler`)

### Steps

```shell
% git clone git@github.com:lotus/lotus.github.io.git
% cd lotus.github.io
% bundle
```

## Run the server

```shell
% bundle exec middleman server
```

This file was deleted.

0 comments on commit a87fb53

Please sign in to comment.
You can’t perform that action at this time.