Commit 9e3ff733 authored by danielgrippi's avatar danielgrippi

ditch unused css rules; move js to body bottom

parent 00e561dd
......@@ -8,18 +8,17 @@
%title
DIASPORA*
%meta{:name => "description", :content => "Diaspora* Mobile"}
%meta{:name => "author", :content => "Diaspora, Inc."}
%meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
%meta{:name =>'viewport', :content => "width=device-width, minimum-scale=1, maximum-scale=1"}
%meta{:name => "HandheldFriendly", :content => "True"}
%meta{:name => "MobileOptimized", :content => "320"}
%meta{'http-equiv' => "cleartype", :content => 'on'}
= include_javascripts :mobile
-if current_user
:javascript
Diaspora.I18n.loadLocale(#{get_javascript_strings_for(current_user.language).to_json}, "#{current_user.language}");
= include_stylesheets :mobile
=include_stylesheets :mobile
= csrf_meta_tag
- if rtl?
......@@ -27,6 +26,25 @@
= yield(:head)
%body
%header
= link_to(image_tag('white@2x.png', :height => 22, :width => 136, :id => 'header_title'), aspects_path)
- if flash.present?
%p
- flash.each do |name, msg|
= content_tag :div, msg, :id => "flash_#{name}"
= yield
/= render :partial =>'shared/footer' if user_signed_in?
/ javascripts at the bottom
= include_javascripts :mobile
-if current_user
:javascript
Diaspora.I18n.loadLocale(#{get_javascript_strings_for(current_user.language).to_json}, "#{current_user.language}");
-if AppConfig[:google_a_site]
:javascript
var _gaq=[["_setAccount","#{AppConfig[:google_a_site]}"],["_trackPageview"]];
......@@ -44,21 +62,3 @@
piwikTracker.trackPageView();
piwikTracker.enableLinkTracking();
} catch( err ) {}
%body
%header
/- if current_user
/ /= link_to(image_tag('icons/list_white.png'), '#menu', :id => "menu_button")
/ /= link_to(image_tag('icons/search_white.png'), people_path, :class => "right")
= link_to(image_tag('white@2x.png', :height => 22, :width => 136, :id => 'header_title'), aspects_path)
- if flash.present?
%p
- flash.each do |name, msg|
= content_tag :div, msg, :id => "flash_#{name}"
= yield
/= render :partial =>'shared/footer' if user_signed_in?
......@@ -23,42 +23,11 @@ body {
max-width: 100%;
}
#landing_content {
text-align: center;
.info_pane {
text-align: left;
}
}
#login_form {
padding: 15px;
padding-top: 0px;
}
#diaspora_description {
background: {
image: url("../images/ball_small.png");
repeat: no-repeat;
position: top center; };
padding: {
top: 195px; };
margin: {
top: -18px; };
font: {
size: 1.3em;
weight: bold; };
text-shadow: 0 1px 3px #999999;
line-height: 1.5;
p {
padding: 12px;
background: {
color: white; };
-webkit-box-shadow: 0 1px 3px #cccccc;
-moz-box-shadow: 0 1px 3px #cccccc;
box-shadow: 0 1px 3px #cccccc;
}
}
.login_form {
@include mobile-box;
padding: 10px;
......@@ -109,8 +78,6 @@ body {
margin: 0 auto;
font-size: 14px;
line-height: 19px; }
.black {
color: #333333; }
margin: 10px {
top: 10px;
bottom: 0; };
......@@ -186,60 +153,23 @@ body {
text-shadow: 0 -2px 0 black; } }
.time, .via {
color: #cccccc;
color: #ccc;
font: {
size: smaller;
weight: bold; };
}
.via {
a {
color: #cccccc; } }
color: #ccc; } }
.comment {
.time {
color: #777777; } }
color: #777; } }
.info {
margin: {
top: -2px; }; }
#show_content {
padding: 12px {
bottom: 24px; };
border: {
bottom: 1px solid #bbbbbb; };
background: {
color: white; };
font: {
size: larger; };
img {
max-width: 100%; }
.photo {
text-align: center; }
.controls {
font: {
size: smaller; }; }
&.photo {
background: {
color: black; }; } }
#photo_controls {
margin: {
bottom: -42px; }; }
.arrow {
color: white !important;
font: {
size: 26pt; };
text: {
shadow: 0 1px 2px #333333;
decoration: none; };
padding: 0; }
ul {
margin: 0;
padding: 0;
list: {
style: none; }; }
#author_info.profile {
background: {
color: #eeeeee; };
......@@ -262,42 +192,9 @@ ul {
size: small; };
color: #999999; } }
.stream_marker {
background: {
color: #eeeeee; };
border: {
bottom: 1px solid #aaaaaa;
top: 1px solid #cccccc; };
font: {
weight: bold;
size: smaller; };
color: #666666;
padding: 3px 6px; }
.right {
float: right; }
.hidden {
display: none; }
.grey_back {
background: {
color: #eeeeee; };
border: {
bottom: 1px solid #999999; };
padding: 8px {
top: 3px; };
margin: {
bottom: 12px; }; }
#aspect_title {
padding: 0 6px {
bottom: 6px; };
font: {
weight: bold; };
text: {
align: left; }; }
header {
@include linear-gradient(#444444, black);
padding: 12px 5px;
......@@ -309,8 +206,7 @@ header {
footer {
background: {
color: #cccccc; };
.inset {
padding: 10px; } }
}
.notification_day_header {
padding: 6px;
......@@ -335,8 +231,6 @@ footer {
height: 24px;
font: {
size: larger; };
img {
height: 24px; }
a {
color: #999999 !important;
font-weight: bold !important; } }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment