chaas/debshots
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fixed Foundation

Browse source
This commit is contained in:
Christoph Haas 2014-12-28 01:01:16 +01:00
parent 102b5cb77d
commit b4adeaa9a0
5 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/application.js
View file

@ -12,12 +12,8 @@
// //
//= require jquery //= require jquery
//= require jquery_ujs //= require jquery_ujs
//=require 'foundation/foundation.topbar' //= require foundation
//=require 'foundation/foundation.slider'
//= require fancybox //= require fancybox
//= require jquery.cycle2 //= require jquery.cycle2
//= require_tree . //= require_tree .
$(function(){
$(document).foundation(); }
);

3
app/assets/stylesheets/application.css.scss
View file

@ -9,8 +9,7 @@
* compiled file, but it's generally better to create a new file per style scope. * compiled file, but it's generally better to create a new file per style scope.
* *
*= require_self *= require_self
//= require foundation_and_overrides
*/ */
@import "foundation_and_overrides";
@import "my.css.scss"; @import "my.css.scss";

14
app/assets/stylesheets/foundation_and_overrides.scss
View file

@ -1452,14 +1452,14 @@ $debian_color: #c70338;
$primary-color: $debian_color; $primary-color: $debian_color;
// Larger top bar // Larger top bar
$topbar-height: 60px; $topbar-height: rem-calc(60);
// Larger font in top bar // Larger font in top bar
$topbar-link-font-size: rem-calc(20); $topbar-link-font-size: rem-calc(15);
$topbar-button-font-size: 1rem; $topbar-button-font-size: rem-calc(3);
$topbar-button-top: 14px; $topbar-button-top: rem-calc(5);
$topbar-link-padding: 8px; $topbar-link-padding: rem-calc(8);
// At which width the top navigation bar should be switched to // At which width the top navigation bar should be switched to
// mobile mode because otherwise it would wrap into two lines. // mobile mode because otherwise it would wrap into two lines.
@ -1470,8 +1470,8 @@ $topbar-media-query: "only screen and (min-width: #{$topbar-breakpoint})";
@import url(http://fonts.googleapis.com/css?family=Droid+Sans:400,700); @import url(http://fonts.googleapis.com/css?family=Droid+Sans:400,700);
$body-font-family: "Droid Sans"; $body-font-family: "Droid Sans";
$button-tny: 0.3rem; $button-tny: rem-calc(0.3);
$button-font-tny: 0.9rem; $button-font-tny: rem-calc(0.9);
// Make the background of progress bars use a light version of the primary color // Make the background of progress bars use a light version of the primary color
$progress-bar-color: tint($primary-color, 80); $progress-bar-color: tint($primary-color, 80);

4
app/assets/stylesheets/my.css.scss
View file

@ -276,14 +276,14 @@ a.black
text-align: left; text-align: left;
color: white; color: white;
text-transform: uppercase; text-transform: uppercase;
font-size: 0.8rem; font-size: 0.8em;
font-weight: bolder; font-weight: bolder;
.meter .meter
{ {
background-color: $primary-color; background-color: $primary-color;
padding: 2px; padding: 2px;
padding-left: 0.4rem; padding-left: 0.4em;
text-shadow: 0 0 2px black; text-shadow: 0 0 2px black;
} }
} }

2
app/views/layouts/application.html.slim
View file

@ -28,7 +28,7 @@ html
// Load Javascript libraries // Load Javascript libraries
// Initialize Zurb Foundation // Initialize Zurb Foundation
javascript: javascript:
//$(document).foundation(); $(document).foundation();
$('.fancybox').fancybox({nextEffect: "none", prevEffect: "none"}); $('.fancybox').fancybox({nextEffect: "none", prevEffect: "none"});
// See http://wbotelhos.com/raty // See http://wbotelhos.com/raty