Home Explore Help
Register Sign In
avalanche
/
avalanche2
Watch 2
Star 0
Fork 0

Browse Source
footer layout

jamesperet 10 years ago
parent
ac9eabcf59
commit
b8595833a1
7 changed files with 78 additions and 14 deletions
Show Diff Stats
  1. 0 1
      Gemfile
  2. 2 0
      app/assets/javascripts/start.js
  3. 14 2
      app/assets/stylesheets/start.css.less
  4. 3 4
      app/views/layouts/landing_page.erb
  5. 53 7
      app/views/start/index.html.erb
  6. 3 0
      config/locales/landing_page.en.yml
  7. 3 0
      config/locales/landing_page.pt_BR.yml

+ 0 - 1
Gemfile
View File 

@@ -64,7 +64,6 @@ gem 'gibbon'
64 64 
 gem 'redis'
65 65 
 gem 'resque', '~> 1.22.0', :require => "resque/server"
66 66 
 gem 'mixpanel-ruby'
67 
-gem 'geocoder'
68 67
69 68 
 group :development do
70 69 
   gem "rename"

+ 2 - 0
app/assets/javascripts/start.js
View File 

@@ -16,6 +16,8 @@ function attachHandler(jQuery) {
16 16
17 17 
 	var mainbottom = $('#myCarousel').height();
18 18
19 
+	$('.popup').popover('toogle')
20 
+
19 21 
 	// on scroll,
20 22 
 	$(window).on('scroll',function(){
21 23

+ 14 - 2
app/assets/stylesheets/start.css.less
View File 

@@ -196,7 +196,7 @@ footer.velvet {
196 196 
 	//background-color: #202020;
197 197 
 }
198 198
199 
-p.footer {
199 
+p.footer, .footer-links {
200 200 
 	margin-top: 30px;
201 201 
 	text-align: center;
202 202 
 	text-shadow: 0 0 0 #ffffff;
 
@@ -209,9 +209,10 @@ p.footer {
209 209 
 	text-transform: uppercase;
210 210 
 }
211 211
212 
-p.footer a {
212 
+p.footer a, .footer-links a {
213 213 
 	color: black;
214 214 
 	text-transform: underline;
215 
+	margin-right: 10px;
215 216 
 }
216 217
217 218 
 h2.landing_page {
 
@@ -223,6 +224,17 @@ h2.landing_page {
223 224 
 	margin-top: 60px;
224 225 
 }
225 226
227 
+.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus, .dropdown-submenu:hover > a, .dropdown-submenu:focus > a {
228 
+text-decoration: none;
229 
+color: #ffffff;
230 
+background-color: gray;
231 
+}
232 
+
233 
+.navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle {
234 
+background-color: #444;
235 
+color: white;
236 
+}
237 
+
226 238 
 @media (max-width: 979px) {
227 239 
 	h2.landing_page {
228 240 
 		font-size: 26px;

+ 3 - 4
app/views/layouts/landing_page.erb
View File 

@@ -56,16 +56,15 @@
56 56 
 	     <ul class="nav navbar-nav navbar-right pull-right">
57 57 
 	          <li class="dropdown">
58 58 
 	            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
59 
-	              <%= t('menu.languages.lang') %>
59 
+	              <%= t('landing_page.lang') %>
60 60 
 	              <span class="caret"></span>
61 61 
 	            </a>
62 62 
 	            <ul class="dropdown-menu" role="menu">
63 63 
 	              <li>
64 
-	                <%= link_to t('menu.languages.en'), change_locale_path(:en) %>
64 
+	                <%= link_to t('landing_page.en'), change_locale_path(:en) %>
65 65 
 	              </li>
66 66 
 	              <li>
67 
-	                <%= link_to t('menu.languages.pt-BR'), change_locale_path(:"pt-BR") %>
68 
-
67 
+	                <%= link_to t('landing_page.pt-BR'), change_locale_path(:"pt-BR") %>
69 68 
 	              </li>
70 69 
 	            </ul>
71 70 
 	          </li>

+ 53 - 7
app/views/start/index.html.erb
View File 

@@ -302,14 +302,60 @@
302 302
303 303 
 	</div>
304 304 
 	<div class="container">
305 
-		<div class="row">
306 
-			<div class="span12">
307 
-				<p class="footer">
308 
-		 		    <a class="btn-about" href="#about"><%= (t "landing_page.about").html_safe %></a> |
309 
-		 		    <a class="btn-features" href="#features"><%= (t "landing_page.features").html_safe %></a> |
310 
-		 		    <a class="btn-subscribe" href="#subscribe"><%= (t "landing_page.subscribe").html_safe %></a>|
305 
+		<div class="row" style="margin-top: 25px;">
306 
+
307 
+			<div class="span2" >
308 
+
309 
+			    <div class="pull-left hidden-phone" style="margin-right: 20px;">
310 
+		    	     <ul class="nav btn">
311 
+		    	          <li class="dropdown">
312 
+		    	            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
313 
+		    	              <%= t('landing_page.lang') %>
314 
+		    	              <span class="caret"></span>
315 
+		    	            </a>
316 
+		    	            <ul class="dropdown-menu dropdown-menu-right" role="menu">
317 
+		    	              <li>
318 
+		    	                <%= link_to t('landing_page.en'), change_locale_path(:en) %>
319 
+		    	              </li>
320 
+		    	              <li>
321 
+		    	                <%= link_to t('landing_page.pt-BR'), change_locale_path(:"pt-BR") %>
322 
+		    	              </li>
323 
+		    	            </ul>
324 
+		    	          </li>
325 
+		    	        </ul>
326 
+			    </div >
327 
+		    </div>
328 
+			    <div class="span4 footer-links" style="margin-top: 4px;">
329 
+				    <p style="text-align: center;">
330 
+		 		    <a class="btn-about" href="#about"><%= (t "landing_page.about").html_safe %></a>
331 
+		 		    <a class="btn-features" href="#features"><%= (t "landing_page.features").html_safe %></a>
332 
+		 		    <a class="btn-subscribe" href="#subscribe"><%= (t "landing_page.subscribe").html_safe %></a>
311 333 
 		 		    <%= link_to (t "registration.sign_in"), new_user_session_path, class: "btn-login" %>
312 
-				</p>
334 
+				    </p>
335 
+			    </div>
336 
+
337 
+			    <div class="span2" style="padding-top: 5px;">
338 
+				    <p style="text-align: center;">
339 
+				    <a class="twitter-follow-button"
340 
+				      href="https://twitter.com/twitterdev"
341 
+				      data-show-count="false"
342 
+				      data-lang="en">
343 
+				    Follow @twitterapi
344 
+				    </a>
345 
+				    <script>window.twttr=(function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],t=window.twttr||{};if(d.getElementById(id))return;js=d.createElement(s);js.id=id;js.src="https://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);t._e=[];t.ready=function(f){t._e.push(f);};return t;}(document,"script","twitter-wjs"));</script>
346 
+			    	</p>
347 
+			    </div>
348 
+			    <div class="span2" style="padding-top: 5px;">
349 
+				    <p style="text-align: center;">
350 
+				    <iframe src="//www.facebook.com/plugins/like.php?href=https%3A%2F%2Fdevelopers.facebook.com%2Fdocs%2Fplugins%2F&amp;width&amp;layout=button_count&amp;action=like&amp;show_faces=true&amp;share=true&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; height:21px;" allowTransparency="true"></iframe>
351 
+			    		</p>
352 
+			    </div>
353 
+			    <div class="span2" style="padding-top: 5px;">
354 
+				    <p style="text-align: right;">
355 
+					    <a href="https://mixpanel.com/f/partner"><img src="//cdn.mxpnl.com/site_media/images/partner/badge_light.png" alt="Mobile Analytics" /></a>
356 
+				    </p>
357 
+			    </div>
358 
+		    </div>
313 359 
 				<hr style="margin-top: 20px; border-top: 1px solid #000000;">
314 360 
 				<p class="footer" style="text-align: center;">&copy; Avalanche Network <%= Time.now.year %></p>
315 361 
 			  </div>

+ 3 - 0
config/locales/landing_page.en.yml
View File 

@@ -20,3 +20,6 @@ en:
20 20 
     about: 'About'
21 21 
     features: 'Featues'
22 22 
     subscribe: 'Subscribe'
23 
+    lang: 'Lang'
24 
+    en: 'English'
25 
+    pt-BR: 'Portuguese'

+ 3 - 0
config/locales/landing_page.pt_BR.yml
View File 

@@ -20,3 +20,6 @@ pt-BR:
20 20 
     about: 'Sobre'
21 21 
     features: 'Características'
22 22 
     subscribe: 'Participe'
23 
+    lang: idioma
24 
+    en: Inglês
25 
+    pt-BR: "Português"