Skip to content

Commit 5ca1bfd

Browse files
darklowdarklow
committed
Upgrade to Bootstrap v4-alpha5. Variable changes, padding fixes.
1 parent f1d7c0c commit 5ca1bfd

16 files changed

+964
-816
lines changed

Diff for: ‎bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
"tests"
1515
],
1616
"devDependencies": {
17-
"bootstrap": "v4.0.0-alpha.2"
17+
"bootstrap": "v4.0.0-alpha.5"
1818
}
1919
}

Diff for: ‎demo/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Django==1.9.3
1+
Django==1.9.11

Diff for: ‎suit/sass/_variables.scss

+12-8
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,24 @@ $font-size-lg: $font-size-h5;
5050
$gray-light: lighten($gray-light, 10%);
5151
$text-muted: $gray-light;
5252
$sidebar-width: 200px;
53-
$header-padding-horizontal: $grid-gutter-width;
54-
$header-padding-vertical: $grid-gutter-width/1.8;
55-
$nav-padding-horizontal: $grid-gutter-width + .75rem;
53+
$grid-gutter-width-base: 1.875rem;
54+
$header-padding-horizontal: $grid-gutter-width-base;
55+
$header-padding-vertical: $grid-gutter-width-base/1.8;
56+
$nav-padding-horizontal: $grid-gutter-width-base + .75rem;
5657

5758
// Buttons
5859
// --------------------------------------------------
59-
$btn-padding-x: 1.2rem;
60-
$btn-padding-y: .35rem;
61-
$btn-padding-x-lg: 1.5rem;
62-
$btn-padding-y-lg: .6rem;
60+
//$btn-line-height: $line-height-base;
61+
//$btn-padding-x: 1.2rem;
62+
//$btn-padding-y: .35rem;
63+
//$btn-padding-x-lg: 1.5rem;
64+
//$btn-padding-y-lg: .6rem;
65+
//$btn-padding-x-sm: .75rem;
6366

6467
// Inputs
6568
// --------------------------------------------------
66-
$input-padding-y: $btn-padding-y;
69+
$textarea-line-height: $line-height-base;
70+
//$input-padding-y: $btn-padding-y;
6771

6872
// Tables
6973
// --------------------------------------------------

Diff for: ‎suit/sass/_vendor.scss

+13-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
1+
/*!
2+
* Bootstrap v4.0.0-alpha.5 (https://getbootstrap.com)
3+
* Copyright 2011-2016 The Bootstrap Authors
4+
* Copyright 2011-2016 Twitter, Inc.
5+
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
6+
*/
7+
18
// Core variables and mixins
29
//@import "../../bower_components/bootstrap/scss/variables";
310
@import "../../bower_components/bootstrap/scss/mixins";
11+
412
// Reset and dependencies
513
@import "../../bower_components/bootstrap/scss/normalize";
614
@import "../../bower_components/bootstrap/scss/print";
15+
716
// Core CSS
817
@import "../../bower_components/bootstrap/scss/reboot";
918
@import "../../bower_components/bootstrap/scss/type";
@@ -13,6 +22,7 @@
1322
@import "../../bower_components/bootstrap/scss/tables";
1423
@import "../../bower_components/bootstrap/scss/forms";
1524
@import "../../bower_components/bootstrap/scss/buttons";
25+
1626
// Components
1727
@import "../../bower_components/bootstrap/scss/animation";
1828
@import "../../bower_components/bootstrap/scss/dropdown";
@@ -24,22 +34,20 @@
2434
@import "../../bower_components/bootstrap/scss/card";
2535
//@import "../../bower_components/bootstrap/scss/breadcrumb";
2636
//@import "../../bower_components/bootstrap/scss/pagination";
27-
@import "../../bower_components/bootstrap/scss/pager";
28-
@import "../../bower_components/bootstrap/scss/labels";
37+
@import "../../bower_components/bootstrap/scss/tags";
2938
//@import "../../bower_components/bootstrap/scss/jumbotron";
3039
@import "../../bower_components/bootstrap/scss/alert";
3140
@import "../../bower_components/bootstrap/scss/progress";
3241
//@import "../../bower_components/bootstrap/scss/media";
3342
//@import "../../bower_components/bootstrap/scss/list-group";
3443
@import "../../bower_components/bootstrap/scss/responsive-embed";
3544
@import "../../bower_components/bootstrap/scss/close";
45+
3646
// Components w/ JavaScript
3747
@import "../../bower_components/bootstrap/scss/modal";
3848
@import "../../bower_components/bootstrap/scss/tooltip";
3949
//@import "../../bower_components/bootstrap/scss/popover";
4050
//@import "../../bower_components/bootstrap/scss/carousel";
51+
4152
// Utility classes
4253
@import "../../bower_components/bootstrap/scss/utilities";
43-
@import "../../bower_components/bootstrap/scss/utilities-background";
44-
@import "../../bower_components/bootstrap/scss/utilities-spacing";
45-
@import "../../bower_components/bootstrap/scss/utilities-responsive";

Diff for: ‎suit/sass/components/_alerts.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
.messagelist {
66
@include reset-list();
77
display: block;
8-
margin: 1rem $grid-gutter-width 0;
8+
margin: 1rem $grid-gutter-width-base 0;
99
li {
1010
@extend .alert;
1111
&.success {

Diff for: ‎suit/sass/components/_buttons.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
}
2323
}
2424

25-
.btn-danger-outline {
25+
.btn-outline-danger {
2626
border-color: transparentize($brand-danger, .25);
2727
background-color: #fff;
2828
}

Diff for: ‎suit/sass/components/_forms.scss

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ $suit-label-padding-top: $suit-form-padding-vertical + .55rem;
44
$suit-label-padding-bottom: $suit-form-padding-vertical + .4rem;
55
$suit-padding-first-extra: .25rem;
66

7+
textarea.form-control {
8+
line-height: $textarea-line-height;
9+
}
710
fieldset {
811
@include suit-box-shadow();
912
margin-bottom: 2rem;

Diff for: ‎suit/sass/components/_submit_row.scss

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
margin: 0;
55
.deletelink {
66
@extend .btn;
7-
@extend .btn-danger-outline;
7+
@extend .btn-outline-danger;
88
}
99
}
1010
input[type='submit'], input[type='button'], button, .btn {
@@ -35,7 +35,7 @@
3535
.submit-row {
3636
@include media-breakpoint-up(lg) {
3737
position: relative;
38-
padding: $grid-gutter-width/2;
38+
padding: $grid-gutter-width-base/2;
3939
background-color: $form-bg;
4040
display: flex;
4141
flex-wrap: wrap;
@@ -49,14 +49,14 @@
4949
}
5050
.deletelink-box {
5151
text-align: right;
52-
margin-top: $grid-gutter-width/2;
52+
margin-top: $grid-gutter-width-base/2;
5353
order: 10;
5454
}
5555
}
5656
}
5757
.object-tools {
5858
@include reset-list();
59-
margin-top: $grid-gutter-width;
59+
margin-top: $grid-gutter-width-base;
6060
//padding: $grid-gutter-width/2;
6161
@include media-breakpoint-down(md) {
6262
display: none;
@@ -75,7 +75,7 @@
7575
display: block;
7676
margin-top: 1px;
7777
background-color: $form-bg;
78-
padding: $grid-gutter-width/3 $grid-gutter-width/2;
78+
padding: $grid-gutter-width-base/3 $grid-gutter-width-base/2;
7979
@include suit-box-shadow();
8080
}
8181
&:not(.list-item) a {
@@ -90,13 +90,13 @@
9090
&.heading {
9191
@include text-semibold();
9292
font-size: $font-size-lg;
93-
padding: 0 $grid-gutter-width/3 $grid-gutter-width/4;
93+
padding: 0 $grid-gutter-width-base/3 $grid-gutter-width-base/4;
9494
&.heading-inverse {
9595
background-color: $inverse-lightest;
9696
color: #fff;
9797
font-weight: normal;
9898
font-size: $font-size-base;
99-
padding: $grid-gutter-width/4 $grid-gutter-width/3;
99+
padding: $grid-gutter-width-base/4 $grid-gutter-width-base/3;
100100
}
101101
}
102102
}

Diff for: ‎suit/sass/components/_widgets.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fieldset {
1616
}
1717
}
1818
select:not([multiple="multiple"]) {
19-
@extend .c-select;
19+
@extend .custom-select;
2020
border-radius: $input-border-radius;
2121
}
2222
input {

Diff for: ‎suit/sass/layout/_content.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ body.change-form {
4343
@extend .btn-round;
4444
@include btn-mixin(info, none, sm, round=true);
4545
&.addlink {
46-
@include btn-mixin(success, $icon-plus-circle, sm, round=true);
46+
@include btn-mixin(success, $icon-plus-circle, null, round=true);
4747
}
4848
}
4949
}

Diff for: ‎suit/sass/layout/_footer.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ $footer-height: 66px;
2323
color: $gray;
2424
font-size: $font-size-sm;
2525
> .container-fluid {
26-
padding: 1rem $grid-gutter-width;
26+
padding: 1rem $grid-gutter-width-base;
2727
> .row {
2828
justify-content: center;
2929
align-content: center;

Diff for: ‎suit/sass/layout/_navbars.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
font-weight: bold;
3737
box-shadow: inset 0 3px 0 $link-color-brighter;
3838
&:hover {
39-
@include gradient-vertical(darken($body-bg, 3%), #fff);
39+
@include gradient-y(darken($body-bg, 3%), #fff);
4040
}
4141
}
4242
}

Diff for: ‎suit/sass/pages/_changeform.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ body.change-form {
3333
.edit-row {
3434
display: flex;
3535
> div {
36-
margin: 0 $grid-gutter-width/2;
36+
margin: 0 $grid-gutter-width-base/2;
3737
flex-wrap: wrap;
3838
&.col-left {
3939
flex: 1;

Diff for: ‎suit/sass/pages/_changelist.scss

+6-5
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ $filter-col-width: 15rem;
3535
@extend .form-control;
3636
display: inline-block;
3737
width: auto;
38+
vertical-align: middle;
3839
&:before {
3940
@include fa-icon-font();
4041
content: $icon-plus;
@@ -53,22 +54,22 @@ $filter-col-width: 15rem;
5354
right: 0;
5455
font-size: $font-size-sm;
5556
h2 {
56-
margin-bottom: $grid-gutter-width/2;
57+
margin-bottom: $grid-gutter-width-base/2;
5758
display: none;
5859
}
5960
h3 {
6061
background-color: $inverse-lightest;
6162
color: #fff;
6263
font-size: $font-size-sm;
6364
font-weight: normal;
64-
padding: $grid-gutter-width/4 $grid-gutter-width/3;
65+
padding: $grid-gutter-width-base/4 $grid-gutter-width-base/3;
6566
margin: 0;
6667
}
6768
ul {
6869
background-color: #fff;
6970
@include reset-list();
70-
padding: $grid-gutter-width/3 0;
71-
margin-bottom: $grid-gutter-width/1.5;
71+
padding: $grid-gutter-width-base/3 0;
72+
margin-bottom: $grid-gutter-width-base/1.5;
7273
li {
7374
border-left: 3px solid transparent;
7475
margin-left: -3px;
@@ -83,7 +84,7 @@ $filter-col-width: 15rem;
8384
}
8485
a {
8586
padding: .1rem;
86-
padding-left: $grid-gutter-width / 1.5;
87+
padding-left: $grid-gutter-width-base / 1.5;
8788
display: block;
8889
}
8990
}

Diff for: ‎suit/sass/pages/_dashboard.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
body.dashboard {
22
.module {
3-
margin: 0 $grid-gutter-width $grid-gutter-width/2 0;
3+
margin: 0 $grid-gutter-width-base $grid-gutter-width-base/2 0;
44
table {
55
width: 100%;
66
border-spacing: 1px;

0 commit comments

Comments
 (0)