diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 950954cb..aa2987c1 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -161,6 +161,10 @@ a.logo {
margin: 6px 8px 6px 0;
}
+.welcomeimage {
+ float: right;
+}
+
.fine_print {
font-size: 0.8em;
}
@@ -198,6 +202,20 @@ footer {
display:block;
}
+.media_pane {
+ border-bottom: 1px solid #333333;
+}
+
+.media_sidebar {
+ border-left: 1px solid #333333;
+ padding-left: 1em;
+ padding-top: 1em;
+}
+
+.media_comments {
+ padding-top: 1em;
+}
+
/* common website elements */
.button_action, .button_action_highlight, .button_form {
@@ -221,6 +239,17 @@ footer {
color: #283F35;
}
+.button_info {
+ background-color: #508BB5;
+ border-color: #5899C7 #437699 #427496;
+ color: #C3C3C3;
+}
+
+.button_warning {
+ background-color: #8A2D2D;
+ border-color: #913030 #451717 #431212;
+ color: #C3C3C3;
+}
.button_form {
min-width: 99px;
@@ -245,6 +274,13 @@ text-align: center;
padding-top: 70px;
}
+.no_background {
+ background-image: none;
+ height: 0;
+ padding-top: 0;
+ display: inline-block;
+}
+
.right_align {
float: right;
}
@@ -274,13 +310,13 @@ text-align: center;
}
.media_sidebar h3 {
- font-size: 1em;
- margin: 0 0 5px;
- border: none;
+ font-size: 1em;
+ margin: 0 0 5px;
+ border: none;
}
.media_sidebar p {
- margin-left: 8px;
+ margin-left: 8px;
}
.alpha {
@@ -816,6 +852,7 @@ pre {
.button_action, .button_action_highlight, .button_form {
padding: 5px 14px;
+ margin-bottom: 0.5em;
}
}
@@ -861,6 +898,25 @@ pre {
.header_right {
text-align: center;
}
+
+ .welcomeimage {
+ float: none;
+ display: inherit;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 1em;
+ }
+
+ .media_sidebar {
+ border-left: none;
+ padding-left: 0;
+ padding-top: 1em;
+ margin-top: 1em;
+ }
+
+ .media_comments {
+ border-bottom: 1px solid #333333;
+ }
}
/* Exif display */
diff --git a/mediagoblin/templates/mediagoblin/banned.html b/mediagoblin/templates/mediagoblin/banned.html
index 0b5a6884..151f2b9c 100644
--- a/mediagoblin/templates/mediagoblin/banned.html
+++ b/mediagoblin/templates/mediagoblin/banned.html
@@ -21,7 +21,7 @@
{% block mediagoblin_content %}
+ alt="{% trans %}Image of goblin stressing out{% endtrans %}" style="max-width:100%;"/>
{% trans %}This site is running MediaGoblin, an extraordinarily great piece of media hosting software.{% endtrans %}
- {% if auth %} -{% trans %}To add your own media, place comments, and more, you can log in with your MediaGoblin account.{% endtrans %}
- {% if allow_registration %} -{% trans %}Don't have one yet? It's easy!{% endtrans %}
- +{% trans %}This site is running MediaGoblin, an extraordinarily great piece of media hosting software.{% endtrans %}
+ {% if auth %} +{% trans %}To add your own media, place comments, and more, you can log in with your MediaGoblin account.{% endtrans %}
+ {% if allow_registration %} +{% trans %}Don't have one yet? It's easy!{% endtrans %}
+ Create an account at this site + or + {%- endtrans %} {% endif %} - {% trans %} - >Create an account at this site - or - {%- endtrans %} - {% endif %} - {% endif %} - {% trans %} - Set up MediaGoblin on your own server - {%- endtrans %} - + {% endif %} + {% trans %} + Set up MediaGoblin on your own server + {%- endtrans %} +{{ err_msg|safe }}
diff --git a/mediagoblin/templates/mediagoblin/moderation/user.html b/mediagoblin/templates/mediagoblin/moderation/user.html index 67c3ae27..a98d756b 100644 --- a/mediagoblin/templates/mediagoblin/moderation/user.html +++ b/mediagoblin/templates/mediagoblin/moderation/user.html @@ -43,7 +43,7 @@{% trans %}Sorry, no such user found.{% endtrans %}
@@ -100,7 +100,7 @@ {% endif %}