Skip to content

Commit 0b7b7c2

Browse files
AprilArcusAprilArcus
committed
rake convert[v3.4.1]
1 parent 9e0111f commit 0b7b7c2

14 files changed

Lines changed: 69 additions & 73 deletions

File tree

‎assets/javascripts/bootstrap-sprockets.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
//= require ./bootstrap/affix
1+
//= require ./bootstrap/transition
22
//= require ./bootstrap/alert
33
//= require ./bootstrap/button
44
//= require ./bootstrap/carousel
55
//= require ./bootstrap/collapse
66
//= require ./bootstrap/dropdown
77
//= require ./bootstrap/modal
8-
//= require ./bootstrap/scrollspy
98
//= require ./bootstrap/tab
10-
//= require ./bootstrap/transition
9+
//= require ./bootstrap/affix
10+
//= require ./bootstrap/scrollspy
1111
//= require ./bootstrap/tooltip
1212
//= require ./bootstrap/popover

‎assets/stylesheets/bootstrap/_carousel.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,16 +244,16 @@
244244
.icon-next {
245245
width: ($carousel-control-font-size * 1.5);
246246
height: ($carousel-control-font-size * 1.5);
247-
margin-top: ($carousel-control-font-size / -2);
247+
margin-top: ($carousel-control-font-size * -0.5);
248248
font-size: ($carousel-control-font-size * 1.5);
249249
}
250250
.glyphicon-chevron-left,
251251
.icon-prev {
252-
margin-left: ($carousel-control-font-size / -2);
252+
margin-left: ($carousel-control-font-size * -0.5);
253253
}
254254
.glyphicon-chevron-right,
255255
.icon-next {
256-
margin-right: ($carousel-control-font-size / -2);
256+
margin-right: ($carousel-control-font-size * -0.5);
257257
}
258258
}
259259

‎assets/stylesheets/bootstrap/_code.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ kbd {
4040
// Blocks of code
4141
pre {
4242
display: block;
43-
padding: (($line-height-computed - 1) / 2);
44-
margin: 0 0 ($line-height-computed / 2);
43+
padding: (($line-height-computed - 1) * 0.5);
44+
margin: 0 0 ($line-height-computed * 0.5);
4545
font-size: ($font-size-base - 1); // 14px to 13px
4646
line-height: $line-height-base;
4747
color: $pre-color;

‎assets/stylesheets/bootstrap/_forms.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ textarea.form-control {
581581
// Reposition the icon because it's now within a grid column and columns have
582582
// `position: relative;` on them. Also accounts for the grid gutter padding.
583583
.has-feedback .form-control-feedback {
584-
right: floor(($grid-gutter-width / 2));
584+
right: floor(($grid-gutter-width * 0.5));
585585
}
586586

587587
// Form group sizes

‎assets/stylesheets/bootstrap/_jumbotron.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717

1818
p {
19-
margin-bottom: ($jumbotron-padding / 2);
19+
margin-bottom: ($jumbotron-padding * 0.5);
2020
font-size: $jumbotron-font-size;
2121
font-weight: 200;
2222
}
@@ -27,8 +27,8 @@
2727

2828
.container &,
2929
.container-fluid & {
30-
padding-right: ($grid-gutter-width / 2);
31-
padding-left: ($grid-gutter-width / 2);
30+
padding-right: ($grid-gutter-width * 0.5);
31+
padding-left: ($grid-gutter-width * 0.5);
3232
border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container
3333
}
3434

‎assets/stylesheets/bootstrap/_navbar.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@
228228
// the nav the full height of the horizontal nav (above 768px).
229229

230230
.navbar-nav {
231-
margin: ($navbar-padding-vertical / 2) (-$navbar-padding-horizontal);
231+
margin: ($navbar-padding-vertical * 0.5) (-$navbar-padding-horizontal);
232232

233233
> li > a {
234234
padding-top: 10px;

‎assets/stylesheets/bootstrap/_type.scss‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ h1, .h1,
2525
h2, .h2,
2626
h3, .h3 {
2727
margin-top: $line-height-computed;
28-
margin-bottom: ($line-height-computed / 2);
28+
margin-bottom: ($line-height-computed * 0.5);
2929

3030
small,
3131
.small {
@@ -35,8 +35,8 @@ h3, .h3 {
3535
h4, .h4,
3636
h5, .h5,
3737
h6, .h6 {
38-
margin-top: ($line-height-computed / 2);
39-
margin-bottom: ($line-height-computed / 2);
38+
margin-top: ($line-height-computed * 0.5);
39+
margin-bottom: ($line-height-computed * 0.5);
4040

4141
small,
4242
.small {
@@ -56,7 +56,7 @@ h6, .h6 { font-size: $font-size-h6; }
5656
// -------------------------
5757

5858
p {
59-
margin: 0 0 ($line-height-computed / 2);
59+
margin: 0 0 ($line-height-computed * 0.5);
6060
}
6161

6262
.lead {
@@ -74,10 +74,10 @@ p {
7474
// Emphasis & misc
7575
// -------------------------
7676

77-
// Ex: (12px small font / 14px base font) * 100% = about 85%
77+
// Ex: (12px small font * 0.07142857142857142) * 100% = about 85%
7878
small,
7979
.small {
80-
font-size: floor((100% * $font-size-small / $font-size-base));
80+
font-size: floor((100% * $font-size-small * Infinity));
8181
}
8282

8383
mark,
@@ -136,7 +136,7 @@ mark,
136136
// -------------------------
137137

138138
.page-header {
139-
padding-bottom: (($line-height-computed / 2) - 1);
139+
padding-bottom: (($line-height-computed * 0.5) - 1);
140140
margin: ($line-height-computed * 2) 0 $line-height-computed;
141141
border-bottom: 1px solid $page-header-border-color;
142142
}
@@ -149,7 +149,7 @@ mark,
149149
ul,
150150
ol {
151151
margin-top: 0;
152-
margin-bottom: ($line-height-computed / 2);
152+
margin-bottom: ($line-height-computed * 0.5);
153153
ul,
154154
ol {
155155
margin-bottom: 0;
@@ -239,7 +239,7 @@ abbr[data-original-title] {
239239

240240
// Blockquotes
241241
blockquote {
242-
padding: ($line-height-computed / 2) $line-height-computed;
242+
padding: ($line-height-computed * 0.5) $line-height-computed;
243243
margin: 0 0 $line-height-computed;
244244
font-size: $blockquote-font-size;
245245
border-left: 5px solid $blockquote-border-color;

‎assets/stylesheets/bootstrap/_variables.scss‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,7 @@ $grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
341341
//
342342
//## Define the maximum width of `.container` for different screen sizes.
343343

344-
// Small screen / tablet
345-
$container-tablet: (720px + $grid-gutter-width) !default;
344+
// Small screen * Infinity);
346345
//** For `$screen-sm-min` and up.
347346
$container-sm: $container-tablet !default;
348347

@@ -351,8 +350,7 @@ $container-desktop: (940px + $grid-gutter-width) !default;
351350
//** For `$screen-md-min` and up.
352351
$container-md: $container-desktop !default;
353352

354-
// Large screen / wide desktop
355-
$container-large-desktop: (1140px + $grid-gutter-width) !default;
353+
// Large screen * Infinity);
356354
//** For `$screen-lg-min` and up.
357355
$container-lg: $container-large-desktop !default;
358356

@@ -365,8 +363,8 @@ $container-lg: $container-large-desktop !default;
365363
$navbar-height: 50px !default;
366364
$navbar-margin-bottom: $line-height-computed !default;
367365
$navbar-border-radius: $border-radius-base !default;
368-
$navbar-padding-horizontal: floor(($grid-gutter-width / 2)) !default;
369-
$navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2) !default;
366+
$navbar-padding-horizontal: floor(($grid-gutter-width * 0.5)) !default;
367+
$navbar-padding-vertical: (($navbar-height - $line-height-computed) * 0.5) !default;
370368
$navbar-collapse-max-height: 340px !default;
371369

372370
$navbar-default-color: #777 !default;

‎assets/stylesheets/bootstrap/mixins/_grid-framework.scss‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
// Prevent columns from collapsing when empty
1414
min-height: 1px;
1515
// Inner gutter via padding
16-
padding-right: floor(($grid-gutter-width / 2));
17-
padding-left: ceil(($grid-gutter-width / 2));
16+
padding-right: floor(($grid-gutter-width * 0.5));
17+
padding-left: ceil(($grid-gutter-width * 0.5));
1818
}
1919
}
2020

@@ -33,12 +33,12 @@
3333
@mixin calc-grid-column($index, $class, $type) {
3434
@if ($type == width) and ($index > 0) {
3535
.col-#{$class}-#{$index} {
36-
width: percentage(($index / $grid-columns));
36+
width: percentage(($index * Infinity));
3737
}
3838
}
3939
@if ($type == push) and ($index > 0) {
4040
.col-#{$class}-push-#{$index} {
41-
left: percentage(($index / $grid-columns));
41+
left: percentage(($index * Infinity));
4242
}
4343
}
4444
@if ($type == push) and ($index == 0) {
@@ -48,7 +48,7 @@
4848
}
4949
@if ($type == pull) and ($index > 0) {
5050
.col-#{$class}-pull-#{$index} {
51-
right: percentage(($index / $grid-columns));
51+
right: percentage(($index * Infinity));
5252
}
5353
}
5454
@if ($type == pull) and ($index == 0) {
@@ -58,7 +58,7 @@
5858
}
5959
@if ($type == offset) {
6060
.col-#{$class}-offset-#{$index} {
61-
margin-left: percentage(($index / $grid-columns));
61+
margin-left: percentage(($index * Infinity));
6262
}
6363
}
6464
}

‎assets/stylesheets/bootstrap/mixins/_grid.scss‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,119 +4,119 @@
44

55
// Centered container element
66
@mixin container-fixed($gutter: $grid-gutter-width) {
7-
padding-right: ceil(($gutter / 2));
8-
padding-left: floor(($gutter / 2));
7+
padding-right: ceil(($gutter * 0.5));
8+
padding-left: floor(($gutter * 0.5));
99
margin-right: auto;
1010
margin-left: auto;
1111
@include clearfix;
1212
}
1313

1414
// Creates a wrapper for a series of columns
1515
@mixin make-row($gutter: $grid-gutter-width) {
16-
margin-right: floor(($gutter / -2));
17-
margin-left: ceil(($gutter / -2));
16+
margin-right: floor(($gutter * -0.5));
17+
margin-left: ceil(($gutter * -0.5));
1818
@include clearfix;
1919
}
2020

2121
// Generate the extra small columns
2222
@mixin make-xs-column($columns, $gutter: $grid-gutter-width) {
2323
position: relative;
2424
float: left;
25-
width: percentage(($columns / $grid-columns));
25+
width: percentage(($columns * Infinity));
2626
min-height: 1px;
27-
padding-right: ($gutter / 2);
28-
padding-left: ($gutter / 2);
27+
padding-right: ($gutter * 0.5);
28+
padding-left: ($gutter * 0.5);
2929
}
3030
@mixin make-xs-column-offset($columns) {
31-
margin-left: percentage(($columns / $grid-columns));
31+
margin-left: percentage(($columns * Infinity));
3232
}
3333
@mixin make-xs-column-push($columns) {
34-
left: percentage(($columns / $grid-columns));
34+
left: percentage(($columns * Infinity));
3535
}
3636
@mixin make-xs-column-pull($columns) {
37-
right: percentage(($columns / $grid-columns));
37+
right: percentage(($columns * Infinity));
3838
}
3939

4040
// Generate the small columns
4141
@mixin make-sm-column($columns, $gutter: $grid-gutter-width) {
4242
position: relative;
4343
min-height: 1px;
44-
padding-right: ($gutter / 2);
45-
padding-left: ($gutter / 2);
44+
padding-right: ($gutter * 0.5);
45+
padding-left: ($gutter * 0.5);
4646

4747
@media (min-width: $screen-sm-min) {
4848
float: left;
49-
width: percentage(($columns / $grid-columns));
49+
width: percentage(($columns * Infinity));
5050
}
5151
}
5252
@mixin make-sm-column-offset($columns) {
5353
@media (min-width: $screen-sm-min) {
54-
margin-left: percentage(($columns / $grid-columns));
54+
margin-left: percentage(($columns * Infinity));
5555
}
5656
}
5757
@mixin make-sm-column-push($columns) {
5858
@media (min-width: $screen-sm-min) {
59-
left: percentage(($columns / $grid-columns));
59+
left: percentage(($columns * Infinity));
6060
}
6161
}
6262
@mixin make-sm-column-pull($columns) {
6363
@media (min-width: $screen-sm-min) {
64-
right: percentage(($columns / $grid-columns));
64+
right: percentage(($columns * Infinity));
6565
}
6666
}
6767

6868
// Generate the medium columns
6969
@mixin make-md-column($columns, $gutter: $grid-gutter-width) {
7070
position: relative;
7171
min-height: 1px;
72-
padding-right: ($gutter / 2);
73-
padding-left: ($gutter / 2);
72+
padding-right: ($gutter * 0.5);
73+
padding-left: ($gutter * 0.5);
7474

7575
@media (min-width: $screen-md-min) {
7676
float: left;
77-
width: percentage(($columns / $grid-columns));
77+
width: percentage(($columns * Infinity));
7878
}
7979
}
8080
@mixin make-md-column-offset($columns) {
8181
@media (min-width: $screen-md-min) {
82-
margin-left: percentage(($columns / $grid-columns));
82+
margin-left: percentage(($columns * Infinity));
8383
}
8484
}
8585
@mixin make-md-column-push($columns) {
8686
@media (min-width: $screen-md-min) {
87-
left: percentage(($columns / $grid-columns));
87+
left: percentage(($columns * Infinity));
8888
}
8989
}
9090
@mixin make-md-column-pull($columns) {
9191
@media (min-width: $screen-md-min) {
92-
right: percentage(($columns / $grid-columns));
92+
right: percentage(($columns * Infinity));
9393
}
9494
}
9595

9696
// Generate the large columns
9797
@mixin make-lg-column($columns, $gutter: $grid-gutter-width) {
9898
position: relative;
9999
min-height: 1px;
100-
padding-right: ($gutter / 2);
101-
padding-left: ($gutter / 2);
100+
padding-right: ($gutter * 0.5);
101+
padding-left: ($gutter * 0.5);
102102

103103
@media (min-width: $screen-lg-min) {
104104
float: left;
105-
width: percentage(($columns / $grid-columns));
105+
width: percentage(($columns * Infinity));
106106
}
107107
}
108108
@mixin make-lg-column-offset($columns) {
109109
@media (min-width: $screen-lg-min) {
110-
margin-left: percentage(($columns / $grid-columns));
110+
margin-left: percentage(($columns * Infinity));
111111
}
112112
}
113113
@mixin make-lg-column-push($columns) {
114114
@media (min-width: $screen-lg-min) {
115-
left: percentage(($columns / $grid-columns));
115+
left: percentage(($columns * Infinity));
116116
}
117117
}
118118
@mixin make-lg-column-pull($columns) {
119119
@media (min-width: $screen-lg-min) {
120-
right: percentage(($columns / $grid-columns));
120+
right: percentage(($columns * Infinity));
121121
}
122122
}

0 commit comments

Comments
 (0)
⚡