aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJef van Schendel <jefvanschendel@gmail.com>2011-05-26 00:41:13 +0200
committerJef van Schendel <jefvanschendel@gmail.com>2011-05-26 00:41:13 +0200
commit4fdd1021759bd41565fd5aba22320dd8ade72a20 (patch)
treef0b2b85dee21965f804b818a09955172ff083c88
parent38aa4a4026ab328fe00a145daa90bbe1eceb5caf (diff)
downloadmediagoblin-4fdd1021759bd41565fd5aba22320dd8ade72a20.tar.lz
mediagoblin-4fdd1021759bd41565fd5aba22320dd8ade72a20.tar.xz
mediagoblin-4fdd1021759bd41565fd5aba22320dd8ade72a20.zip
We now have only one button style
-rw-r--r--mediagoblin/static/css/base.css37
-rw-r--r--mediagoblin/static/images/button_green.pngbin2054 -> 0 bytes
-rw-r--r--mediagoblin/static/images/button_red.pngbin1737 -> 0 bytes
-rw-r--r--mediagoblin/templates/mediagoblin/auth/login.html4
-rw-r--r--mediagoblin/templates/mediagoblin/auth/register.html2
-rw-r--r--mediagoblin/templates/mediagoblin/submit/start.html2
-rw-r--r--mediagoblin/templates/mediagoblin/test_submit.html2
7 files changed, 19 insertions, 28 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 9e5fdcce..d2bc92a0 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -56,20 +56,20 @@ label {
float:right;
}
-.button_red, .button_green {
- font-family: 'Carter One', arial, serif;
- height: 28px;
- min-width: 99px;
- box-shadow: 0px 0px 5px #000;
- border-radius: 5px;
- border: none;
- color: #272727;
- margin: 10px;
- font-size: 1em;
- float: left;
- display: block;
- text-align: center;
- padding-top: 4px;
+.button {
+ font-family:'Carter One', arial, serif;
+ height:32px;
+ min-width:99px;
+ background-color:#86d4b1;
+ box-shadow:0px 0px 4px #000;
+ border-radius:5px;
+ border:none;
+ color:#272727;
+ margin:10px;
+ font-size:1em;
+ float:left;
+ display:block;
+ text-align:center;
padding-left:11px;
padding-right:11px;
}
@@ -84,12 +84,3 @@ label {
left:0px;
margin-top:-20px;
}
-
-.button_red {
- background-image: url('../images/button_red.png');
-}
-
-.button_green {
- background-image: url('../images/button_green.png');
-}
-
diff --git a/mediagoblin/static/images/button_green.png b/mediagoblin/static/images/button_green.png
deleted file mode 100644
index 0fc234d4..00000000
--- a/mediagoblin/static/images/button_green.png
+++ /dev/null
Binary files differ
diff --git a/mediagoblin/static/images/button_red.png b/mediagoblin/static/images/button_red.png
deleted file mode 100644
index b0f7dcad..00000000
--- a/mediagoblin/static/images/button_red.png
+++ /dev/null
Binary files differ
diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html
index 47b8393d..02bfb91f 100644
--- a/mediagoblin/templates/mediagoblin/auth/login.html
+++ b/mediagoblin/templates/mediagoblin/auth/login.html
@@ -33,12 +33,12 @@
{{ wtforms_util.render_table(login_form) }}
<tr>
<td></td>
- <td><input type="submit" value="submit" class="button_green"/></td>
+ <td><input type="submit" value="submit" class="button"/></td>
</tr>
</table>
{% if next %}
- <input type="hidden" name="next" value="{{ next }}" class="button_green" />
+ <input type="hidden" name="next" value="{{ next }}" class="button" />
{% endif %}
</form>
{% endblock %}
diff --git a/mediagoblin/templates/mediagoblin/auth/register.html b/mediagoblin/templates/mediagoblin/auth/register.html
index ee2f425b..610c7cc4 100644
--- a/mediagoblin/templates/mediagoblin/auth/register.html
+++ b/mediagoblin/templates/mediagoblin/auth/register.html
@@ -26,7 +26,7 @@
{{ wtforms_util.render_table(register_form) }}
<tr>
<td></td>
- <td><input type="submit" value="submit" class="button_green" /></td>
+ <td><input type="submit" value="submit" class="button" /></td>
</tr>
</table>
</form>
diff --git a/mediagoblin/templates/mediagoblin/submit/start.html b/mediagoblin/templates/mediagoblin/submit/start.html
index 8b446417..8fdbe4ed 100644
--- a/mediagoblin/templates/mediagoblin/submit/start.html
+++ b/mediagoblin/templates/mediagoblin/submit/start.html
@@ -28,7 +28,7 @@
{{ wtforms_util.render_table(submit_form) }}
<tr>
<td></td>
- <td><input type="submit" value="submit" class="button_green" /></td>
+ <td><input type="submit" value="submit" class="button" /></td>
</tr>
</table>
</form>
diff --git a/mediagoblin/templates/mediagoblin/test_submit.html b/mediagoblin/templates/mediagoblin/test_submit.html
index 86cf4655..5bf8c317 100644
--- a/mediagoblin/templates/mediagoblin/test_submit.html
+++ b/mediagoblin/templates/mediagoblin/test_submit.html
@@ -25,7 +25,7 @@
{{ wtforms_util.render_table(image_form) }}
<tr>
<td></td>
- <td><input type="submit" value="submit" class="button_green" /></td>
+ <td><input type="submit" value="submit" class="button" /></td>
</tr>
</table>
</form>