From 33c701490eff99e2edff0da173778a8716d237de Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 26 Apr 2017 15:20:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E5=9C=A8=E4=BB=A3=E7=A0=81=E6=A1=86?=
=?UTF-8?q?=E7=9A=84=E5=BA=95=E9=83=A8=E7=BC=96=E5=86=99=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=9B=9E=E8=BD=A6=E6=8D=A2=E8=A1=8C=E5=90=8E?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A1=86=E6=B2=A1=E6=9C=89=E8=87=AA=E5=8A=A8?=
=?UTF-8?q?=E4=B8=8B=E7=A7=BB=EF=BC=8C=E5=BF=85=E9=A1=BB=E6=89=8B=E5=8A=A8?=
=?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=89=8D=E8=83=BD=E4=BD=BF=E5=BD=93=E5=89=8D?=
=?UTF-8?q?=E6=AD=A3=E5=9C=A8=E8=BE=93=E5=85=A5=E4=BB=A3=E7=A0=81=E6=89=80?=
=?UTF-8?q?=E5=9C=A8=E8=A1=8C=E5=9B=9E=E5=88=B0=E8=A7=86=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/bigdate.iml | 98 ++++++++++++------------
app/views/games/_file_edit_form.html.erb | 5 +-
app/views/games/show.html.erb | 1 +
3 files changed, 54 insertions(+), 50 deletions(-)
diff --git a/.idea/bigdate.iml b/.idea/bigdate.iml
index 1ef1abf03..54164e1bd 100644
--- a/.idea/bigdate.iml
+++ b/.idea/bigdate.iml
@@ -13,26 +13,46 @@
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -57,46 +77,28 @@
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/app/views/games/_file_edit_form.html.erb b/app/views/games/_file_edit_form.html.erb
index 9b5da6ad6..723aa0038 100644
--- a/app/views/games/_file_edit_form.html.erb
+++ b/app/views/games/_file_edit_form.html.erb
@@ -4,7 +4,7 @@
@@ -23,7 +23,7 @@
lineNumbers: true,
theme: "ambiance",
// extraKeys: {"Ctrl-Q": "autocomplete"}, // 快捷键
- indentUnit: 4, //代码缩进为一个tab的距离
+ indentUnit: 2, //代码缩进为一个tab的距离
matchBrackets: true,
autoRefresh: true,
smartIndent: true//智能换行
@@ -66,5 +66,6 @@
editor_CodeMirror.refresh();
var h = $("#games_repository_contents").height() - $("#top_repository").height() - 10;
$(".CodeMirror-scroll").css("min-height", h);
+ $(".CodeMirror-scroll").css("max-height", h);
});
\ No newline at end of file
diff --git a/app/views/games/show.html.erb b/app/views/games/show.html.erb
index 40696988d..64d3d695a 100644
--- a/app/views/games/show.html.erb
+++ b/app/views/games/show.html.erb
@@ -38,6 +38,7 @@
}
var h = $("#games_repository_contents").height() - $("#top_repository").height() - 10;
$(".CodeMirror-scroll").css("min-height", h);
+ $(".CodeMirror-scroll").css("max-height", h);
}
// 测评的扩大与缩小
function valuation_extend_and_zoom(){