summaryrefslogtreecommitdiff
path: root/source/stylesheets
diff options
context:
space:
mode:
authorLars Henrik Mai <lars.mai@kontinui.de>2014-09-23 08:44:31 +0200
committerLars Henrik Mai <lars.mai@kontinui.de>2014-09-23 08:44:31 +0200
commit7fc6575a7a38daa21a26e2b179a92ca809b61eea (patch)
tree679498b3fd59aa375c6c6ce7ba48ed3d6a6e11d7 /source/stylesheets
parent35239fc1f4641db1e602383b43cc29b151cde9b9 (diff)
parent1c177d628ffdb693483b1c39b94b5f19adcd8095 (diff)
Merge branch 'replace-bootstrap-with-foundation'
Diffstat (limited to 'source/stylesheets')
-rw-r--r--source/stylesheets/_blog.scss17
-rw-r--r--source/stylesheets/_variables.scss179
-rw-r--r--source/stylesheets/base.css.scss44
3 files changed, 2 insertions, 238 deletions
diff --git a/source/stylesheets/_blog.scss b/source/stylesheets/_blog.scss
deleted file mode 100644
index 13db407..0000000
--- a/source/stylesheets/_blog.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-article {
- @extend .container-fluid;
- margin-bottom: 30px;
-}
-
-aside.blog-date {
- @extend .col-md-2;
-}
-
-div.blog-inner {
- @extend .col-md-8;
-}
-
-h3.blog-article-heading {
- margin-top: 0px;
-}
-
diff --git a/source/stylesheets/_variables.scss b/source/stylesheets/_variables.scss
deleted file mode 100644
index 4374425..0000000
--- a/source/stylesheets/_variables.scss
+++ /dev/null
@@ -1,179 +0,0 @@
-$gray-darker: #222;
-$gray-dark: #282828;
-$gray: #555;
-$gray-light: #888;
-$gray-lighter: #ADAFAE;
-
-$brand-primary: #2A9FD6;
-$brand-success: #77B300;
-$brand-info: #9933CC;
-$brand-warning: #FF8800;
-$brand-danger: #CC0000;
-
-
-$body-bg: #060606;
-$text-color: $gray-light;
-$link-color: $brand-primary;
-$link-hover-color: $link-color;
-
-$headings-color: #fff;
-
-$text-muted: $gray-light;
-
-//== Components
-//
-//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
-
-$padding-base-vertical: 8px;
-$padding-base-horizontal: 12px;
-
-$padding-large-vertical: 14px;
-$padding-large-horizontal: 16px;
-
-$padding-small-vertical: 5px;
-$padding-small-horizontal: 10px;
-
-$padding-xs-vertical: 1px;
-$padding-xs-horizontal: 5px;
-
-$line-height-large: 1.33;
-$line-height-small: 1.5;
-
-$border-radius-base: 4px;
-$border-radius-large: 6px;
-$border-radius-small: 3px;
-
-//** Global color for active items (e.g., navs or dropdowns).
-$component-active-color: #fff;
-//** Global background color for active items (e.g., navs or dropdowns).
-$component-active-bg: $brand-primary;
-
-//** Width of the `border` for generating carets that indicator dropdowns.
-$caret-width-base: 4px;
-//** Carets increase slightly in size for larger components.
-$caret-width-large: 5px;
-
-
-//** Background for the dropdown menu.
-$dropdown-bg: $gray-darker;
-//** Dropdown menu `border-color`.
-$dropdown-border: rgba(255,255,255,0.1);
-//** Dropdown menu `border-color` **for IE8**.
-$dropdown-fallback-border: #444;
-//** Divider color for between dropdown items.
-$dropdown-divider-bg: rgba(255,255,255,0.1);
-
-//** Active dropdown menu item text color.
-$dropdown-link-active-color: #fff;
-//** Active dropdown menu item background color.
-$dropdown-link-active-bg: $component-active-bg;
-
-//** Dropdown link text color.
-$dropdown-link-color: #fff;
-//** Hover color for dropdown links.
-$dropdown-link-hover-color: #fff;
-//** Hover background for dropdown links.
-$dropdown-link-hover-bg: $dropdown-link-active-bg;
-
-//** Disabled dropdown menu item background color.
-$dropdown-link-disabled-color: $text-muted;
-
-//** Text color for headers within dropdown menus.
-$dropdown-header-color: $text-muted;
-
-// Note: Deprecated $dropdown-caret-color as of v3.1.0
-$dropdown-caret-color: #000;
-
-//== Form states and alerts
-//
-//## Define colors for form feedback states and, by default, alerts.
-
-$state-success-text: #fff;
-$state-success-bg: $brand-success;
-$state-success-border: darken(adjust-hue($state-success-bg, -10deg), 5%);
-
-$state-info-text: #fff;
-$state-info-bg: $brand-info;
-$state-info-border: darken(adjust-hue($state-info-bg, -10deg), 7%);
-
-$state-warning-text: #fff;
-$state-warning-bg: $brand-warning;
-$state-warning-border: darken(adjust-hue($state-warning-bg, -10deg), 3%);
-
-$state-danger-text: #fff;
-$state-danger-bg: $brand-danger;
-$state-danger-border: darken(adjust-hue($state-danger-bg, -10deg), 3%);
-
-//== Panels
-//
-//##
-
-$panel-bg: $gray-darker;
-$panel-body-padding: 15px;
-$panel-border-radius: $border-radius-base;
-
-//** Border color for elements within panels
-$panel-inner-border: $gray-dark;
-$panel-default-heading-bg: lighten($gray-darker, 10%);
-$panel-footer-bg: $panel-default-heading-bg;
-
-$panel-default-text: $text-color;
-$panel-default-border: $panel-inner-border;
-
-$panel-primary-text: #fff;
-$panel-primary-border: $brand-primary;
-$panel-primary-heading-bg: $brand-primary;
-
-$panel-success-text: $state-success-text;
-$panel-success-border: $state-success-border;
-$panel-success-heading-bg: $state-success-bg;
-
-$panel-info-text: $state-info-text;
-$panel-info-border: $state-info-border;
-$panel-info-heading-bg: $state-info-bg;
-
-$panel-warning-text: $state-warning-text;
-$panel-warning-border: $state-warning-border;
-$panel-warning-heading-bg: $state-warning-bg;
-
-$panel-danger-text: $state-danger-text;
-$panel-danger-border: $state-danger-border;
-$panel-danger-heading-bg: $state-danger-bg;
-
-
-//== Pagination
-//
-//##
-
-$pagination-color: #fff;
-$pagination-bg: $gray-darker;
-$pagination-border: $gray-dark;
-
-$pagination-hover-color: #fff;
-$pagination-hover-bg: $component-active-bg;
-$pagination-hover-border: transparent;
-
-$pagination-active-color: #fff;
-$pagination-active-bg: $brand-primary;
-$pagination-active-border: transparent;
-
-$pagination-disabled-color: $gray-light;
-$pagination-disabled-bg: $gray-darker;
-$pagination-disabled-border: $gray-dark;
-
-
-//== Pager
-//
-//##
-
-$pager-bg: $pagination-bg;
-$pager-border: $pagination-border;
-$pager-border-radius: 15px;
-
-$pager-hover-bg: $pagination-hover-bg;
-
-$pager-active-bg: $pagination-active-bg;
-$pager-active-color: $pagination-active-color;
-
-$pager-disabled-color: $gray-light;
-
diff --git a/source/stylesheets/base.css.scss b/source/stylesheets/base.css.scss
index 6125efa..bcef650 100644
--- a/source/stylesheets/base.css.scss
+++ b/source/stylesheets/base.css.scss
@@ -1,43 +1,3 @@
-@import "variables";
-@import "bootstrap";
+@import "normalize.scss";
+@import "foundation.scss";
-body {
- @extend .container-fluid;
-}
-
-header {
- @extend .row;
-}
-
-#content {
- @extend .row;
-}
-
-#main {
- @extend .col-sm-8;
- @extend .col-sm-offset-2;
-}
-
-
-div#logo {
- @extend .col-sm-4;
- @extend .col-sm-offset-2;
-}
-
-nav {
- @extend .navbar;
- @extend .navbar-static-top;
- @extend .navbar-inverse;
-}
-
-nav ul {
- @extend .nav;
- @extend .navbar-nav;
-}
-
-// navbar justified is umpossible; this is the best we can do now....
-.navbar-collapse {
- @extend .col-sm-offset-2;
-}
-
-@import "blog";