Permalink
Browse files

Merge branch 'master' into customizations

  • Loading branch information...
hellerbarde committed Apr 7, 2012
2 parents 7fcab33 + 4b65387 commit 79af500bdf3986be9395d72f47020871a4615400
Showing with 9 additions and 7 deletions.
  1. +1 −0 create_config.py
  2. +7 −6 static/css/posts.css
  3. +1 −1 static/js/functions.js
View
@@ -8,6 +8,7 @@ def input_with_default(prompt, default):
with open("settings.py", "w") as fd:
print "Generating a Simple config file. Please answer some questions:"
+ fd.write("# -*- coding: utf-8 -*-\n\n")
fd.write("POSTS_PER_PAGE = %s\n"%input_with_default("Posts per page", 5))
fd.write("ADMIN_USERNAME = '%s'\n"%input_with_default("Admin username","admin"))
fd.write("ADMIN_PASSWORD = '%s'\n"%generate_password_hash(input_with_default("Admin password","password")) )
View
@@ -143,14 +143,15 @@ fieldset.markdown {
position: absolute;
top: 4px;
left: -60px;
- background: url(/assets/markdown.png) no-repeat top left; }
+ background: url(../markdown.png) no-repeat top left; }
#post_title {
width: 100%;
border: none;
background: none;
line-height: 45px;
- margin: 0 0 20px 0; }
+ margin: 0 0 20px 0 !important;
+ height: auto !important; }
#post_content {
border: none;
@@ -345,16 +346,16 @@ label {
box-sizing: border-box;
width: 100%;
/* This height is used when JS is disabled */
- height: 100px; }
+ height: 100px;
+ /* Remove WebKit user-resize widget */
+ resize: none; }
#admin .expandingArea.active > textarea {
/* Hide any scrollbars */
overflow: hidden;
position: absolute;
top: 0;
left: 0;
- height: 100%;
- /* Remove WebKit user-resize widget */
- resize: none; }
+ height: 100%; }
#admin .expandingArea > pre {
display: none; }
#admin .expandingArea.active > pre {
View
@@ -1,7 +1,7 @@
// 100% stolen from yiransheng/simple
$.fn.autogrow = function(options) {
- this.filter('textarea').each(function() {
+ this.filter('textarea :not(#post_title)').each(function() {
var $this = $(this),
minHeight = $this.height(),

0 comments on commit 79af500

Please sign in to comment.