Skip to content

Commit

Permalink
bootstrap 4
Browse files Browse the repository at this point in the history
  • Loading branch information
QWp6t authored and retlehs committed Mar 11, 2016
1 parent f752470 commit c9ef232
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 40 deletions.
4 changes: 1 addition & 3 deletions assets/styles/common/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// Glyphicons font path
$icon-font-path: "../fonts/";

// Grid settings
$enable-flex: true;
$main-sm-columns: 12;
$sidebar-sm-columns: 4;

Expand Down
2 changes: 1 addition & 1 deletion assets/styles/components/_comments.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.comment-list {
@include list-unstyled;
@extend .list-unstyled;
}
.comment-list ol {
list-style: none;
Expand Down
16 changes: 12 additions & 4 deletions assets/styles/components/_grid.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
// Grid system
.main {
@include make-sm-column($main-sm-columns);
.sidebar-primary & {
@include make-sm-column($main-sm-columns - $sidebar-sm-columns);
@include make-col();

@include media-breakpoint-up(sm) {
@include make-col-span($main-sm-columns);
.sidebar-primary & {
@include make-col-span($main-sm-columns - $sidebar-sm-columns);
}
}
}
.sidebar {
@include make-sm-column($sidebar-sm-columns);
@include make-col();

@include media-breakpoint-up(sm) {
@include make-col-span($sidebar-sm-columns);
}
}
12 changes: 6 additions & 6 deletions assets/styles/components/_wp-classes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@
}
.aligncenter {
display: block;
margin: ($line-height-computed / 2) auto;
margin: ($spacer / 2) auto;
height: auto;
}
.alignleft,
.alignright {
margin-bottom: ($line-height-computed / 2);
margin-bottom: ($spacer / 2);
height: auto;
}
@media (min-width: $screen-sm-min) {
@include media-breakpoint-up(sm) {
// Only float if not on an extra small device
.alignleft {
float: left;
margin-right: ($line-height-computed / 2);
margin-right: ($spacer / 2);
}
.alignright {
float: right;
margin-left: ($line-height-computed / 2);
margin-left: ($spacer / 2);
}
}

Expand All @@ -35,7 +35,7 @@
@extend .thumbnail;
}
.wp-caption-text {
padding: $thumbnail-caption-padding;
padding: $thumbnail-padding;
}

// Text meant only for screen readers
Expand Down
6 changes: 6 additions & 0 deletions assets/styles/layouts/_header.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.banner .nav li {
@extend .nav-item;
}
.banner .nav a {
@extend .nav-link;
}
2 changes: 1 addition & 1 deletion assets/styles/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// Automatically injected Bower dependencies via wiredep (never manually edit this block)
// bower:scss
@import "../../bower_components/bootstrap-sass/assets/stylesheets/_bootstrap.scss";
@import "../../bower_components/bootstrap/scss/bootstrap.scss";
// endbower

@import "common/global";
Expand Down
27 changes: 2 additions & 25 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,7 @@
"license": "MIT",
"private": true,
"dependencies": {
"bootstrap-sass": "3.3.6"
},
"overrides": {
"bootstrap-sass": {
"main": [
"./assets/stylesheets/_bootstrap.scss",
"./assets/javascripts/bootstrap/transition.js",
"./assets/javascripts/bootstrap/alert.js",
"./assets/javascripts/bootstrap/button.js",
"./assets/javascripts/bootstrap/carousel.js",
"./assets/javascripts/bootstrap/collapse.js",
"./assets/javascripts/bootstrap/dropdown.js",
"./assets/javascripts/bootstrap/modal.js",
"./assets/javascripts/bootstrap/tooltip.js",
"./assets/javascripts/bootstrap/popover.js",
"./assets/javascripts/bootstrap/scrollspy.js",
"./assets/javascripts/bootstrap/tab.js",
"./assets/javascripts/bootstrap/affix.js",
"./assets/fonts/bootstrap/glyphicons-halflings-regular.eot",
"./assets/fonts/bootstrap/glyphicons-halflings-regular.svg",
"./assets/fonts/bootstrap/glyphicons-halflings-regular.ttf",
"./assets/fonts/bootstrap/glyphicons-halflings-regular.woff",
"./assets/fonts/bootstrap/glyphicons-halflings-regular.woff2"
]
}
"bootstrap": "git://github.com/twbs/bootstrap.git#v4-dev",
"tether": "^1.1.1"
}
}

0 comments on commit c9ef232

Please sign in to comment.