Permalink
Browse files

(Bug 5073) Basic foundation/SCSS set up

The beginning of Foundation setup for Tropospherical, etc.
  • Loading branch information...
1 parent dcb0fc1 commit 9e9a72db9e97fe3792ddb9ad03f2459da62a7db4 @foxfirefey foxfirefey committed with zorkian Jun 4, 2013
View
@@ -0,0 +1,6 @@
+*.sw?
+
+# Ignore SCSS cache
+.sass-cache
+# Ignore compiled CSS
+htdocs/stc/css
View
@@ -0,0 +1,20 @@
+# Require any additional compass plugins here.
+require 'zurb-foundation'
+
+# Set this to the root of your project when deployed:
+http_path = "/"
+css_dir = "htdocs/stc/css"
+sass_dir = "htdocs/scss"
+images_dir = "htdocs/img"
+javascripts_dir = "htdocs/js"
+
+add_import_path "../../htdocs/scss"
+
+# You can select your preferred output style here (can be overridden via the command line):
+# output_style = :expanded or :nested or :compact or :compressed
+
+# To enable relative paths to assets via compass helper functions. Uncomment:
+# relative_assets = true
+
+# To disable debugging comments that display the original location of your selectors. Uncomment:
+line_comments = false
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
View
@@ -43,22 +43,26 @@ HEAD
LJ::set_active_resource_group( 'jquery' );
LJ::need_res( { group => 'jquery' }, 'js/homepage_loggedin.js' );
+ $ret .= '<div class="row">';
my $panels = DW::Panel->init( u => $remote );
- $ret .= '<div id="primary">';
+ $ret .= '<div id="primary" class="large-8 small-12 columns">';
$ret .= $panels->render_primary;
$ret .= '</div>';
- $ret .= '<div id="secondary">';
+ $ret .= '<div id="secondary" class="large-4 small-12 columns">';
$ret .= $panels->render_secondary;
- $ret .= '</div><div class="clear-floats"></div>';
+ $ret .= '</div>';
+ $ret .= '</div>';
}
else {
# logged-out homepage
use DW::InviteCodes;
LJ::need_res( "js/tropo/homepage.js" );
- LJ::need_res( "stc/tropo/homepage.css" );
+ LJ::need_res( { group => "default" }, "stc/tropo/homepage.css" );
+ LJ::need_res( { group => "jquery" }, "stc/tropo/homepage.css" );
+ LJ::need_res( { group => "foundation" }, "stc/css/schemes/tropo/homepage.css" );
$headextra .= <<HEAD;
<script type="text/javascript">
@@ -77,8 +81,8 @@ HEAD
$headextra .= "</script>\n";
$ret .= <<HTML;
-<div id="intro-box">
- <div id="intro-box-main">
+<div id="intro-box" class="row collapse">
+ <div id="intro-box-main" class="columns large-7 small-12">
<div id="intro-border-main-top"></div>
<div id="intro-border-main-bottom"></div>
<div id="intro-border-main-left">
@@ -96,14 +100,8 @@ HTML
$ret .= <<HTML;
</div>
</div>
- <div id="intro-box-create">
- <div id="intro-border-create-top"></div>
- <div id="intro-border-create-bottom"></div>
- <div id="intro-border-create-right">
- <div id="intro-border-create-bottomright"></div>
- <div id="intro-border-create-topright"></div>
- </div>
- <div id="intro-create-content">
+ <div id="intro-box-create" class="columns large-5 small-12">
+ <div id="intro-create-content" >
HTML
$ret .= "<h1>" . BML::ml( ".create.join_dreamwidth", { sitename => $LJ::SITENAMESHORT } ) . "</h1>\n";
@@ -175,9 +173,10 @@ HTML
push @{$columns[1]->{items}}, [ 'http://dw-codesharing.dreamwidth.org/', 'codeshare' ]
if $LJ::USE_ACCT_CODES;
+ $ret .= '<div class="row">';
foreach my $column ( @columns ) {
my $name = $column->{name};
- $ret .= " <div id=\"links-$name\" class=\"links-column\">\n";
+ $ret .= " <div id=\"links-$name\" class=\"column large-4 small-12\">\n";
$ret .= " <h2>" . BML::ml( ".links.$name", { sitename => $LJ::SITENAMESHORT } ) . "</h2>\n";
$ret .= " <dl>\n";
foreach my $item ( @{$column->{items}} ) {
@@ -194,7 +193,7 @@ HTML
$ret .= " <p><small>" . BML::ml( ".links.$name." . $column->{footnote}, { sitename => $LJ::SITENAMESHORT } ) . "</small></p>\n" if defined $column->{footnote};
$ret .= " </div>\n";
}
- $ret .= "</div>\n";
+ $ret .= "</div></div>\n";
}
return $ret;
Oops, something went wrong.

0 comments on commit 9e9a72d

Please sign in to comment.