Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
ongaeshi committed Jul 30, 2011
2 parents 071762a + e0e3f07 commit 32134630d2b1e38b1893588f7866a24b2096d1a9
View
@@ -1,3 +1,9 @@
+=== 0.1.3 2011/07/30
+
+* Change Icon.
+* Change web-app design.
+* Change text, lib/milkode/cdweb/views/help.haml.
+
=== 0.1.2 2011/07/26
* milk web --host, default value "127.0.0.1" (for Windows).
View
@@ -1 +1 @@
-0.1.2
+0.1.3
View
@@ -6,5 +6,5 @@
require 'rubygems'
require 'milkode/cdstk/cli_cdstk'
-Version = "0.1.2"
+Version = "0.1.3"
Milkode::CLI_Cdstk.execute(STDOUT, ARGV)
View
@@ -18,7 +18,7 @@
set :haml, :format => :html5
get '/' do
- @version = "0.1.2"
+ @version = "0.1.3"
@package_num = Database.instance.fileList('').size
@file_num = Database.instance.fileNum
haml :index
@@ -17,8 +17,8 @@ div.footer_home {
}
div.search-summary {
- border-color:#F4CA3F;
- background-color:#FEFFF0;
+ border-color: #e92926;
+ background-color:#FFF0F0;
border-top-style:solid;
border-top-width:1px;
border-bottom-style:solid;
@@ -39,7 +39,10 @@ dt.result-file {
}
div.pagination {
- background-color:#FEFFF0;
+ border-color: #e92926;
+ background-color:#FFF0F0;
+ border-top-style:solid;
+ border-top-width:1px;
text-align: center;
margin-bottom: 20px;
}
@@ -64,8 +67,8 @@ font.version {
}
span.highlight-line {
- background-color: #d0ff9c;
-/* background-color: #FFFF55; */
+ background-color: #d0ff9c;
+ /*background-color: #FFFF55;*/
}
a.headmenu {
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Deleted file not rendered
Deleted file not rendered
@@ -1,6 +1,6 @@
.header
%h1
- <a href="/"><img src="/images/gren-icon-mini.png" alt="gren-icon" border="0"/></a>
+ <a href="/"><img src="/images/MilkodeIcon135.png" alt="milkode-icon-mini" border="0" height="75px"/></a>
Milkode
= create_headmenu(@path, params)
@@ -2,15 +2,15 @@
.header
%h1
- <a href="/"><img src="/images/gren-icon-mini.png" alt="gren-icon" border="0"/></a>
+ <a href="/"><img src="/images/MilkodeIcon135.png" alt="milkode-icon-mini" border="0" height="75px"/></a>
#{@title} - Milkode
.content
.sample-code
%ol
- %li キーワードで検索<br>#{link('def open')}
- %li1フレーズとして検索<br>#{link('"def open"')}
- %li パッケージ名で絞り込み<br>#{link('def open p:gren')}
- %li ファイル名や拡張子で絞り込み<br>#{link('def open f:test s:rb')}
- %li 組み合わせ<br>#{link('p:gren p:tidtools s:rb f:test assert f:cli')}
+ %li キーワードを並べてAND検索<br>#{link('def open')}
+ %li 1フレーズとして検索<br>#{link('"def open"')}
+ %li パッケージ名で絞り込み<br>#{link('def open p:milkode')}
+ %li ファイル名で絞り込み<br>#{link('def open f:test')}
+ %li 拡張子で絞り込み<br>#{link('s:rb')}
@@ -1,6 +1,6 @@
%div(align="center")
.header_home
- %h1 <a href="/"><img src="/images/gren-icon.png" alt="gren-icon" border="0" height="100px"/></a> Milkode <font class="version">#{@version}</font>
+ %h1 <a href="/"><img src="/images/MilkodeIcon135.png" alt="milkode-icon" border="0" height="135px"/></a> Milkode <font class="version">#{@version}</font>
.content
%form(method="post" action="home")
@@ -1,6 +1,6 @@
.header
%h1
- <a href="/"><img src="/images/gren-icon-mini.png" alt="gren-icon" border="0"/></a>
+ <a href="/"><img src="/images/MilkodeIcon135.png" alt="milkode-icon-mini" border="0" height="75px"/></a>
Milkode
= create_headmenu(@path, params)
@@ -1,6 +1,6 @@
.header
%h1
- <a href="/"><img src="/images/gren-icon-mini.png" alt="gren-icon" border="0"/></a>
+ <a href="/"><img src="/images/MilkodeIcon135.png" alt="milkode-icon-mini" border="0" height="75px"/></a>
Milkode
= create_headmenu(@path, params)

0 comments on commit 3213463

Please sign in to comment.