Skip to content

Commit

Permalink
Reorganizing CSS to merge with StoryJS Core
Browse files Browse the repository at this point in the history
  • Loading branch information
zachwise committed Jul 23, 2012
1 parent 712c4d4 commit 4d5e3dc
Show file tree
Hide file tree
Showing 11 changed files with 117 additions and 117 deletions.
106 changes: 53 additions & 53 deletions compiled/css/themes/dark.css

Large diffs are not rendered by default.

106 changes: 53 additions & 53 deletions compiled/css/timeline.css

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@font-sans: "Helvetica Neue", Helvetica, Arial, sans-serif;
@font-serif: "Georgia", Times New Roman, Times, serif;

.vmm-timeline {
.vmm-storyjs {
font-family: @font-serif;
/* HEADERS
------------------------------------------------------------------------------------------- */
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion source/less/Reset.less → source/less/Core/Reset.less
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* Reset
------------------------------------------------------------------------------------------- */

.vmm-timeline {
.vmm-storyjs {

/* Reset tags and common classes
Display in IE6-9 and FF3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Headings, body text, lists, etc
* ---------------------------------------------------------------------------------------- */

.vmm-timeline {
.vmm-storyjs {
font-size: @base-font;
font-weight: normal;
line-height: @base-line;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 8 additions & 8 deletions source/less/VMM.Timeline.less
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,24 @@
----------------------------------------------------- */

// CSS Reset
@import "Reset.less";
@import "Core/Reset.less";

// Core variables and mixins
@import "Font.Default.less";
@import "Variables.less";
@import "Mixins.less";
@import "GFX.less";
@import "Core/Font.Default.less";
@import "Core/Variables.less";
@import "Core/Mixins.less";
@import "Core/GFX.less";

// Grid system and page structure
@import "VMM.Timeline.Core.less";
@import "VMM.Slider.less";
@import "Core/VMM.Slider.less";
@import "VMM.Timeline.TimeNav.less";

// Typography
@import "Typography.less";
@import "Core/Typography.less";

// Grid system and page structure
@import "VMM.Timeline.Tooltip.less";
@import "Core/VMM.Tooltip.less";


/* MEDIA QUERIES
Expand Down

0 comments on commit 4d5e3dc

Please sign in to comment.