diff --git a/db/schema.rb b/db/schema.rb index 6edcdcc42..abc7017e6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20150930011457) do +ActiveRecord::Schema.define(:version => 20150917022239) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -575,8 +575,6 @@ ActiveRecord::Schema.define(:version => 20150930011457) do t.integer "viewed" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false - t.string "secret_key" - t.integer "status" end create_table "forums", :force => true do |t| @@ -785,6 +783,16 @@ ActiveRecord::Schema.define(:version => 20150930011457) do add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id" + create_table "journal_details_copy", :force => true do |t| + t.integer "journal_id", :default => 0, :null => false + t.string "property", :limit => 30, :default => "", :null => false + t.string "prop_key", :limit => 30, :default => "", :null => false + t.text "old_value" + t.text "value" + end + + add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id" + create_table "journal_replies", :id => false, :force => true do |t| t.integer "journal_id" t.integer "user_id" @@ -903,7 +911,6 @@ ActiveRecord::Schema.define(:version => 20150930011457) do t.datetime "updated_on", :null => false t.boolean "locked", :default => false t.integer "sticky", :default => 0 - t.integer "reply_id" end add_index "messages", ["author_id"], :name => "index_messages_on_author_id" @@ -1369,7 +1376,6 @@ ActiveRecord::Schema.define(:version => 20150930011457) do t.datetime "created_at", :null => false t.datetime "updated_at", :null => false t.text "description" - t.string "subject" end create_table "taggings", :force => true do |t| diff --git a/public/stylesheets/prettify.css b/public/stylesheets/prettify.css index 489f1959b..4ae3a5e0d 100644 --- a/public/stylesheets/prettify.css +++ b/public/stylesheets/prettify.css @@ -48,6 +48,9 @@ ol.linenums { margin-top: 0; margin-bottom: 0;line-height: 15px;margin-left: 0px list-style-type: decimal; margin-left: 10px !important; } +.linenums li { + margin-left: 0px !important; +} li.L0, li.L1, li.L2, diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index fb6da363a..f769ff9e6 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -221,6 +221,7 @@ a:hover.talk_btn{ background:#2a9dc1;} /****讨论区内页***/ .mt0{ margin-top:0px;} .talk_info{ color:#7d7d7d; margin-left:60px; margin-top:10px;} +.issue_desc li{list-style-type: decimal;margin-left: 20px;} .talk_info img {max-width:100%;} a.talk_edit{ color:#426e9a; margin-right:5px;} a:hover.talk_edit{ color:#ff5722;}