fix styles

This commit is contained in:
Lee Lawlor 2014-02-17 19:51:30 -05:00
parent 71b4fcaad4
commit 42f5f3402d
8 changed files with 121 additions and 16 deletions

View File

@ -250,7 +250,7 @@ textarea.tweet { margin-top: 0.5em; width: 40em; height: 3em; }
input#upload_csv { padding-top:5px;margin:20px 0;} input#upload_csv { padding-top:5px;margin:20px 0;}
#sidebar { #sidebar_old {
font-size: 14px; font-size: 14px;
width:50%; width:50%;
padding-right: 10px ; padding-right: 10px ;
@ -262,19 +262,20 @@ input#upload_csv { padding-top:5px;margin:20px 0;}
-webkit-border-radius: 15px; -webkit-border-radius: 15px;
-moz-border-radius: 15px; -moz-border-radius: 15px;
} }
#sidebar ul { #sidebar_old ul {
list-style: none; list-style: none;
margin: 15px 20px 30px 0 ;} margin: 15px 20px 30px 0 ;}
#sidebar ul li ul li { margin:0; } #sidebar_old ul li ul li { margin:0; }
#sidebar h2 { #sidebar_old h2 {
color:#666; color:#666;
margin: 0 0 6px 0; margin: 0 0 6px 0;
padding: 0 0; padding: 0 0;
} }
#sidebar.wide { width: 520px; } #sidebar_old.wide { width: 520px; }
#sidebar.medium { width: 470px; } #sidebar_old.medium { width: 470px; }
#sidebar.narrow { width: 470px; margin-left: 520px;} #sidebar_old.narrow { width: 470px; margin-left: 520px;}
#sidebar .helplink { float: right; margin-top: 5px; font-weight: normal; font-size: 12px; } #sidebar .helplink,
#sidebar_old .helplink { float: right; margin-top: 5px; font-weight: normal; font-size: 12px; }
/* shortcuts */ /* shortcuts */
.FL { float: left; } .FL { float: left; }

View File

@ -36,7 +36,7 @@
<%= button_to t(:api_key_read_new), channel_api_keys_path(@channel, :write => 0) %> <%= button_to t(:api_key_read_new), channel_api_keys_path(@channel, :write => 0) %>
<br /> <br />
</div> </div>
<div id="sidebar"> <div id="sidebar_old">
<ul> <ul>
<li> <li>
<div class="helplink">(<a target="_blank" href="http://community.thingspeak.com/documentation/api/#api_keys"><%= t(:help_options) %></a>)</div> <div class="helplink">(<a target="_blank" href="http://community.thingspeak.com/documentation/api/#api_keys"><%= t(:help_options) %></a>)</div>

View File

@ -119,7 +119,7 @@
<h4><%= t(:channel_delete_message) %></h4> <h4><%= t(:channel_delete_message) %></h4>
<%= button_to t(:channel_delete), channel_path(@channel.id), :method => 'delete', :data => { :confirm => t(:confirm_channel_delete) } %> <%= button_to t(:channel_delete), channel_path(@channel.id), :method => 'delete', :data => { :confirm => t(:confirm_channel_delete) } %>
</div> </div>
<div id="sidebar"> <div id="sidebar_old">
<ul> <ul>
<li> <li>
<h2><%= t(:help) %></h2> <h2><%= t(:help) %></h2>

View File

@ -18,10 +18,10 @@
</div> </div>
<div id="sidebar" > <div id="sidebar_old" >
<ul> <ul>
<li> <li>
<div class="helplink">(<a target="_blank" href="http://community.thingspeak.com/documentation/api/#send_data"><%= t(:help_options) %></a>)</div> <div class="helplink">(<a target="_blank" href="http://community.thingspeak.com/documentation/api/#send_data"><%= t(:help_options) %></a>)</div>
<h2><%= t(:help_channel_update) %></h2> <h2><%= t(:help_channel_update) %></h2>
<%= t(:help_channel_post) %> <%= t(:help_channel_post) %>
@ -29,14 +29,14 @@
<%= t(:help_channel_post_example) %> <%= t(:help_channel_post_example) %>
<div class="code"><%= "#{@api_domain}update?key=#{@key}&field1=0" %></div> <div class="code"><%= "#{@api_domain}update?key=#{@key}&field1=0" %></div>
<br /><br /> <br /><br />
<div class="helplink">(<a target="_blank" href="http://community.thingspeak.com/documentation/api/#view_data"><%= t(:help_options) %></a>)</div> <div class="helplink">(<a target="_blank" href="http://community.thingspeak.com/documentation/api/#view_data"><%= t(:help_options) %></a>)</div>
<h2><%= t(:help_channel_feed) %></h2> <h2><%= t(:help_channel_feed) %></h2>
<%= t(:help_channel_view) %> <%= t(:help_channel_view) %>
<br /> <br />
<div class="code"><%= link_to "#{@api_domain}channels/#{@channel.id}/feed.json?key=#{@key}", "#{@api_domain}channels/#{@channel.id}/feed.json?key=#{@key}", :target => '_blank' %></div> <div class="code"><%= link_to "#{@api_domain}channels/#{@channel.id}/feed.json?key=#{@key}", "#{@api_domain}channels/#{@channel.id}/feed.json?key=#{@key}", :target => '_blank' %></div>
<br /> <br />
</li> </li>
<li> <li>
@ -46,3 +46,4 @@
</li> </li>
</ul> </ul>
</div> </div>

View File

@ -60,7 +60,7 @@
</div> </div>
</div> </div>
<div id="sidebar" class="col-xs-12 col-sm-6"> <div id="sidebar_old" class="col-xs-12 col-sm-6">
<h4 class="breadcrumb"><%= t(:help) %></h4> <h4 class="breadcrumb"><%= t(:help) %></h4>
<div class="col-pad"> <div class="col-pad">

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long