[DRE-commits] [tdiary] 01/01: New upstream version 5.0.6
Youhei SASAKI
uwabami-guest at moszumanska.debian.org
Tue Nov 14 09:46:05 UTC 2017
This is an automated email from the git hooks/post-receive script.
uwabami-guest pushed a commit to annotated tag upstream/5.0.6
in repository tdiary.
commit e43e786aad44ed7aec53d780e43f33eb1c77f72a
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date: Tue Nov 14 18:42:45 2017 +0900
New upstream version 5.0.6
---
.gitignore | 20 ++++++++++
ChangeLog | 6 +++
Gemfile.lock | 55 +++++++++++++------------
doc/README.en.md | 2 +-
doc/README.md | 2 +-
lib/tdiary/application.rb | 6 ---
lib/tdiary/environment.rb | 4 +-
lib/tdiary/rack.rb | 4 --
lib/tdiary/version.rb | 2 +-
misc/paas/heroku/Gemfile.local | 2 +-
misc/paas/heroku/Gemfile.lock | 91 +++++++++++++++++++++---------------------
misc/paas/sqale/Gemfile | 16 --------
misc/paas/sqale/Gemfile.lock | 74 ----------------------------------
misc/paas/sqale/Procfile | 1 -
misc/paas/sqale/dot.env | 1 -
misc/paas/sqale/tdiary.conf | 85 ---------------------------------------
theme/default/default.css | 2 +-
17 files changed, 106 insertions(+), 267 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..94420c3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,20 @@
+.bundle
+.htpasswd
+coverage
+coverage.*
+data/*
+!data/.htaccess
+log
+pkg
+tmp
+rdoc
+index.rdf
+tdiary.conf
+vendor/bundle/
+spec/reports
+doc/*.html
+.rspec
+.ruby-version
+/Gemfile.local
+spec/javascripts/lib
+node_modules
diff --git a/ChangeLog b/ChangeLog
index 5c1e7d7..ccd222b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-09-29 Tada, Tadashi <t at tdtds.jp>
+ * release 5.0.6
+
+2017-09-19 Tada, Tadashi <t at tdtds.jp>
+ * fix incompatibirity between bundler 1.15 and 1.16 (#646)
+
2017-06-29 Tada, Tadashi <t at tdtds.jp>
* release 5.0.5
diff --git a/Gemfile.lock b/Gemfile.lock
index 8eb980a..19cebf0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,19 +1,19 @@
GEM
remote: https://rubygems.org/
specs:
- addressable (2.5.1)
- public_suffix (~> 2.0, >= 2.0.2)
- byebug (9.0.6)
- capybara (2.14.3)
+ addressable (2.5.2)
+ public_suffix (>= 2.0.2, < 4.0)
+ byebug (9.1.0)
+ capybara (2.15.1)
addressable
- mime-types (>= 1.16)
+ mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
childprocess (0.7.1)
ffi (~> 1.0, >= 1.0.11)
- coderay (1.1.1)
+ coderay (1.1.2)
concurrent-ruby (1.0.5)
coveralls (0.7.12)
multi_json (~> 1.10)
@@ -27,51 +27,51 @@ GEM
unf (>= 0.0.5, < 1.0.0)
emot (0.0.4)
thor
- faraday (0.12.1)
+ faraday (0.13.1)
multipart-post (>= 1.2, < 3)
fastimage (2.1.0)
ffi (1.9.18)
hikidoc (0.1.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
- jasmine (2.6.0)
- jasmine-core (>= 2.6.0, < 3.0.0)
+ jasmine (2.8.0)
+ jasmine-core (>= 2.8.0, < 3.0.0)
phantomjs
rack (>= 1.2.1)
rake
- jasmine-core (2.6.4)
+ jasmine-core (2.8.0)
launchy (2.4.3)
addressable (~> 2.3)
mail (2.6.6)
mime-types (>= 1.16, < 4)
method_source (0.8.2)
mime-types (2.99.3)
- mini_portile2 (2.2.0)
- multi_json (1.12.1)
+ mini_mime (0.1.4)
+ mini_portile2 (2.3.0)
+ multi_json (1.12.2)
multipart-post (2.0.0)
netrc (0.11.0)
- nokogiri (1.8.0)
- mini_portile2 (~> 2.2.0)
+ nokogiri (1.8.1)
+ mini_portile2 (~> 2.3.0)
octokit (4.7.0)
sawyer (~> 0.8.0, >= 0.5.3)
phantomjs (2.1.1.0)
pit (0.0.7)
- power_assert (1.0.2)
- pry (0.10.4)
+ power_assert (1.1.0)
+ pry (0.11.0)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
- slop (~> 3.4)
- pry-byebug (3.4.2)
- byebug (~> 9.0)
+ pry-byebug (3.5.0)
+ byebug (~> 9.1)
pry (~> 0.10)
- public_suffix (2.0.5)
+ public_suffix (3.0.0)
rack (1.6.8)
- rack-test (0.6.3)
- rack (>= 1.0)
+ rack-test (0.7.0)
+ rack (>= 1.0, < 3)
racksh (1.0.0)
rack (>= 1.0)
rack-test (>= 0.5)
- rake (12.0.0)
+ rake (12.1.0)
redcarpet (3.4.0)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
@@ -94,16 +94,15 @@ GEM
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
- selenium-webdriver (3.4.3)
+ selenium-webdriver (3.5.2)
childprocess (~> 0.5)
rubyzip (~> 1.0)
- sequel (4.47.0)
+ sequel (5.0.0)
simplecov (0.9.2)
docile (~> 1.1.0)
multi_json (~> 1.0)
simplecov-html (~> 0.9.0)
simplecov-html (0.9.0)
- slop (3.6.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
@@ -113,7 +112,7 @@ GEM
test-unit (3.2.5)
power_assert
thor (0.19.4)
- tins (1.14.0)
+ tins (1.15.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.4)
@@ -148,4 +147,4 @@ DEPENDENCIES
test-unit
BUNDLED WITH
- 1.14.6
+ 1.16.0.pre.2
diff --git a/doc/README.en.md b/doc/README.en.md
index b40a0b0..da5883e 100644
--- a/doc/README.en.md
+++ b/doc/README.en.md
@@ -32,7 +32,7 @@ By plugins, you can add new features to tDiary, and change the existing feature
### Selectable Style and IO
-You can choice a grammar of writing your diary by 'Style' feature. Some style files are in misc/style. And you can choice data saving format (IO) also. Seee HOWTO-make-io.rd for more information about Style or IO.
+You can choice a grammar of writing your diary by 'Style' feature. Some style files are in misc/style. And you can choice data saving format (IO) also. Seee HOWTO-make-io.html for more information about Style or IO.
### Written in Ruby
diff --git a/doc/README.md b/doc/README.md
index ab8a857..3cc74ce 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -32,7 +32,7 @@ iモードに限らず、ほとんどの携帯電話やPalm・ザウルスなど
### 記述形式や保存形式を変更できる
-日記を記述する形式(スタイル機能)や、データの保存形式(IO機能)が選択可能です。スタイルはmisc/styleの下に複数収められています。IOは現在、1.4系までの旧tDiary互換のPStoreIOと、2.0系以降の新しいテキスト形式であるDefaultIOがあります。詳しくは[HOWTO-make-io.rd](HOWTO-make-io.rd)を参照してください。
+日記を記述する形式(スタイル機能)や、データの保存形式(IO機能)が選択可能です。スタイルはmisc/styleの下に複数収められています。IOは現在、1.4系までの旧tDiary互換のPStoreIOと、2.0系以降の新しいテキスト形式であるDefaultIOがあります。詳しくは[HOWTO-make-io.html](HOWTO-make-io.html)を参照してください。
### Rubyで書かれている
diff --git a/lib/tdiary/application.rb b/lib/tdiary/application.rb
index 4195b7f..6b4f887 100644
--- a/lib/tdiary/application.rb
+++ b/lib/tdiary/application.rb
@@ -45,12 +45,6 @@ module TDiary
environment.append_path assets_path
}
- if TDiary.configuration.options['tdiary.assets.precompile']
- TDiary.logger.info('enable assets.precompile')
- require 'tdiary/rack/assets/precompile'
- use TDiary::Rack::Assets::Precompile, environment
- end
-
run environment
end
end
diff --git a/lib/tdiary/environment.rb b/lib/tdiary/environment.rb
index b92c36d..f4c1037 100644
--- a/lib/tdiary/environment.rb
+++ b/lib/tdiary/environment.rb
@@ -14,7 +14,9 @@ if defined?(Bundler)
env = [:default, :rack]
env << :development if ENV['RACK_ENV'].nil? || ENV['RACK_ENV'].empty?
env << ENV['RACK_ENV'].intern if ENV['RACK_ENV']
- env = env.reject{|e| Bundler.settings.without.include? e }
+ env = env.reject{|e|
+ (Bundler.settings.without rescue Bundler.settings[:without]).include? e
+ }
Bundler.require *env
end
diff --git a/lib/tdiary/rack.rb b/lib/tdiary/rack.rb
index c366040..746d936 100644
--- a/lib/tdiary/rack.rb
+++ b/lib/tdiary/rack.rb
@@ -5,10 +5,6 @@ module TDiary
autoload :Session, 'tdiary/rack/session'
autoload :Static, 'tdiary/rack/static'
autoload :Auth, 'tdiary/rack/auth'
-
- module Assets
- autoload :Precompile, 'tdiary/rack/assets/precompile'
- end
end
end
diff --git a/lib/tdiary/version.rb b/lib/tdiary/version.rb
index 3fc8efb..e75c91f 100644
--- a/lib/tdiary/version.rb
+++ b/lib/tdiary/version.rb
@@ -1,3 +1,3 @@
module TDiary
- VERSION = '5.0.5'
+ VERSION = '5.0.6'
end
diff --git a/misc/paas/heroku/Gemfile.local b/misc/paas/heroku/Gemfile.local
index b91a62c..6619045 100644
--- a/misc/paas/heroku/Gemfile.local
+++ b/misc/paas/heroku/Gemfile.local
@@ -1,4 +1,4 @@
-ruby '~> 2.4.1'
+ruby '~> 2.4.2'
gem 'puma', require: false
gem 'tdiary-io-mongodb', git: 'https://github.com/tdiary/tdiary-io-mongodb.git'
gem 'tdiary-contrib', git: 'https://github.com/tdiary/tdiary-contrib.git'
diff --git a/misc/paas/heroku/Gemfile.lock b/misc/paas/heroku/Gemfile.lock
index c501582..904c42a 100644
--- a/misc/paas/heroku/Gemfile.lock
+++ b/misc/paas/heroku/Gemfile.lock
@@ -1,8 +1,8 @@
GIT
remote: https://github.com/tdiary/tdiary-contrib.git
- revision: a3c5f37278c47c3a6d8ba9c146f1864b2644c9a2
+ revision: a7182c4e67c62cafa93f3df94d3184a18b2c97b5
specs:
- tdiary-contrib (5.0.4)
+ tdiary-contrib (5.0.5)
ruby-pushbullet
tdiary
@@ -17,27 +17,27 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- activemodel (5.1.2)
- activesupport (= 5.1.2)
- activesupport (5.1.2)
+ activemodel (5.1.4)
+ activesupport (= 5.1.4)
+ activesupport (5.1.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
- addressable (2.5.1)
- public_suffix (~> 2.0, >= 2.0.2)
- bson (4.2.1)
- byebug (9.0.6)
- capybara (2.14.3)
+ addressable (2.5.2)
+ public_suffix (>= 2.0.2, < 4.0)
+ bson (4.2.2)
+ byebug (9.1.0)
+ capybara (2.15.1)
addressable
- mime-types (>= 1.16)
+ mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
childprocess (0.7.1)
ffi (~> 1.0, >= 1.0.11)
- coderay (1.1.1)
+ coderay (1.1.2)
concurrent-ruby (1.0.5)
coveralls (0.7.12)
multi_json (~> 1.10)
@@ -52,22 +52,22 @@ GEM
unf (>= 0.0.5, < 1.0.0)
emot (0.0.4)
thor
- faraday (0.12.1)
+ faraday (0.13.1)
multipart-post (>= 1.2, < 3)
fastimage (2.1.0)
ffi (1.9.18)
github-markdown (0.6.9)
- hashie (3.5.5)
+ hashie (3.5.6)
hikidoc (0.1.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
- i18n (0.8.4)
- jasmine (2.6.0)
- jasmine-core (>= 2.6.0, < 3.0.0)
+ i18n (0.8.6)
+ jasmine (2.8.0)
+ jasmine-core (>= 2.8.0, < 3.0.0)
phantomjs
rack (>= 1.2.1)
rake
- jasmine-core (2.6.4)
+ jasmine-core (2.8.0)
json (2.1.0)
launchy (2.4.3)
addressable (~> 2.3)
@@ -76,18 +76,19 @@ GEM
memcachier (0.0.2)
method_source (0.8.2)
mime-types (2.99.3)
- mini_portile2 (2.2.0)
- minitest (5.10.2)
- mongo (2.4.2)
+ mini_mime (0.1.4)
+ mini_portile2 (2.3.0)
+ minitest (5.10.3)
+ mongo (2.4.3)
bson (>= 4.2.1, < 5.0.0)
- mongoid (6.2.0)
+ mongoid (6.2.1)
activemodel (~> 5.1)
mongo (>= 2.4.1, < 3.0.0)
- multi_json (1.12.1)
+ multi_json (1.12.2)
multipart-post (2.0.0)
netrc (0.11.0)
- nokogiri (1.8.0)
- mini_portile2 (~> 2.2.0)
+ nokogiri (1.8.1)
+ mini_portile2 (~> 2.3.0)
oauth (0.5.3)
octokit (4.7.0)
sawyer (~> 0.8.0, >= 0.5.3)
@@ -102,30 +103,29 @@ GEM
rack
phantomjs (2.1.1.0)
pit (0.0.7)
- power_assert (1.0.2)
- pry (0.10.4)
+ power_assert (1.1.0)
+ pry (0.11.0)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
- slop (~> 3.4)
- pry-byebug (3.4.2)
- byebug (~> 9.0)
+ pry-byebug (3.5.0)
+ byebug (~> 9.1)
pry (~> 0.10)
- public_suffix (2.0.5)
- puma (3.9.1)
+ public_suffix (3.0.0)
+ puma (3.10.0)
rack (1.6.8)
- rack-test (0.6.3)
- rack (>= 1.0)
+ rack-test (0.7.0)
+ rack (>= 1.0, < 3)
racksh (1.0.0)
rack (>= 1.0)
rack-test (>= 0.5)
- rake (12.0.0)
+ rake (12.1.0)
rdtool (0.6.38)
redcarpet (3.4.0)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
- rouge (2.1.1)
+ rouge (2.2.1)
rspec (3.6.0)
rspec-core (~> 3.6.0)
rspec-expectations (~> 3.6.0)
@@ -146,21 +146,20 @@ GEM
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
- selenium-webdriver (3.4.3)
+ selenium-webdriver (3.5.2)
childprocess (~> 0.5)
rubyzip (~> 1.0)
- sequel (4.47.0)
+ sequel (5.0.0)
simplecov (0.9.2)
docile (~> 1.1.0)
multi_json (~> 1.0)
simplecov-html (~> 0.9.0)
simplecov-html (0.9.0)
- slop (3.6.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sqlite3 (1.3.13)
- tdiary (5.0.4)
+ tdiary (5.0.5)
bundler (~> 1.3)
emot
fastimage
@@ -170,10 +169,10 @@ GEM
rake
sprockets
thor
- tdiary-style-gfm (0.4.1)
+ tdiary-style-gfm (0.5.1)
emot
github-markdown
- rouge (>= 2.0)
+ rouge (>= 2.2)
twitter-text
tdiary-style-rd (0.0.3)
rdtool
@@ -183,8 +182,8 @@ GEM
power_assert
thor (0.19.4)
thread_safe (0.3.6)
- tins (1.14.0)
- twitter-text (1.14.6)
+ tins (1.15.0)
+ twitter-text (1.14.7)
unf (~> 0.1.0)
tzinfo (1.2.3)
thread_safe (~> 0.1)
@@ -231,7 +230,7 @@ DEPENDENCIES
test-unit
RUBY VERSION
- ruby 2.4.1p111
+ ruby 2.4.2p198
BUNDLED WITH
- 1.15.1
+ 1.16.0.pre.2
diff --git a/misc/paas/sqale/Gemfile b/misc/paas/sqale/Gemfile
deleted file mode 100644
index ffe3033..0000000
--- a/misc/paas/sqale/Gemfile
+++ /dev/null
@@ -1,16 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rake'
-
-gem 'rack'
-gem 'sprockets'
-gem 'hikidoc'
-gem 'fastimage'
-
-gem 'omniauth'
-gem 'omniauth-twitter'
-gem 'omniauth-github'
-
-gem 'thin', require: false
-gem 'tdiary-io-rdb'
-gem 'mysql2'
diff --git a/misc/paas/sqale/Gemfile.lock b/misc/paas/sqale/Gemfile.lock
deleted file mode 100644
index da47106..0000000
--- a/misc/paas/sqale/Gemfile.lock
+++ /dev/null
@@ -1,74 +0,0 @@
-GEM
- remote: https://rubygems.org/
- specs:
- addressable (2.3.5)
- daemons (1.1.9)
- eventmachine (1.0.3)
- faraday (0.9.0)
- multipart-post (>= 1.2, < 3)
- fastimage (1.6.0)
- addressable (~> 2.3, >= 2.3.5)
- hashie (2.0.5)
- hike (1.2.3)
- hikidoc (0.0.6)
- jwt (0.1.11)
- multi_json (>= 1.5)
- multi_json (1.8.4)
- multi_xml (0.5.5)
- multipart-post (2.0.0)
- mysql2 (0.3.15)
- oauth (0.4.7)
- oauth2 (0.9.3)
- faraday (>= 0.8, < 0.10)
- jwt (~> 0.1.8)
- multi_json (~> 1.3)
- multi_xml (~> 0.5)
- rack (~> 1.2)
- omniauth (1.2.1)
- hashie (>= 1.2, < 3)
- rack (~> 1.0)
- omniauth-github (1.1.1)
- omniauth (~> 1.0)
- omniauth-oauth2 (~> 1.1)
- omniauth-oauth (1.0.1)
- oauth
- omniauth (~> 1.0)
- omniauth-oauth2 (1.1.2)
- faraday (>= 0.8, < 0.10)
- multi_json (~> 1.3)
- oauth2 (~> 0.9.3)
- omniauth (~> 1.2)
- omniauth-twitter (1.0.1)
- multi_json (~> 1.3)
- omniauth-oauth (~> 1.0)
- rack (1.5.2)
- rake (10.1.1)
- sequel (4.7.0)
- sprockets (2.11.0)
- hike (~> 1.2)
- multi_json (~> 1.0)
- rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
- tdiary-io-rdb (0.0.1)
- sequel
- thin (1.6.1)
- daemons (>= 1.0.9)
- eventmachine (>= 1.0.0)
- rack (>= 1.0.0)
- tilt (1.4.1)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- fastimage
- hikidoc
- mysql2
- omniauth
- omniauth-github
- omniauth-twitter
- rack
- rake
- sprockets
- tdiary-io-rdb
- thin
diff --git a/misc/paas/sqale/Procfile b/misc/paas/sqale/Procfile
deleted file mode 100644
index d68b552..0000000
--- a/misc/paas/sqale/Procfile
+++ /dev/null
@@ -1 +0,0 @@
-app: bundle exec thin --socket /var/run/app/app.sock start
diff --git a/misc/paas/sqale/dot.env b/misc/paas/sqale/dot.env
deleted file mode 100644
index 2855a39..0000000
--- a/misc/paas/sqale/dot.env
+++ /dev/null
@@ -1 +0,0 @@
-DATABASE_URL=mysql2://username:password at hostname/database
diff --git a/misc/paas/sqale/tdiary.conf b/misc/paas/sqale/tdiary.conf
deleted file mode 100644
index 81e3d11..0000000
--- a/misc/paas/sqale/tdiary.conf
+++ /dev/null
@@ -1,85 +0,0 @@
-require 'tempfile'
- at data_path = Dir.tmpdir
-
- at style = 'GFM'
-
-require 'tdiary/cache/file'
-# To use memcache addon
-# require 'tdiary/cache/memcached'
-require 'tdiary/io/rdb'
- at io_class = TDiary::RdbIO
-
- at index = './'
- at update = 'update.rb'
- at logger = Logger.new($stderr)
-
- at accesskey_enabled = false
- at options['bot'] = [
- '^BlogLines/',
- '^blogmap',
- 'MI[CK]AN/',
- '^NG/',
- '^samidare',
- '^TAMATEBAKO/'
-]
-
- at options['apply_plugin'] = true
- at options['sp.path'] = ['misc/plugin']
- at options['style.path'] = ['misc/style/gfm', 'tdiary/style']
- at options['sp.selected'] =
-"amazon.rb
-append-css.rb
-calendar2.rb
-dropdown_calendar.rb
-footnote.rb
-highlight.rb
-image.rb
-jdate.rb
-kw.rb
-my-ex.rb
-"
-
- at options['dropdown_calendar.label'] = ''
- at options['spamfilter.bad_comment_patts'] = "(href=|casino|gambling|betting|fastsearch\\.eu\\.com|ganzao|poker|holdem|hold.em|roulette|drug|tramadol|viagra|fioricet|oxycontin|biaxin|aldara|business cards|home depot|slot.?machine|insurance|getblog2|video-game|Good site|internet-all\\.com|deai|tdfms|comu2|omaha)\r\n"
- at options['spamfilter.bad_ip_addrs'] = ""
- at options['spamfilter.bad_mail_patts'] = "(mu at alloha\\.info|mumu2004 at mail\\.com|zhongleibo|dfd at 12\\.com|anonimous|aol\\.|yahoo\\.|google\\.|hotmail\\.|msn\\.|leroy\\.|ablare\\.|gmx\\.|lorazepam|\\.co$)"
- at options['spamfilter.bad_uri_patts'] = ""
- at options['spamfilter.bad_uri_patts_for_mails'] = false
- at options['spamfilter.debug_file'] = ""
- at options['spamfilter.debug_mode'] = false
- at options['spamfilter.filter_mode'] = true
- at options['spamfilter.max_uris'] = "2"
- at options['spamfilter.resolv_check'] = false
- at options['spamfilter.resolv_check_mode'] = false
- at options['spamlookup.domain.list'] = "bsb.spamlookup.net\r\nsc.surbl.org\r\nrbl.bulkfeeds.jp"
- at options['spamlookup.safe_domain.list'] = "search.yahoo.co.jp\r\nwww.google.com\r\nwww.google.co.jp\r\nsearch.msn.co.jp"
-
- at html_title = %Q[【日記のタイトル】]
- at header = <<HEADER
-<%= navi %>
-<h1><%= @html_title %></h1>
-<div class="main">
-HEADER
- at footer = <<FOOTER
-</div>
-<div class="sidebar">
-<div style="text-align: center">
-<%= calendar2 %>
-<%= calendar %>
-</div>
-</div>
-FOOTER
-
- at date_format = '%Y年%m月%d日'
- at section_anchor = '<span class="sanchor">_</span>'
- at comment_anchor = '<span class="canchor">_</span>'
- at latest_limit = 10
- at theme = 'default'
- at show_comment = true
- at comment_limit = 3
- at show_referer = false
- at referer_day_only = true
- at hour_offset = 9
- at show_nyear = true
-
-load_cgi_conf
diff --git a/theme/default/default.css b/theme/default/default.css
index 7c87113..1a35a5c 100644
--- a/theme/default/default.css
+++ b/theme/default/default.css
@@ -719,7 +719,7 @@ div.sidebar div.calendar {
display: block;
float: none;
margin: 10px auto;
- max-width: 300px !important;
+ max-width: 78vw !important;
height: auto;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/tdiary.git
More information about the Pkg-ruby-extras-commits
mailing list