Permalink
Browse files

More changes to sass framework

  • Loading branch information...
1 parent b17fdbc commit 80e80b6d6b7cd22974f81faf940a41679286eb53 @phillipkregg committed Mar 26, 2013
@@ -17,15 +17,13 @@
//*************** Import Defaults *****************
@import "bourbon";
@import "bootstrap";
-@import "bootstrap-responsive";
+//@import "bootstrap-responsive";
//*************** Sass based framework below! *********
// include grid
-@import "sass/grid/row";
-@import "sass/grid/spans";
-@import "sass/grid/offsets";
+@import "sass/grid/grid";
//include post styles
@import "sass/user_posts/post";
@@ -37,3 +35,5 @@
+
+
@@ -0,0 +1,7 @@
+
+.container,
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+ width: 940px;
+}
@@ -0,0 +1,55 @@
+
+
+.row-fluid {
+ width: 100%;
+ *zoom: 1;
+
+ &.row-fluid:before,
+ &.row-fluid:after {
+ display: table;
+ content: "";
+ line-height: 0;
+ }
+ &.row-fluid:after {
+ clear: both;
+ }
+ &[class*="span"] {
+ display: block;
+ width: 100%;
+ min-height: 30px;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ float: left;
+ margin-left: 2.127659574468085%;
+ *margin-left: 2.074468085106383%;
+ }
+ &[class*="span"]:first-child {
+ margin-left: 0;
+ }
+
+}// end row fluid
+
+
+
+.controls-row [class*="span"] + [class*="span"] {
+ @extend .row-fluid;
+ margin-left: 2.127659574468085%;
+}
+
+@mixin row-fluid {
+ @extend .row-fluid;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2,9 +2,8 @@
.span {
float: left;
min-height: 1px;
- margin-left: 20px;
-
- border: 1px solid blue;
+ margin-left: 20px;
+ border: 1px solid red;
}
@mixin span12 {
@@ -0,0 +1,26 @@
+
+.span {
+ float: left;
+ min-height: 1px;
+ margin-left: 20px;
+
+}
+
+@mixin fluid-span12 {
+ @extend .row-fluid;
+ background: blue;
+ width: 100%;
+ *width: 99.94680851063829%;
+}
+
+@mixin fluid-span11 {
+ width: 91.48936170212765%;
+ *width: 91.43617021276594%;
+}
+
+@mixin fluid-span6 {
+ @extend .row-fluid;
+ background: red;
+ width: 48.93617021276595%;
+ *width: 48.88297872340425%;
+}
@@ -0,0 +1,8 @@
+
+@import "container";
+@import "spans";
+@import "offsets";
+@import "row";
+@import "row_fluid";
+@import "spans_fluid";
+
@@ -1,19 +1,38 @@
+
+
div.post_container {
- @include span12;
+ @include span12;
+
background: #e5e5e5;
div.post_header {
- background: black;
+ background: black;
padding: 10px;
span {
color: #fff;
}
span:nth-child(2) {
float: right;
}
+ }//end post header
+ div.comment_avatar {
+ @include span2;
+ background: yellow;
+ div.comment_user_name {
+ button.btn.dropdown-toggle {
+ background: none;
+ border: none;
+ }
+ }
+
+ }// end comment avatar
+ div.comment_body {
+ @include offset2;
+
+ background: blue;
}
}
@@ -9,7 +9,8 @@
</ul>
</div>
-<div class="wrapper">
+
+<div class="container">
<h3 class="page_title pull-left">Is Hercarim balanced? UP? or OP?</h3>
<div class="btn-group pull-right">
@@ -45,13 +46,12 @@
<!-- Posts Below -->
- <div class="row">
+ <div class="row">
<div class="post_container">
<div class="post_header">
<span>Posted 3 days ago</span>
- <span>#1</span>
-
+ <span>#1</span>
</div>
<div class="comment_avatar">
<div class="comment_user_name">
@@ -82,7 +82,9 @@
</div>
-
+ <div>
+ <div></div>
+ </div>

0 comments on commit 80e80b6

Please sign in to comment.