Skip to content

Commit

Permalink
Minor Update
Browse files Browse the repository at this point in the history
  • Loading branch information
antonydoyle committed Aug 30, 2012
1 parent e87bd86 commit 172a1f7
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 7 deletions.
14 changes: 13 additions & 1 deletion css/templateCore.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ fieldset.userdata {
}

/*article stuff ---------------------- */
article header {
overflow:hidden;
}
.actions {

}
.actions ul, ul.actions {
list-style:none;
width:200px;
Expand All @@ -29,7 +34,11 @@ fieldset.userdata {
}
.article-meta {
width:240px;
float:right;
float:right;
background: none repeat scroll 0 0 #F2F2F2;
border: 1px solid #E6E6E6;
margin: 0 0 22px;
padding: 20px;
}
.article-footer ul {
list-style:none;
Expand Down Expand Up @@ -62,6 +71,9 @@ text-align:right;
.registration {
margin-bottom:25px;
}
.button.dropdown ul.no-hover.show-dropdown {
top:28px !important;
}
/* Pagination ---------------------- */
.pagination ul { display: block; height: 24px; margin-left: -5px;}
.pagination ul li { float: left; display: block; height: 24px; color: #999; font-size: 14px; margin-left: 5px; }
Expand Down
7 changes: 4 additions & 3 deletions html/com_content/article/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,7 @@
<?php echo $this->escape($this->item->title); ?>
<?php endif; ?>
</h1>
</header>
<?php endif; ?>
<?php if ($canEdit || $params->get('show_print_icon') || $params->get('show_email_icon')) : ?>
<?php if ($canEdit || $params->get('show_print_icon') || $params->get('show_email_icon')) : ?>
<section class="actions">
<ul>
<?php if (!$this->print) : ?>
Expand Down Expand Up @@ -80,6 +78,9 @@
</ul>
</section>
<?php endif; ?>
</header>
<?php endif; ?>

<?php if (!$params->get('show_intro')) :
echo $this->item->event->afterDisplayTitle;
endif; ?>
Expand Down
5 changes: 4 additions & 1 deletion html/com_users/login/default_login.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@
</form>
</section>
<section>
<ul>
<div class="small button dropdown" href="#">
Forgot Password / Username?
<ul style="top: 28px !important;">
<li>
<a href="<?php echo JRoute::_('index.php?option=com_users&view=reset'); ?>">
<?php echo JText::_('COM_USERS_LOGIN_RESET'); ?></a>
Expand All @@ -66,5 +68,6 @@
</li>
<?php endif; ?>
</ul>
</div>
</section>

4 changes: 2 additions & 2 deletions html/mod_login/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
<input type="hidden" name="return" value="<?php echo $return; ?>" />
<?php echo JHtml::_('form.token'); ?>
</fieldset>
<div href="#" class="button dropdown">
<div href="#" class="small button dropdown">
Forgot Password / Username?
<ul>
<ul style="top: 28px;">
<li>
<a href="<?php echo JRoute::_('index.php?option=com_users&view=reset'); ?>">
<?php echo JText::_('MOD_LOGIN_FORGOT_YOUR_PASSWORD'); ?></a>
Expand Down
Binary file modified images/system/calendar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/system/edit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/system/edit_unpublished.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/system/emailButton.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/system/glyphicons_073_signal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/system/glyphicons_203_lock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/system/glyphicons_204_unlock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/system/printButton.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 172a1f7

Please sign in to comment.