Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

several change

  • Loading branch information...
commit aac3aa2ef994c7389d63f47e67637605b3ad3be9 1 parent ac159b0
@pmq20 authored
View
BIN  app/assets/images/go.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/assets/images/loading.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
5 app/assets/stylesheets/cnucamp.css
@@ -1,4 +1,7 @@
-@import url('yui-reset.css');
+/*
+ *= require yui-reset.css
+ *= require_self
+ */
*{border:0px solid #eee;margin:0;padding:0;list-style:none}
html,body,#bg,#bg table,#bg td,#cont{width:100%;height:100%;overflow:hidden}
View
21 app/assets/stylesheets/yui-reset.css
@@ -0,0 +1,21 @@
+/*
+Copyright (c) 2007, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.4.1
+*/
+html{color:#000;background:#FFF}
+body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0}
+table{border-collapse:collapse;border-spacing:0}
+address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal}
+li{list-style:none}
+caption,th{text-align:left}
+h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal}
+q:before,q:after{content:''}
+abbr,acronym{font-variant:normal}
+/* to preserve line-height and selector appearance */
+sup {vertical-align:text-top}
+sub {vertical-align:text-bottom}
+input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit}
+/*because legend doesn't inherit in IE */
+legend{color:#000}
View
8 app/views/cnucamp/index.html.erb
@@ -11,9 +11,11 @@
</div>
<div id="cont"><div class="box large left">
<h2><b>CNU</b>野营社</h2>
-欢迎来到首都师范大学野营社。挑战自我,征服自然;远离城市喧嚣,与地球共呼吸。我们热爱户外运动,野营社是我们共同的家。野营社成立于2012年,为成员提供安全互助、装备分享以及结交朋友的机会,目前已成功组织 1 次出游活动。
- </div></div>
+欢迎来到首都师范大学野营社。挑战自我,融入自然;远离城市喧嚣,与地球共呼吸。我们热爱户外运动,野营社是我们共同的家。野营社成立于2012年,为成员提供安全互助、装备分享以及结交朋友的机会,目前已成功组织 1 次出游活动。<br>
+<br>
+注:本社旨为丰富同学们的业余生活,以休闲娱乐为主,并不追求极限户外运动。
+</div></div>
<div id="bg"><div><table cellpadding="0" cellspacing="0"><tr><td>
<%= image_tag("bg/#{File.basename(@bg_file)}") %>
-</td></tr></table></div></div>
+</td></tr></table></div></div>
View
3  bin/restore
@@ -1,9 +1,6 @@
#!/bin/bash -x
# Make sure you are in the Rails.root directory!!
-source ./git_sensitive.sh
-
rm -rf data_backups/dump
tar xzf $1
mongorestore --drop data_backups/dump
-mysql -u root -p$GIT_SENSITIVE_MYSQL_PASSWORD ultrax < data_backups/ultrax.backup.sql
View
BIN  public/favicon.ico
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.