compass-aura 0.1.5.2 → 0.1.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (2) hide show
  1. data/stylesheets/aura/_mixins.scss +19 -3
  2. metadata +2 -3
@@ -44,7 +44,7 @@
44
44
  @else if nth($sidebars, 2) == 'right' {
45
45
  float: none;
46
46
  @include respond-to('small') {
47
- float: right;
47
+ float: left;
48
48
  @if nth($sidebars, 1) == 1 {
49
49
  margin-left: 0;
50
50
  margin-right: gutter();
@@ -71,7 +71,7 @@
71
71
  float: left;
72
72
  }
73
73
  }
74
- @else if nth($sidebars, 2) == 'right' or nth($sidebars, 2) == 'both' {
74
+ @else if nth($sidebars, 2) == 'right' {
75
75
  float: none;
76
76
  @include respond-to('small') {
77
77
  float: right;
@@ -79,6 +79,13 @@
79
79
  margin-right: gutter();
80
80
  }
81
81
  }
82
+ @else if nth($sidebars, 2) == 'both' {
83
+ float: none;
84
+ @include respond-to('small') {
85
+ float: right;
86
+ margin-right: -1 * (columns($main-content-cols) + columns(sidebar-width($overflow: false)) + gutter());
87
+ }
88
+ }
82
89
  @else if nth($sidebars, 2) == 'none' {
83
90
  float: none;
84
91
  @include respond-to('small') {
@@ -149,12 +156,21 @@
149
156
  @include respond-to('small') {
150
157
  @include columns($main-content-cols);
151
158
  }
152
- @if nth($sidebars, 2) == 'left' or nth($sidebars, 2) == 'both'{
159
+ @if nth($sidebars, 2) == 'left'{
153
160
  float: none;
154
161
  @include respond-to('small') {
155
162
  float: right;
156
163
  }
157
164
  }
165
+ @else if nth($sidebars, 2) == 'both' {
166
+ float: none;
167
+ @include respond-to('small') {
168
+ float: right;
169
+ @include alpha;
170
+ margin-left: 0;
171
+ margin-right: columns(sidebar-width($overflow: false)) + gutter() + gutter();
172
+ }
173
+ }
158
174
  @else if nth($sidebars, 2) == 'right' {
159
175
  float: none;
160
176
  @include respond-to('small') {
metadata CHANGED
@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 1
8
- - 5
9
- - 2
10
- version: 0.1.5.2
8
+ - 6
9
+ version: 0.1.6
11
10
  platform: ruby
12
11
  authors:
13
12
  - Sam Richard