diff --git a/app/assets/javascripts/mobile/orbit.mobile.js.erb b/app/assets/javascripts/mobile/orbit.mobile.js.erb index d8c647e2..36f43bab 100644 --- a/app/assets/javascripts/mobile/orbit.mobile.js.erb +++ b/app/assets/javascripts/mobile/orbit.mobile.js.erb @@ -25,8 +25,8 @@ $('#index').live('pageinit',function(){ $(".slideImg").muImageResize({width: $globalW, height: Math.floor($globalW/720*240)}); $(this).find(".newpic img").muImageResize({width: 280, height: 200}); $('.slideshow').cycle({ - fx:'scrollLeft', - timeout: 6000, + fx: $effect, + timeout: $timeout }); $(".newlist").css({ "width" : $(".newitem").outerWidth()*(Math.floor($globalW/$(".newitem").outerWidth()))+30, @@ -37,7 +37,7 @@ $('#index').live('pageinit',function(){ // $('.newlist').swipePlanes(); // }, 1000); }); -$('#news_content').live('pageinit',function(){ +$('#announcement_content').live('pageinit',function(){ $(this).find(".newpic img").muImageResize({width: 320, height: 220}); }); var mobileDemo = { 'center': '24.987449, 121.576117', 'zoom': 17 }; @@ -113,8 +113,8 @@ $(window).bind("orientationchange", function(){ $(".slideImg").muImageResize({width: $globalW, height: Math.floor($globalW/720*240)}); $('.slideshow').cycle({ - fx:'scrollLeft', - timeout: 6000, + fx: $effect, + timeout: $timeout }); $(".newlist").css({ diff --git a/app/assets/stylesheets/icons.css.erb b/app/assets/stylesheets/icons.css.erb index 9f2f7253..167bb37a 100644 --- a/app/assets/stylesheets/icons.css.erb +++ b/app/assets/stylesheets/icons.css.erb @@ -1,9 +1,12 @@ [data-icons]:before { font-family: 'entypo'; - content: attr(data-icon); + content: attr(data-icons); speak: none; font-weight: normal; -webkit-font-smoothing: antialiased; + font-size: 1.5em; + line-height: .6em; + color: white; } @font-face { font-family: 'entypo'; diff --git a/app/assets/stylesheets/mobile/orbit-mobile.css.erb b/app/assets/stylesheets/mobile/orbit-mobile.css.erb index 302a6013..55e5f2b9 100644 --- a/app/assets/stylesheets/mobile/orbit-mobile.css.erb +++ b/app/assets/stylesheets/mobile/orbit-mobile.css.erb @@ -194,28 +194,25 @@ div[data-role="page"] { padding: 0 0 20px; margin-bottom: 0; } -#news_content .content .newpic { +#announcement_content .content .newpic { width: 320px; height: 220px; margin: 0 auto; } -#news_content .content .newstitle { +#announcement_content .content .newstitle { font-size: 1.4em; padding: 0 10px; margin: 1em 0; } -#news_content .content .newsDate { +#announcement_content .content .newsDate { padding: 0 10px; font-size: 1em; color: #8D8D8D; } -#news_content .content .newsummary { +#announcement_content .content .newsummary { padding: 0 10px 20px; margin-bottom: 0; } -#announcement_content .content { - padding: 10px; -} #map div[data-role="content"] { padding: 0; } diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb index 08d95d54..36638302 100644 --- a/app/views/layouts/_orbit_bar.html.erb +++ b/app/views/layouts/_orbit_bar.html.erb @@ -9,12 +9,12 @@ <% end -%>