aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin J. Novack <jnovack@gmail.com>2012-10-07 00:27:28 -0400
committerChristian Weiske <cweiske@cweiske.de>2012-10-24 15:00:42 +0200
commit5e7a8bf3186efe29c487b8a32107ee8f24152a38 (patch)
treedcabdc7cee83b292bffa5d0a7227017ea10814fc
parent9cbf7fdfaa302181f988bce8d594ed7fee67c837 (diff)
downloadphorkie-5e7a8bf3186efe29c487b8a32107ee8f24152a38.tar.gz
phorkie-5e7a8bf3186efe29c487b8a32107ee8f24152a38.zip
Properly align 'Description' field in all widths
-rw-r--r--data/templates/edit.htm8
-rw-r--r--data/templates/new.htm8
-rw-r--r--www/css/phorkie.css20
3 files changed, 19 insertions, 17 deletions
diff --git a/data/templates/edit.htm b/data/templates/edit.htm
index 521a7c2..db1f3f5 100644
--- a/data/templates/edit.htm
+++ b/data/templates/edit.htm
@@ -6,10 +6,12 @@
{% endblock %}
{% block content %}
-<form method="post" action="{{repo.getLink('edit')}}" enctype="multipart/form-data">
- <div class="control-group pastedata">
- <label for="description">Description</label>
+<form method="post" action="{{repo.getLink('edit')}}" enctype="multipart/form-data" class="form-horizontal">
+ <div class="control-group">
+ <label class="control-label" for="description">Description</label>
+ <div class="controls">
<input type="text" name="description" id="description" value="{{repo.getDescription}}"/>
+ </div>
</div>
{% for fileid, file in repo.getFiles %}
diff --git a/data/templates/new.htm b/data/templates/new.htm
index 4a748bf..295b76d 100644
--- a/data/templates/new.htm
+++ b/data/templates/new.htm
@@ -2,10 +2,12 @@
{% block title %}New paste{% endblock %}
{% block content %}
-<form method="post" action="/new" enctype="multipart/form-data">
- <div class="control-group pastedata">
- <label for="description">Description</label>
+<form method="post" action="/new" enctype="multipart/form-data" class="form-horizontal">
+ <div class="control-group">
+ <label class="control-label" for="description">Description</label>
+ <div class="controls">
<input type="text" name="description" id="description" value="{{description}}"/>
+ </div>
</div>
{% include 'edit-file.htm' with {'file': file[1], 'fileid': 0, 'newfile': true} %}
diff --git a/www/css/phorkie.css b/www/css/phorkie.css
index f5de225..1b524f7 100644
--- a/www/css/phorkie.css
+++ b/www/css/phorkie.css
@@ -108,17 +108,6 @@ ul.pager {
margin-top: 2ex;
}
-.pastedata label {
- display: block;
- float: left;
- width: 100px;
- margin-top: 4px;
-}
-.pastedata input {
- display: block;
- margin-left: 110px;
- width: 590px !important;
-}
.formbuttons {
margin-top: 2ex;
}
@@ -153,6 +142,15 @@ form label.inline {
display: inline;
}
+.form-horizontal .control-label {
+ text-align: left;
+ width: 8em;
+}
+
+.form-horizontal .controls {
+ margin-left: 8em;
+}
+
.btn [class^="icon-"], .btn [class*=" icon-"] {
line-height: 1.1em;
}