developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branches 'design_team' and 'design_team' of github.com:Rulingcom/orbit into design_team

This commit is contained in:
Christophe Vilayphiou 2012-03-16 15:13:06 +08:00
parent f4fda08e86 29ec36130e
commit 07edf44643
2 changed files with 488 additions and 484 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/orbit-1.0.js
View File

@ -52,12 +52,15 @@ $(document).ready(function(){
/*tinyscrollbar&windows-Size*/ /*tinyscrollbar&windows-Size*/
resize(); resize();
$('#main-sidebar').css("height", viewportheight-40); var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2;
$('#main-sidebar .viewport').css("height", viewportheight-40); $('#main-sidebar').css("height", viewportheight-30);
$('#main-sidebar .viewport').css("height", viewportheight-30);
$('.post-title').css("width", viewportwidth-495); $('.post-title').css("width", viewportwidth-495);
$('#main-wrap > .subnav').css("width", viewportwidth-$mainWrapMarginLeft)
$('#main-sidebar').tinyscrollbar(); $('#main-sidebar').tinyscrollbar();
$('.detal-list').tinyscrollbar(); $('.detal-list').tinyscrollbar();
$('#main-sidebar').tinyscrollbar({size:(viewportheight-44)}); $('#main-sidebar').tinyscrollbar({size:(viewportheight-34)});
mainTablePosition()
/*isotope*/ /*isotope*/
var $container = $('#isotope'); var $container = $('#isotope');

1
app/assets/stylesheets/site_items.css.erb
View File

@ -145,6 +145,7 @@ body{
background-color: #101010; background-color: #101010;
bottom: 0; bottom: 0;
color: #FFFFFF; color: #FFFFFF;
display:none;
font-size: 11px; font-size: 11px;
padding: 10px; padding: 10px;
position: fixed; position: fixed;