diff options
author | Byron <byroncorrales@gmail.com> | 2011-10-30 21:58:39 -0600 |
---|---|---|
committer | Byron <byroncorrales@gmail.com> | 2011-10-30 21:58:39 -0600 |
commit | f197112012da87776b3d70452b015693701031bd (patch) | |
tree | e2190088c3868c0f7019d8ff720146b4108f5080 | |
parent | b5429ecf161380d8efe1d186554566d8d7e03793 (diff) | |
download | askbot-f197112012da87776b3d70452b015693701031bd.tar.gz askbot-f197112012da87776b3d70452b015693701031bd.tar.bz2 askbot-f197112012da87776b3d70452b015693701031bd.zip |
Style for login and people pages
-rw-r--r-- | askbot/skins/common/media/jquery-openid/openid.css | 2 | ||||
-rw-r--r-- | askbot/skins/common/templates/authopenid/logout.html | 2 | ||||
-rw-r--r-- | askbot/skins/common/templates/authopenid/signin.html | 4 | ||||
-rw-r--r-- | askbot/skins/default/media/images/summary-background.png | bin | 291 -> 233 bytes | |||
-rw-r--r-- | askbot/skins/default/media/style/style.css | 147 | ||||
-rw-r--r-- | askbot/skins/default/templates/users.html | 6 |
6 files changed, 109 insertions, 52 deletions
diff --git a/askbot/skins/common/media/jquery-openid/openid.css b/askbot/skins/common/media/jquery-openid/openid.css index da541e45..e44e5478 100644 --- a/askbot/skins/common/media/jquery-openid/openid.css +++ b/askbot/skins/common/media/jquery-openid/openid.css @@ -1,4 +1,4 @@ -div#login-icons {margin:10px 0 0 0;padding:0} +div#login-icons {margin:10px 0 0 0;padding:10px;border:#eee 1px solid;} ul.login-icons {width: 450px; margin:0;padding:0;text-align:left; list-style-type:none; display:block;} ul.login-icons li {display:inline;} ul.large input {height: 40px; width: 90px;border:1px solid #ccc;margin:0 5px 5px 0;} diff --git a/askbot/skins/common/templates/authopenid/logout.html b/askbot/skins/common/templates/authopenid/logout.html index a07b78d1..1ac6705c 100644 --- a/askbot/skins/common/templates/authopenid/logout.html +++ b/askbot/skins/common/templates/authopenid/logout.html @@ -2,7 +2,7 @@ <!-- template logout.html --> {% block title %}{% spaceless %}{% trans %}Logout{% endtrans %}{% endspaceless %}{% endblock %} {% block content %} -<h1>{% trans %}You have successfully logged out{% endtrans %}</h1> +<h1 class="section-title">{% trans %}You have successfully logged out{% endtrans %}</h1> {% if have_federated_login_methods %} <p>{% trans %}However, you still may be logged in to your OpenID provider. Please logout of your provider if you wish to do so.{% endtrans %}</p> {% if settings.FACEBOOK_KEY and settings.FACEBOOK_SECRET %} diff --git a/askbot/skins/common/templates/authopenid/signin.html b/askbot/skins/common/templates/authopenid/signin.html index f10d0cd0..4c894aa3 100644 --- a/askbot/skins/common/templates/authopenid/signin.html +++ b/askbot/skins/common/templates/authopenid/signin.html @@ -7,7 +7,7 @@ {% endblock %}
{% block content %}
{% if have_buttons or view_subtype == 'email_sent' %}
- <h1>{{page_title}}</h1>
+ <h1 class="section-title">{{page_title}}</h1>
{% endif %}
{% if answer %}
<div class="message">
@@ -212,7 +212,7 @@ {% block sidebar %}
{% if have_buttons %}
- <div class="boxC">
+ <div class="box">
<h2>{% trans %}Why use OpenID?{% endtrans %}</h2>
<ul>
<li>
diff --git a/askbot/skins/default/media/images/summary-background.png b/askbot/skins/default/media/images/summary-background.png Binary files differindex 58c3855a..28a6a398 100644 --- a/askbot/skins/default/media/images/summary-background.png +++ b/askbot/skins/default/media/images/summary-background.png diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css index fbf8d56c..7592da73 100644 --- a/askbot/skins/default/media/style/style.css +++ b/askbot/skins/default/media/style/style.css @@ -143,7 +143,7 @@ a:hover { h1 { font-size: 160%; - padding: 10px 0 5px 5px; + padding: 10px 0 5px 0px; } /* ----- Custom positions ----- */ @@ -504,9 +504,10 @@ h1 { li { list-style-type: disc; - font-size: 13px; + font-size: 16px; line-height: 20px; margin-bottom: 10px; + color:@info-text; } ul.tags { list-style: none; @@ -1918,8 +1919,106 @@ span.delete-icon:hover { } +/* -----Content pages, Login, About, FAQ, Users----- */ + +.openid-signin, +.meta, +.users-page, +{ + p{ + font-size:15px; + color:@info-text; + } + h2{ + color:@info-text-dark; + padding-left:0px; + } +} + +#email-input-fs,#local_login_buttons,#password-fs,#openid-fs{ + margin-top:10px; + #id_email,#id_username,#id_password,input{ + font-size: 12px; + line-height: 20px; + height: 20px; + margin: 0px; + padding: 0px 0 0 5px; + border:#cce6ec 3px solid; + width:200px; + } + .submit-b{ + background:url(../images/small-button-blue.png) repeat-x top; + border:0; + color:@button-label; + font-weight:bold; + font-size:12px; + height:24px; + margin-top:-2px; + cursor:pointer; + .rounded-corners(4px); + .text-shadow(0px,1px,0px,#E6F6FA); + .box-shadow(1px, 1px, 2px, #808080) + } + .submit-b:hover{ + background:url(../images/small-button-blue.png) repeat-x bottom; + } +} +.openid-input { + background: url(../images/openid.gif) no-repeat; + padding-left: 15px; + cursor: pointer; +} + +.openid-login-input { + background-position: center left; + background: url(../images/openid.gif) no-repeat 0% 50%; + padding: 5px 5px 5px 15px; + cursor: pointer; + font-family: Trebuchet MS; + font-weight: 300; + font-size: 150%; + width: 500px; +} +.openid-login-submit { + height: 40px; + width: 80px; + line-height: 40px; + cursor: pointer; + border: 1px solid #777; + font-weight: bold; + font-size: 120%; +} +/* People page */ + +.tabBar-user{ + width:375px; +} +.user { + padding: 5px; + line-height: 140%; + width: 166px; + border:#eee 1px solid; + margin-bottom:5px; + .rounded-corners(3px); + .user-micro-info{ + color:@info-text-dark; + } + +} + +.user ul { + margin: 0; + list-style-type: none; +} + +.user .thumb { + clear: both; + float: left; + margin-right: 4px; + display: inline; +} /* ----- Footer links , check blocks/footer.html----- */ @@ -2088,32 +2187,6 @@ label.retag-error { padding: 10px; } -.openid-input { - background: url(../images/openid.gif) no-repeat; - padding-left: 15px; - cursor: pointer; -} - -.openid-login-input { - background-position: center left; - background: url(../images/openid.gif) no-repeat 0% 50%; - padding: 5px 5px 5px 15px; - cursor: pointer; - font-family: Trebuchet MS; - font-weight: 300; - font-size: 150%; - width: 500px; -} - -.openid-login-submit { - height: 40px; - width: 80px; - line-height: 40px; - cursor: pointer; - border: 1px solid #777; - font-weight: bold; - font-size: 120%; -} span.form-error { color: #990000; @@ -2424,24 +2497,6 @@ a.offensive { color: #999; } -.user { - padding: 5px; - line-height: 140%; - width: 170px; -} - -.user ul { - margin: 0; - list-style-type: none; -} - -.user .thumb { - clear: both; - float: left; - margin-right: 4px; - display: inline; -} - .message h1 { padding-top: 0px; font-size: 15px; diff --git a/askbot/skins/default/templates/users.html b/askbot/skins/default/templates/users.html index 1d7d02dd..0502a6e5 100644 --- a/askbot/skins/default/templates/users.html +++ b/askbot/skins/default/templates/users.html @@ -3,9 +3,10 @@ <!-- users.html --> {% block title %}{% spaceless %}{% trans %}Users{% endtrans %}{% endspaceless %}{% endblock %} {% block content %} -<div class="tabBar"> - <h1>{% trans %}Users{% endtrans %}</h1> +<h1 class="section-title">{% trans %}Users{% endtrans %}</h1> +<div class="tabBar tabBar-user"> <div class="tabsA"> + <span class="label">{% trans %}Sort by »{% endtrans %}</span> <a id="sort_reputation" href="{% url users %}?sort=reputation" @@ -32,6 +33,7 @@ ><span>{% trans %}by username{% endtrans %}</span></a> </div> </div> +<div class="clean"></div> <p> {% if suser %} {% trans %}users matching query {{suser}}:{% endtrans %} |