friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #232 from simonlnu/master

Browse source 
neat little changes. hopefully the shadow will be well recieved
This commit is contained in:
Simon 2012-04-13 16:31:25 -07:00
parent bfb821e918 6b46fe3dfe
commit 5877587e6e
14 changed files with 128 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
view/theme/dispy-dark/default.php
View file

@ -1,13 +1,13 @@
<!DOCTYPE html>
<html>
<head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
<title><?php if(x($page,'title')) echo $page['title']; ?></title>
<script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
<?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
</head>
<body>
<header>
<!-- header stuff will go here -->
<?php if(x($page, 'header')) echo $page['header']; ?>
</header>
<article id="articlemain">
<?php if(x($page,'nav')) echo $page['nav']; ?>

4
view/theme/dispy-dark/head.tpl
View file

@ -91,8 +91,4 @@
$('#hide-comments-' + id).html('$showfewer');
}
}
</script>

0
view/theme/dispy-dark/header.tpl Normal file
View file

2
view/theme/dispy-dark/jot-header.tpl
View file

@ -36,7 +36,7 @@ function initEditor(cb) {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_p_newlines : true,
force_br_newlines : true,
forced_root_block : '',
convert_urls: false,

8
view/theme/dispy-dark/nav.tpl
View file

@ -4,7 +4,7 @@
<!-- yes, they're going the other way. seems that's how the template renderer
works -->
<a name="top" id="top"></a>
<div id="nav-floater">
<div id="nav-buttons">
{{ if $nav.help }}
@ -116,6 +116,12 @@ works -->
$langselector
</div>
<div id="scrollup">
<a href="#top"><img
src="view/theme/dispy/icons/scroll_top.png"
alt="back to top" title="Back to top" /></a>
</div>
<div class="search-box">
<form method="get" action="$nav.search.0">
<input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />

37
view/theme/dispy-dark/style.css
View file

@ -311,6 +311,7 @@ ul#user-menu-popup {
-webkit-border-radius: 0 0 5px 5px;
-moz-border-radius: 0 0 5px 5px;
border-radius: 0 0 5px 5px;
box-shadow: 5px 10px 10px 0 #111;
z-index: 10000;
}
ul#user-menu-popup li {
@ -543,7 +544,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
width: 10em;
color: #eec;
}
#scrollup {
position: fixed;
right: 5px;
bottom: 40px;
z-index: 100;
}
#scrollup a:hover {
text-decoration: none;
border: 0;
}
#user-menu {
box-shadow: 5px 0 10px 0 #111;
display: block;
width: 75%;
margin: 3px 0 0 0;
@ -880,12 +892,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
line-height: 20px;
padding: 2px 20px 5px 0;
}
#profile-jot-text_parent {
/*border-radius: 10px;*/
box-shadow: 5px 0 10px 0 #111;
}
#profile-jot-text_tbl {
margin-bottom: 10px;
/*border-radius: 10px;*/
background: #888;
}
#profile-jot-text_ifr {
width:99.900002% !important;
}
#profile-jot-text_toolbargroup {
background: #888;
}
.mceCenter table tr {
background: #888;
}
[id$="jot-text_ifr"] {
width: 99.900002% !important;
color: #2e2f2e;
@ -895,6 +919,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
color: #2e2f2e;
background: #eec;
}
.mceFirst tr {
background: #888;
}
.mceFirst td {
/*border-radius: 10px 10px 0px 0px;*/
}
.mceLast td {
/*border-radius: 0 0 10px 10px;*/
}
#profile-attach-wrapper,
#profile-audio-wrapper,
#profile-link-wrapper,
@ -1121,6 +1154,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
.wall-item-outside-wrapper {
border: 1px solid #aaa;
border-radius: 5px;
box-shadow: 5px 0 10px 0 #111;
}
.wall-item-outside-wrapper.comment {
margin-top: 5px;
@ -1946,7 +1980,7 @@ div[id$="wrapper"] br {
position: absolute;
text-decoration: none;
top: 113px;
right: 250px;
right: 260px;
}
#profile-edit-links ul {
margin: 20px 0;
@ -2812,6 +2846,7 @@ footer {
background: #fff url("../../../images/search_18.png") no-repeat right center;
padding-right: 20px;
margin: 6px;
color: #111;
}
#acl-showall {
float: left;

18
view/theme/dispy-dark/theme.php
View file

@ -114,11 +114,27 @@ function dispy_dark_init(&$a) {
return false;
});
// (attempt) to change the text colour in a top post
// (attempt to) change the text colour in a top post
$('#profile-jot-text').focusin(function() {
$(this).css({color: '#eec'});
});
$('a[href=#top]').click(function() {
$('html, body').animate({scrollTop:0}, '500');
return false;
});
});
// shadowing effect for floating toolbars
$(document).scroll(function(e) {
var pageTop = $('html').scrollTop();
if (pageTop) {
$('#nav-floater').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'});
$('.search-box').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'});
} else {
$('#nav-floater').css({boxShadow: '0 0 0 0'});
$('.search-box').css({boxShadow: '0 0 0 0'});
}
});
</script>
EOT;

6
view/theme/dispy/default.php
View file

@ -1,13 +1,13 @@
<!DOCTYPE html>
<html>
<head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
<title><?php if(x($page,'title')) echo $page['title']; ?></title>
<script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
<?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
</head>
<body>
<header>
<!-- header stuff will go here -->
<?php if(x($page, 'header')) echo $page['header']; ?>
</header>
<article id="articlemain">
<?php if(x($page,'nav')) echo $page['nav']; ?>

4
view/theme/dispy/head.tpl
View file

@ -91,8 +91,4 @@
$('#hide-comments-' + id).html('$showfewer');
}
}
</script>

BIN
view/theme/dispy/icons/scroll_top.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 539 B

2
view/theme/dispy/jot-header.tpl
View file

@ -36,7 +36,7 @@ function initEditor(cb) {
entity_encoding : "raw",
add_unload_trigger : false,
remove_linebreaks : false,
force_p_newlines : false,
force_p_newlines : true,
force_br_newlines : true,
forced_root_block : '',
convert_urls: false,

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

@ -4,7 +4,7 @@
<!-- yes, they're going the other way. seems that's how the template renderer
works -->
<a name="top" id="top"></a>
<div id="nav-floater">
<div id="nav-buttons">
{{ if $nav.help }}
@ -116,6 +116,12 @@ works -->
$langselector
</div>
<div id="scrollup">
<a href="#top"><img
src="view/theme/dispy/icons/scroll_top.png"
alt="back to top" title="Back to top" /></a>
</div>
<div class="search-box">
<form method="get" action="$nav.search.0">
<input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />

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

@ -312,6 +312,7 @@ ul#user-menu-popup {
-webkit-border-radius: 0 0 5px 5px;
-moz-border-radius: 0 0 5px 5px;
border-radius: 0 0 5px 5px;
box-shadow: 5px 10px 10px 0 #111;
z-index: 10000;
}
ul#user-menu-popup li {
@ -544,7 +545,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
width: 10em;
color: #eec;
}
#scrollup {
position: fixed;
right: 5px;
bottom: 40px;
z-index: 100;
}
#scrollup a:hover {
text-decoration: none;
border: 0;
}
#user-menu {
box-shadow: 5px 0 10px 0 #111;
display: block;
width: 75%;
margin: 3px 0 0 0;
@ -881,12 +893,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
line-height: 20px;
padding: 2px 20px 5px 0;
}
#profile-jot-text_parent {
/*border-radius: 10px;*/
box-shadow: 5px 0 10px 0 #111;
}
#profile-jot-text_tbl {
margin-bottom: 10px;
/*border-radius: 10px;*/
background: #888;
}
#profile-jot-text_ifr {
width:99.900002% !important;
}
#profile-jot-text_toolbargroup {
background: #888;
}
.mceCenter table tr {
background: #888;
}
[id$="jot-text_ifr"] {
width: 99.900002% !important;
color: #2e2f2e;
@ -896,6 +920,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
color: #2e2f2e;
background: #eec;
}
.mceFirst tr {
background: #888;
}
.mceFirst td {
/*border-radius: 10px 10px 0px 0px;*/
}
.mceLast td {
/*border-radius: 0 0 10px 10px;*/
}
#profile-attach-wrapper,
#profile-audio-wrapper,
#profile-link-wrapper,
@ -1122,6 +1155,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
.wall-item-outside-wrapper {
border: 1px solid #aaa;
border-radius: 5px;
box-shadow: 5px 0 10px 0 #111;
}
.wall-item-outside-wrapper.comment {
margin-top: 5px;
@ -1947,7 +1981,7 @@ div[id$="wrapper"] br {
position: absolute;
text-decoration: none;
top: 113px;
right: 250px;
right: 260px;
}
#profile-edit-links ul {
margin: 20px 0;
@ -2813,6 +2847,7 @@ footer {
background: #fff url("../../../images/search_18.png") no-repeat right center;
padding-right: 20px;
margin: 6px;
color: #111;
}
#acl-showall {
float: left;

18
view/theme/dispy/theme.php
View file

@ -114,11 +114,27 @@ function dispy_init(&$a) {
return false;
});
// (attempt) to change the text colour in a top post
// (attempt to) change the text colour in a top post
$('#profile-jot-text').focusin(function() {
$(this).css({color: '#eec'});
});
$('a[href=#top]').click(function() {
$('html, body').animate({scrollTop:0}, '500');
return false;
});
});
// shadowing effect for floating toolbars
$(document).scroll(function(e) {
var pageTop = $('html').scrollTop();
if (pageTop) {
$('#nav-floater').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'});
$('.search-box').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'});
} else {
$('#nav-floater').css({boxShadow: '0 0 0 0'});
$('.search-box').css({boxShadow: '0 0 0 0'});
}
});
</script>
EOT;