strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #78 from simonlnu/master

Browse source 
fix ui issue with toolbar and notification icons
This commit is contained in:
Simon 2012-03-04 11:56:19 -08:00
parent c0ecd7a925 25510453bf
commit 550a98aaae
2 changed files with 49 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
view/theme/dispy/nav.tpl
View file

@ -11,6 +11,10 @@ works -->
{{ if $nav.help }} {{ if $nav.help }}
<a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a> <a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a>
{{ endif }} {{ endif }}
{{ if $nav.community }}
<a id="nav-community-link" class="nav-link $nav.community.2"
href="$nav.community.0" title="$nav.community.1">$nav.community.1</a>
{{ endif }}
{{ if $nav.apps }} {{ if $nav.apps }}
<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a> <a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>
{{ endif }} {{ endif }}
@ -28,10 +32,6 @@ works -->
<li class="empty">$emptynotifications</li> <li class="empty">$emptynotifications</li>
</ul> </ul>
{{ endif }} {{ endif }}
{{ if $nav.community }}
<a id="nav-community-link" class="nav-link $nav.community.2"
href="$nav.community.0" title="$nav.community.1">$nav.community.1</a>
{{ endif }}
{{ if $nav.network }} {{ if $nav.network }}
<a id="nav-network-link" class="nav-link $nav.network.2" <a id="nav-network-link" class="nav-link $nav.network.2"
href="$nav.network.0" title="$nav.network.1">$nav.network.1</a> href="$nav.network.0" title="$nav.network.1">$nav.network.1</a>
@ -106,6 +106,7 @@ works -->
<a id="mail-update" class="nav-ajax-left" href="$nav.messages.0" title="$nav.messages.1"></a> <a id="mail-update" class="nav-ajax-left" href="$nav.messages.0" title="$nav.messages.1"></a>
{{ endif }} {{ endif }}
</div> </div>
</div> </div>
<a href="#" class="floaterflip"></a> <a href="#" class="floaterflip"></a>
</nav> </nav>

50
view/theme/dispy/style.css
View file

@ -81,17 +81,18 @@ mark {
font-weight: bold; font-weight: bold;
} }
/* Redeclare monospace font family: h5bp.com/j */ /* Redeclare monospace font family: h5bp.com/j */
pre, code, kbd, samp { pre, code, kbd, samp, .wall-item-body code {
font-family: monospace, monospace; font-family: monospace, monospace;
_font-family: 'courier new', monospace; _font-family: 'courier new', monospace;
font-size: 1em; } font-size: 1em; }
/* Improve readability of pre-formatted text in all browsers */ /* Improve readability of pre-formatted text in all browsers */
pre { pre, .wall-item-body code {
white-space: pre; white-space: pre;
white-space: pre-wrap; white-space: pre-wrap;
word-wrap: break-word; word-wrap: break-word;
} }
q { q {
quotes: none; quotes: none;
} }
@ -287,6 +288,11 @@ ul#user-menu-popup li a.nav-sep {
} }
#nav-buttons { #nav-buttons {
clear: both; clear: both;
list-style: none;
padding: 0px;
}
#nav-buttons li {
padding: 0;
} }
nav .nav-link { nav .nav-link {
float: right; float: right;
@ -469,17 +475,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
width: 30px; width: 30px;
height: 19px; height: 19px;
background: transparent url(notifications.png) 0 0 no-repeat; background: transparent url(notifications.png) 0 0 no-repeat;
color: #fff; color: #222;
font-weight: bold; font-weight: bold;
font-size: 0.8em; font-size: 0.8em;
padding-top: 0.2em; padding-top: 0.2em;
text-align: center; text-align: center;
float: left; float: left;
margin-right: -4px; margin: 0 -1px 0 3px;
display: none; display: block;
visibility: hidden;
} }
.nav-ajax-update.show, .nav-ajax-left.show { .nav-ajax-update.show, .nav-ajax-left.show {
display: block; visibility: visible;
} }
#net-update { #net-update {
background-position: 0px 0px; background-position: 0px 0px;
@ -1431,6 +1438,37 @@ div[id$="wrapper"] br {
#photos-upload-perms-menu { #photos-upload-perms-menu {
text-align: right; text-align: right;
} }
#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
float: left;
margin-bottom: 25px;
}
#photo-edit-link-wrap {
margin-bottom: 15px;
}
#photo-edit-caption {
width: 100%;
}
#photo-edit-newtag {
width: 100%;
}
#photo-like-div {
margin-bottom: 25px;
}
#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end {
clear: both;
}
#photo-edit-delete-button {
margin-left: 200px;
}
#photo-edit-end {
margin-bottom: 35px;
}
#photo-caption {
font-size: 110%;
font-weight: bold;
margin-top: 15px;
margin-bottom: 15px;
}
/** /**
* message * message