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

Merge branch 'back' of github.com:Rulingcom/orbit into back 

Conflicts:
	app/assets/javascripts/mobile/orbit.mobile.js.erb
	app/assets/stylesheets/mobile.css
	app/assets/stylesheets/mobile/orbit-mobile.css.erb
	app/controllers/application_controller.rb
	app/controllers/mobile_controller.rb
	app/views/layouts/mobile.mobile.erb
	app/views/mobile/_footer.mobile.erb
	app/views/mobile/_header.mobile.erb
	app/views/mobile/_menu.mobile.erb
	app/views/mobile/index.mobile.erb
	config/routes.rb
This commit is contained in:
chris 2013-01-14 17:46:27 +08:00
parent 141eb7e723 8ec0b35245
commit 282604d1fa
4 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/stylesheets/mobile/orbit-mobile.css.erb
View File

@ -128,13 +128,8 @@ div[data-role="page"] {
left: 0; left: 0;
} }
.header .language .ui-btn-text i { .header .language .ui-btn-text i {
<<<<<<< HEAD
font-size: 1.1em;
margin-top: .3em;
=======
font-size: .83em; font-size: .83em;
margin-top: .2em; margin-top: .2em;
>>>>>>> Add mobile but remove news in it
} }
.header .language .ui-icon { .header .language .ui-icon {
background-image: none; background-image: none;

4
app/views/layouts/mobile.mobile.erb
View File

@ -11,11 +11,7 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black">
<<<<<<< HEAD
<meta name="viewport" content="user-scalable=no, initial-scale=1.0, maximum-scale=1.0"> <meta name="viewport" content="user-scalable=no, initial-scale=1.0, maximum-scale=1.0">
=======
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0">
>>>>>>> Add mobile but remove news in it
<!-- iPhone --> <!-- iPhone -->
<link href="<%= asset_path 'mobile/apple-startup-iPhone.png' %>" media="(device-width: 320px) and (device-height: 480px) and (-webkit-device-pixel-ratio: 1)" rel="apple-touch-startup-image"> <link href="<%= asset_path 'mobile/apple-startup-iPhone.png' %>" media="(device-width: 320px) and (device-height: 480px) and (-webkit-device-pixel-ratio: 1)" rel="apple-touch-startup-image">

1
app/views/mobile/_footer.mobile.erb
View File

@ -14,6 +14,7 @@
<li> <li>
<%= link_to mobile_dialog_contact_path, {"data-rel" => "dialog"} do %> <%= link_to mobile_dialog_contact_path, {"data-rel" => "dialog"} do %>
<i class="icons-phone"></i> <i class="icons-phone"></i>
<% end %>
</li> </li>
</ul> </ul>
</div> </div>