Skip to content
This repository has been archived by the owner on May 4, 2022. It is now read-only.

Commit

Permalink
switched to vanilla bootstrap 3.1.1 and it feels right
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Levett committed Feb 22, 2016
1 parent 4121ec4 commit 292f81e
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 9 deletions.
3 changes: 1 addition & 2 deletions uw-frame-components/bower.json
Expand Up @@ -27,14 +27,13 @@
"angular-resource": "1.4.9",
"angular-route": "1.4.9",
"angular-sanitize": "1.4.9",
"bootstrap": "~3.1.1",
"bootstrap": "3.1.1",
"font-awesome": "^4.3.0",
"jquery": "~2.1.1",
"jquery-ui": "~1.11.4",
"ngstorage": "0.3.10",
"normalize-less": "*",
"requirejs": "*",
"uw-ui-toolkit": "0.4.1",
"angulartics": "~1.0.3",
"angulartics-google-analytics": "~0.1.4"
},
Expand Down
2 changes: 1 addition & 1 deletion uw-frame-components/css/angular.less
@@ -1,6 +1,6 @@
@import "../bower_components/normalize-less/normalize.less";
@import "../../bower_components/font-awesome/css/font-awesome.css";
@import "../bower_components/uw-ui-toolkit/src/less/uw-ui-toolkit.less";
@import "../bower_components/bootstrap/less/bootstrap.less";
.my-uw {
@import "buckyless/base.less";
@import "buckyless/helpers.less";
Expand Down
4 changes: 1 addition & 3 deletions uw-frame-components/css/themes/common-variables.less
Expand Up @@ -74,8 +74,6 @@
@border: 1px solid @grayscale3;

@body-background-color: @white;
@body-background-image: url(./common/images/grey-jean.png);
/* Using the furley pattern from http://subtlepatterns.com */

/**
* Link colors
Expand Down Expand Up @@ -182,4 +180,4 @@

.float (@direction: left) {
float: @direction;
}
}
Binary file not shown.
2 changes: 1 addition & 1 deletion uw-frame-components/css/themes/uw-madison.less
@@ -1,3 +1,3 @@
@import "../angular.less"; //order is important here
@import "common-variables.less";
@import "uw-madison-variables.less";
@import "../angular.less";
2 changes: 1 addition & 1 deletion uw-frame-components/css/themes/uw-river-falls.less
@@ -1,3 +1,3 @@
@import "../angular.less"; //order is important here
@import "common-variables.less";
@import "uw-river-falls-variables.less";
@import "../angular.less";
2 changes: 1 addition & 1 deletion uw-frame-components/css/themes/uw-system.less
@@ -1,3 +1,3 @@
@import "../angular.less"; //order is important here
@import "common-variables.less";
@import "uw-system-variables.less";
@import "../angular.less";

0 comments on commit 292f81e

Please sign in to comment.