Commit 02a0ae6d authored by Evonne Cheung's avatar Evonne Cheung Committed by Richard Mansfield
Browse files

Theme update

parent 1de98e99
......@@ -10,6 +10,7 @@ input#myfriends_addfriend_add {
#userfriendstable a {
display: block;
font-size: .9167em;
}
#sendmessage input,
......
......@@ -3,7 +3,7 @@
<h3>{str tag="nameplural" section=interaction.forum}{if $publicgroup}<a href="{$feedlink}"><img class="feedicon" src="{theme_url filename='images/rss.gif'}"></a>{/if}</h3>
{if $admin}
<div id="forumbtns" class="rbuttons">
<a href="{$WWWROOT}interaction/edit.php?group={$groupid}&amp;plugin=forum" class="btn">{str tag="newforum" section=interaction.forum}</a>
<a href="{$WWWROOT}interaction/edit.php?group={$groupid}&amp;plugin=forum" class="btn newforum">{str tag="newforum" section=interaction.forum}</a>
</div>
{/if}
{if $forums}
......
......@@ -3,8 +3,8 @@
<h2>{str tag=nameplural section=interaction.forum} &gt; {$subheading}{if $publicgroup}<a href="{$feedlink}"><img class="feedicon" src="{theme_url filename='images/rss.gif'}"></a>{/if}</h2>
<div id="forumbtns" class="rbuttons">
{if $admin}
<a href="{$WWWROOT}interaction/edit.php?id={$forum->id}" class="btn">{str tag="edittitle" section="interaction.forum"}</a>
<a href="{$WWWROOT}interaction/delete.php?id={$forum->id}" class="btn">{str tag="deleteforum" section="interaction.forum"}</a>
<a href="{$WWWROOT}interaction/edit.php?id={$forum->id}" class="btn editforumtitle">{str tag="edittitle" section="interaction.forum"}</a>
<a href="{$WWWROOT}interaction/delete.php?id={$forum->id}" class="btn deleteforum">{str tag="deleteforum" section="interaction.forum"}</a>
{/if}
{if $membership}{$forum->subscribe|safe}{/if}
</div>
......@@ -13,7 +13,7 @@
<h3>{str tag=Topics section="interaction.forum"}</h3>
{if $membership && ($moderator || $forum->newtopicusers != 'moderators') }
<div class="rbuttons">
<a href="{$WWWROOT}interaction/forum/edittopic.php?forum={$forum->id}" class="btn">{str tag="newtopic" section="interaction.forum"}</a>
<a href="{$WWWROOT}interaction/forum/edittopic.php?forum={$forum->id}" class="btn newforumtopic">{str tag="newtopic" section="interaction.forum"}</a>
</div>
{/if}
{if $stickytopics || $regulartopics}
......
......@@ -533,6 +533,25 @@ span.btn a.icon, a span.icon {
cursor: pointer;
color: #0000ee;
}
/* bolding some buttons */
#editgroup #editgroup_submit,
#editblog #editblog_submit,
#editpost #editpost_submitpost,
.fileedittable #files_filebrowser_edit_artefact,
#profileform #profileform_submit,
#view-wizard-controls input.submit,
#editview #editview_submit,
#viewlayout input.submit,
#add_feedback_form #add_feedback_form_submit,
#objection_form #objection_form_submit,
.submitcancel .submit,
#export #export_submit,
#forumbtns a.editforumtitle,
#viewforum a.newforumtopic,
#forumbtns a.newforum {
font-weight: bold;
}
div.btn-del input.submit, input.submit.btn-del, div.btn-add input.submit, input.submit.btn-add, button.btn-add, div.btn-msg input.submit, div.btn-edit input.submit, .btn-reply, .btn-subscribe input.submit {
* width: 1;
* overflow: visible;
......@@ -1019,6 +1038,9 @@ ul.edit-view-tabs li a.current-tab, ul.in-page-tabs li a.current-tab:link, ul.ed
min-height: 0; /* IE layout hack */
* padding-top: 2px;
}
div.rel {
* position: static;
}
.twocolumn div.rel {
margin-left: 50px;
font-size: .9167em;
......@@ -1381,6 +1403,9 @@ a.tag {
.help a:focus {
outline: none;
}
.rbuttons .help a {
* display: inline;
}
.page-help-icon .help {
vertical-align: middle;
font-size: .4em;
......@@ -1490,12 +1515,32 @@ table.attachments td {
}
#userview .user-icon {
font-size: .9167em;
margin: 0 0 10px 0;
margin: 0 0 5px 0;
text-align: center;
}
#userview #invite, #userview #addmember {
margin-top: 10px;
}
#userview .invitedtojoin,
#userview .requestedmembership {
padding-left: 15px;
font-size: .9167em;
margin: 0 0 5px 0;
text-align: center;
display: block;
}
#userview .addform {
display: block;
text-align: center;
margin: 0 0 5px 0;
font-size: .9167em;
}
#userview .addform form, #userview .addform form div {
display: inline;
}
#userview .addform form select {
font-size: 1em;
}
/* Profile icons */
#userview .user-icon a {
margin: 0 0 0 10px;
......@@ -1507,13 +1552,6 @@ table.attachments td {
padding: 3px 5px 0 0;
text-align: center;
}
#userview .user-icon .addform {
display: inline;
margin-left: 10px;
}
#userview .user-icon .addform form, #userview .user-icon .addform form div {
display: inline;
}
/* Wall */
.wallpost {
border-bottom: 2px solid #FFF;
......@@ -1685,6 +1723,9 @@ table.attachments td {
#potentialpresetitems div.preset {
font-weight: bold;
}
#potentialpresetitems div button {
font-size: .9167em;
}
#potentialpresetitems h3 {
margin: 0;
font-size: 1.1667em;
......@@ -1717,6 +1758,13 @@ table.attachments td {
float: right;
width: 65%;
}
#editpost_filebrowser_selectlist td.right input.unselect,
#viewacl-advanced #results button {
font-size: .9167em;
}
#templatesearch_table {
margin-bottom: 10px;
}
.main-column .accesslist-head1 th {
border-bottom: none;
padding: 0 5px;
......@@ -1770,7 +1818,7 @@ table.attachments td {
#editaccess #editaccess_views_container {
border: 1px solid #d1d1d1;
background: #eee;
padding: 5px 10px;
padding: 10px;
margin-bottom: 5px;
}
#editaccess #editaccess_accesslist_container {
......@@ -1837,18 +1885,14 @@ table.attachments td {
line-height: 1.3333em;
padding-bottom: 5px;
}
#export fieldset {
padding: 5px;
margin: 5px;
}
#export .view {
float: left;
padding-right: 20px;
white-space: nowrap;
}
#export fieldset {
margin-top: 0;
margin-left: 20px;
padding: 5px 5px 10px 5px;
margin: 0 5px 5px 20px;
border: 1px solid #d1d1d1;
background: #eee;
}
......@@ -1867,11 +1911,13 @@ table.attachments td {
}
#export fieldset table div {
padding: 0 0 0 20px;
* padding: 0 0 0 25px;
font-size: .9167em;
line-height: 1.4em;
}
#export fieldset table div p {
margin: 0 0 5px 0;
line-height: 1.2em;
}
#export fieldset label {
font-size: normal;
......@@ -1886,7 +1932,7 @@ table.attachments td {
}
#export #whatviewsselection {
width: 96%;
margin: 0 auto;
margin: 5px;
}
#export #whatviewsselection a {
padding: 0 3px;
......@@ -2058,6 +2104,7 @@ div.groupbox li.last {
margin: 0;
border-top: 1px solid #d1d1d1;
padding: 2px 3px;
line-height: 1.2em;
}
#friendslist ul.actionlist li:first-child {
border-top: none;
......@@ -2070,7 +2117,7 @@ form#search, form#filter, div.searchform, #searchviews {
}
#friendslist ul.viewlist {
margin: 0;
font-size: 1em;
font-size: .9167em;
}
#friendslist ul.viewlist li.label {
background: none;
......@@ -2090,6 +2137,10 @@ form#search, form#filter, div.searchform, #searchviews {
min-height: 35px;
padding: 5px 0 0 0;
margin-left: 50px;
margin-right: 200px;
}
.userintro br {
line-height: .3333em;
}
.requested {
font-style: italic;
......@@ -2102,7 +2153,6 @@ form#search, form#filter, div.searchform, #searchviews {
.group-info {
background-color: #eee;
padding: 10px;
* padding: 0 10px 10px 10px;
border: 10px solid #ddd;
margin: 0 0 10px 0;
}
......@@ -2208,6 +2258,9 @@ form#search, form#filter, div.searchform, #searchviews {
position: relative;
top: -30px;
}
#delete_all_notifications td {
text-align: right;
}
#activitylist td.right input.submit {
font-weight: bold;
}
......@@ -2385,11 +2438,9 @@ img.feedicon {
font-weight: bold;
font-size: 1.1667em;
}
.topicforum {
}
.poster {
font-style: italic;
}
.owner {
font-style: italic;
}
\ No newline at end of file
}
......@@ -69,7 +69,7 @@
{/foreach}
</ul>
{/if}
{if $user->introduction}{$user->introduction|str_shorten_html:100:true|safe}{/if}
{if $user->introduction}<div class="s userintro">{$user->introduction|str_shorten_html:100:true|safe}</div>{/if}
{if $user->pending}
<div class="btn-pending s">
<label>
......
......@@ -33,18 +33,22 @@
{elseif $relationship == 'none' && $friendscontrol == 'auth'}
<a href="{$WWWROOT}user/requestfriendship.php?id={$USERID}&amp;returnto=view" class="btn-friend">{str tag='requestfriendship' section='group'}</a>
{/if}
</div>
{if $invitedlist}
<div>{str tag=groupinvitesfrom section=group}{$invitedlist}</div>
<span class="invitedtojoin"><label>{str tag=groupinvitesfrom section=group}</label> {$invitedlist}</span>
{/if}
{if $inviteform}
<span class="addform">{$inviteform|safe}</span>
<span class="addform">{$inviteform|safe}</span>
{/if}
{if $requestedlist}
<div>{str tag=requestedmembershipin section=group}{$requestedlist}</div>
<span class="requestedmembership"><label>{str tag=requestedmembershipin section=group}</label> {$requestedlist}
{/if}
{if $addform}<span class="addform">{$addform|safe}</span>{/if}
<div class="cb"></div>
</div>
{if $addform}
<span class="addform">{$addform|safe}</span>
{/if}
<div class="cb"></div>
</div>
<div id="view" class="cl">
<div id="bottom-pane">
......
......@@ -122,7 +122,7 @@
/********************** Bottom pane of Edit View *************************/
html>body #column-container {
* width: 100%;
* width: 98%;
}
#blocksinstruction {
padding: 3px 10px;
......@@ -921,6 +921,9 @@ table td div.plan_completed {
#latestforumposts td h4 {
margin-bottom: 0;
}
#latestforumposts td div.s br {
line-height: .5em;
}
table.resumecomposite {
width: 100%;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment