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

General Foundation load procedure tidied up

Browse source
This commit is contained in:
Christoph Haas 2016-03-02 16:23:47 +01:00
parent 3c0756206a
commit 298ac56ac0
5 changed files with 44 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,4 +17,4 @@
//= require cookies_eu
//= require_tree .
$(document).foundation()
$(document).foundation();

1
app/assets/stylesheets/application.scss
View file

@ -9,6 +9,7 @@
* compiled file, but it's generally better to create a new file per style scope.
*
*= require_self
//= require foundation_and_overrides
*= require cookies_eu
*= require fancybox
*/

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

@ -1,54 +1,12 @@
@charset 'utf-8';
@import 'settings';
// my own changes
/* TODO: Make colors themable - e.g. Ubuntu has brown and SuSE has green */
$debian_color: #c70338;
$primary-color: $debian_color;
// Hover colors of links in top bar
$topbar-link-bg-hover: $primary-color;
$topbar-dropdown-link-bg-hover: $primary-color;
// Larger top bar
$topbar-height: rem-calc(60);
// Larger font in top bar
$topbar-link-font-size: rem-calc(15);
$topbar-button-font-size: rem-calc(3);
$topbar-button-top: rem-calc(5);
$topbar-link-padding: rem-calc(8);
// At which width the top navigation bar should be switched to
// mobile mode because otherwise it would wrap into two lines.
$topbar-breakpoint: 800px;
$topbar-media-query: "only screen and (min-width: #{$topbar-breakpoint})";
// Import Google font
@import url(http://fonts.googleapis.com/css?family=Droid+Sans:400,700);
$body-font-family: "Droid Sans";
$button-tny: rem-calc(4);
$button-font-tny: rem-calc(15);
// Make the background of progress bars use a light version of the primary color
$progress-bar-color: tint($primary-color, 80);
// Enable special grid and block-grid sizes for xlarge and xxlarge screens
/*$include-xl-html-grid-classes: true;*/
/*$include-xl-html-block-grid-classes: true;*/
/*$row-width: 100%;*/
@import 'foundation';
// If you'd like to include motion-ui, you need to install the motion-ui sass package.
// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package.
//
// @import 'motion-ui/motion-ui';
// TODO:
// We include everything by default. To slim your CSS, remove components you don't use.
@include foundation-global-styles;
@ -87,8 +45,7 @@ $progress-bar-color: tint($primary-color, 80);
@include foundation-tooltip;
@include foundation-top-bar;
// If you'd like to include motion-ui, you need to install the motion-ui sass package.
// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package.
//
// @include motion-ui-transitions;
// @include motion-ui-animations;

39
app/assets/stylesheets/my.scss
View file

@ -1,3 +1,42 @@
// my own changes
/* TODO: Make colors themable - e.g. Ubuntu has brown and SuSE has green */
$debian_color: #c70338;
$primary-color: $debian_color;
// Hover colors of links in top bar
$topbar-link-bg-hover: $primary-color;
$topbar-dropdown-link-bg-hover: $primary-color;
// Larger top bar
$topbar-height: rem-calc(60);
// Larger font in top bar
$topbar-link-font-size: rem-calc(15);
$topbar-button-font-size: rem-calc(3);
$topbar-button-top: rem-calc(5);
$topbar-link-padding: rem-calc(8);
// At which width the top navigation bar should be switched to
// mobile mode because otherwise it would wrap into two lines.
$topbar-breakpoint: 800px;
$topbar-media-query: "only screen and (min-width: #{$topbar-breakpoint})";
// Import Google font
@import url(http://fonts.googleapis.com/css?family=Droid+Sans:400,700);
$body-font-family: "Droid Sans";
$button-tny: rem-calc(4);
$button-font-tny: rem-calc(15);
// Make the background of progress bars use a light version of the primary color
$progress-bar-color: tint($primary-color, 80);
// Enable special grid and block-grid sizes for xlarge and xxlarge screens
/*$include-xl-html-grid-classes: true;*/
/*$include-xl-html-block-grid-classes: true;*/
/*$row-width: 100%;*/
// -------------- debshots ---------------------------

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

@ -24,7 +24,7 @@ html
// Load Javascript libraries
// Initialize Zurb Foundation
javascript:
$(document).foundation();
//$(document).foundation();
$(".fancybox").fancybox({
prevEffect : 'none',
nextEffect : 'none',