From dcf12e13e868b2780c6a6e4843d32109a5d4ef36 Mon Sep 17 00:00:00 2001 From: Scott O'Hara Date: Sat, 13 Jul 2013 23:21:34 -0400 Subject: [PATCH] error and text editor updates. remove useless file --- public/assets/css/master.css | 0 views/error.slim | 13 +++++++------ views/site_files/text_editor.slim | 5 +++-- 3 files changed, 10 insertions(+), 8 deletions(-) delete mode 100644 public/assets/css/master.css diff --git a/public/assets/css/master.css b/public/assets/css/master.css deleted file mode 100644 index e69de29b..00000000 diff --git a/views/error.slim b/views/error.slim index d6014adc..a188174d 100644 --- a/views/error.slim +++ b/views/error.slim @@ -1,6 +1,7 @@ -.row - .span8.offset2.text-center - h2 Site Error - h4 There has been an error performing the requested action. - h4 We have been notified of the problem. - h5 If you need to add any special information or if this error has not been resolved in a while, contact us and report the problem. Thank you! +.page + .content-Base.txt-Center + h2 Site Error + p.eps There has been an error performing the requested action. +
+ h4 We have been notified of the problem. + p If you need to add any special information or if this error has not been resolved in a while, contact us and report the problem. Thank you! diff --git a/views/site_files/text_editor.slim b/views/site_files/text_editor.slim index e7db00ee..5b2e4f8e 100644 --- a/views/site_files/text_editor.slim +++ b/views/site_files/text_editor.slim @@ -8,7 +8,8 @@ css: } .theme-Code{ float:right; - margin-top:20px; + position:relative; + top:-50px; } .page @@ -17,7 +18,7 @@ css: h2 Editing #{params[:filename]} div.theme-Code - p Theme: + p style="display:inline-block; margin-right:10px" Theme: select id="theme" size="1" onchange="setTheme();" onkeyup="setTheme();" optgroup label="Bright" option value="ace/theme/chrome" Chrome