Skip to content

Commit

Permalink
fix zoom css
Browse files Browse the repository at this point in the history
  • Loading branch information
zolunx10 committed Feb 1, 2012
1 parent 027f294 commit 9d1ab43
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 22 deletions.
6 changes: 5 additions & 1 deletion _/css/main.css
Expand Up @@ -15,6 +15,7 @@ html {
body {
height: 100%;
color:#909090;
background:#FAFAFA;
}
h1, h2 {
font-size:bold;
Expand Down Expand Up @@ -164,10 +165,13 @@ body {
width:800px;
min-height:60px;
}
.home-nav .on {
.home-nav .info {
position:absolute;
left:0;
}
.page-nav .active a {
color:#D00007;
}
/* info
*/
.archieve .main-wrap {
Expand Down
18 changes: 9 additions & 9 deletions _/js/home.js
Expand Up @@ -221,7 +221,7 @@ $(document).ready(function()
var element = $(this);
c=c+1;
// if(index>4){
element.css({'position':'absolute','bottom':12+(index%5)*72,'left':j*70+66*Math.floor(index/5),'height':'auto'});
element.css({'position':'absolute','bottom':12+(index%5)*72,'left':j*90+66*Math.floor(index/5),'height':'auto'});
//}
//else{
// element.css({'position':'absolute','bottom':12+index*72,'left':j*132,'height':'auto'});
Expand All @@ -242,7 +242,7 @@ $(document).ready(function()
var tex = $('<span>',{
html:text
});
tex.css({'position':'absolute','bottom':'0px','left':j*70+66*(Math.floor(c/5.0001)+1)/2});
tex.css({'position':'absolute','bottom':'0px','left':j*90+66*(Math.floor(c/5.0001)+1)/2});
if(k==0){
tex.removeClass("vesibilityclass").addClass("unvesibilityclass");
tex.removeClass("time").addClass("type");
Expand All @@ -267,19 +267,19 @@ $(document).ready(function()
}
function makeFilter() {
var tpl=$('#tpl-nav-li').html();
var $pageNav= $('#items li').not('.on, .more, .filter-item'),
var $pageNav= $('#items li').not('.info, .more, .filter-item'),
$more= $('#items .more a'),
$filter= $(Mustache.to_html(tpl, {
name: "TIME"
, nameZh: "时间"
, href: "#"
, class: "filter-item"
}))
name: "TIME"
, nameZh: "时间"
, href: "#"
, 'class': "filter-item"
}))
.add(Mustache.to_html(tpl, {
name: "TYPE"
, nameZh: "类型"
, href: "#"
, class: "filter-item"
, 'class': "filter-item"
}));
$filter.eq(0).click(showTime);
$filter.eq(1).click(showType);
Expand Down
10 changes: 5 additions & 5 deletions footer-public.php
Expand Up @@ -17,27 +17,27 @@
</li>
</script>
<ul id="items" class="page-nav clearfix">
<li class="project item page_item entry-title <?php if ($is_project) {echo "on";} ?>">
<li class="project item page_item entry-title <?php if ($is_project) {echo "active";} ?>">
<a href="<?php bloginfo('url'); ?>">项目<br/>
<span class="name">PROJECTS</span>
</a>
</li>
<li class="book item page_item entry-title <?php if ($name=="book") {echo "on";} ?>">
<li class="book item page_item entry-title <?php if ($name=="book") {echo "active";} ?>">
<a href="<?php bloginfo('url'); ?>/archives/category/book">著作<br/>
<span class="name">BOOKS</span>
</a>
</li>
<li class="paper item page_item entry-title <?php if ($name=="paper") {echo "on";} ?>">
<li class="paper item page_item entry-title <?php if ($name=="paper") {echo "active";} ?>">
<a href="<?php bloginfo('url'); ?>/archives/category/paper">论文<br/>
<span class="name">PAPERS</span>
</a>
</li>
<li class="undergraduate item page_item entry-title <?php if ($name=="work") {echo "on";} ?>">
<li class="undergraduate item page_item entry-title <?php if ($name=="work") {echo "active";} ?>">
<a href="<?php echo bloginfo('url') ?>/work">本科生作品<br/>
<span class="name">UNDERGRADUATE<br/>STUDENTS' WORKS</span>
</a>
</li>
<li class="postgraduate item page_item entry-title <?php if ($name=="postgraduate") {echo "on";} ?>">
<li class="postgraduate item page_item entry-title <?php if ($name=="postgraduate") {echo "active";} ?>">
<a href="#">研究生作品<br/>
<span class="name">POSTGRADUATE<br/>STUDENTS' THESIS</span>
</a>
Expand Down
1 change: 1 addition & 0 deletions header.php
Expand Up @@ -97,6 +97,7 @@

<!-- CSS: screen, mobile & print are all in the same file -->
<link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>">
<link rel="stylesheet" href="<?php bloginfo('template_directory'); ?>/_/css/style.css">
<?php
$name= get_query_var('name');
if (!$name) {
Expand Down
7 changes: 2 additions & 5 deletions nggallery.css
Expand Up @@ -20,14 +20,9 @@ it's only a template design
}

.ngg-album {
padding: 5px;
margin-bottom: 5px;
border: 1px solid #fff;
}

.ngg-album {
overflow: hidden;
padding: 5px;
margin-bottom: 15px;
}

Expand All @@ -42,6 +37,8 @@ it's only a template design

.ngg-thumbnail {
max-width:180px;
}
.ngg-row .ngg-thumbnail {
float:right;
}
.ngg-albumcontent .wrap {
Expand Down
2 changes: 1 addition & 1 deletion nggallery/album-fancy.php
Expand Up @@ -14,7 +14,7 @@
?>
<?php if (!defined ('ABSPATH')) die ('No direct access allowed'); ?><?php if (!empty ($galleries)) : ?>

<ul class="ngg-albumoverview">
<ul class="ngg-albumoverview ngg-row">
<!-- List of galleries -->
<?php foreach ($galleries as $gallery) : ?>

Expand Down
8 changes: 8 additions & 0 deletions studio12f.md
@@ -1,3 +1,11 @@
# 专用相册
Instagram
http://wordpress.org/extend/plugins/photonic/
http://wordpress.org/extend/plugins/awesome-flickr-gallery-plugin/

http://www.v2ex.com/t/389
http://www.v2ex.com/t/23148

# NextGEN Gallery
album > gallery

Expand Down
1 change: 0 additions & 1 deletion style.css
Expand Up @@ -10,7 +10,6 @@ Tags:
/* Reset default browser CSS. Based on work by Eric Meyer: http://meyerweb.com/eric/tools/css/reset/index.html */

@import url(_/css/jquery.fancybox.css);
@import url(_/css/style.css);

html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
Expand Down

0 comments on commit 9d1ab43

Please sign in to comment.