update a few things for the asset pipeline, and fix a couple of other mobile bugs
This commit is contained in:
parent
a9b5df8dc5
commit
bfbae50e5a
4 changed files with 9 additions and 9 deletions
|
|
@ -270,6 +270,7 @@ body {
|
||||||
|
|
||||||
.navbar {
|
.navbar {
|
||||||
@include box-shadow(0,1px,2px,#333);
|
@include box-shadow(0,1px,2px,#333);
|
||||||
|
padding: 0 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.navbar-inner {
|
.navbar-inner {
|
||||||
|
|
@ -289,12 +290,11 @@ body {
|
||||||
|
|
||||||
#nav_badges {
|
#nav_badges {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
margin-top: 2px; }
|
}
|
||||||
#nav_badges a:hover {
|
#nav_badges a:hover {
|
||||||
text-decoration: none; }
|
text-decoration: none; }
|
||||||
#nav_badges .badge {
|
#nav_badges .badge {
|
||||||
position: relative;
|
position: relative;
|
||||||
top: -12px;
|
|
||||||
display: inline;
|
display: inline;
|
||||||
margin: 0 2px;
|
margin: 0 2px;
|
||||||
padding: 8px 3px;
|
padding: 8px 3px;
|
||||||
|
|
@ -644,9 +644,7 @@ display: inline-block;
|
||||||
display: inline;
|
display: inline;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
margin: 0 2px;
|
margin: 0 2px;
|
||||||
padding: 8px 3px 9px;
|
|
||||||
position: relative;
|
position: relative;
|
||||||
top: -15px;
|
|
||||||
width: 28px;
|
width: 28px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,10 @@ module ApplicationHelper
|
||||||
User.diaspora_id_host
|
User.diaspora_id_host
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def modernizer_responsive_tag
|
||||||
|
javascript_tag("Modernizr.mq('(min-width:0)') || document.write(unescape('#{j javascript_include_tag("mbp-respond.min")}'));")
|
||||||
|
end
|
||||||
|
|
||||||
# Require jQuery from CDN if possible, falling back to vendored copy, and require
|
# Require jQuery from CDN if possible, falling back to vendored copy, and require
|
||||||
# vendored jquery_ujs
|
# vendored jquery_ujs
|
||||||
def jquery_include_tag
|
def jquery_include_tag
|
||||||
|
|
|
||||||
|
|
@ -34,10 +34,7 @@
|
||||||
= stylesheet_link_tag :mobile, :format => 'all'
|
= stylesheet_link_tag :mobile, :format => 'all'
|
||||||
= yield(:custom_css)
|
= yield(:custom_css)
|
||||||
|
|
||||||
%script{:src => "/assets/mbp-modernizr-custom.js"}
|
= javascript_include_tag 'mbp-modernizr-custom', 'mbp-respond.min'
|
||||||
/ Media Queries Polyfill https://github.com/shichuan/mobile-html5-boilerplate/wiki/Media-Queries-Polyfill
|
|
||||||
:javascript
|
|
||||||
Modernizr.mq('(min-width:0)') || document.write('<script src="assets/mbp-respond.min.js">\x3C/script>')
|
|
||||||
|
|
||||||
= csrf_meta_tag
|
= csrf_meta_tag
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,5 +32,6 @@
|
||||||
- current_user.aspects.each do |aspect|
|
- current_user.aspects.each do |aspect|
|
||||||
%option{:value => aspect.id}
|
%option{:value => aspect.id}
|
||||||
= "· #{aspect.name}"
|
= "· #{aspect.name}"
|
||||||
|
= form_for Photo.new, :html => {:multipart => true} do |f|
|
||||||
|
= f.file_field :image
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue