Skip to content

Commit

Permalink
Fixes for OpenUserJS#544
Browse files Browse the repository at this point in the history
* Tell compiler not to compress. We handle this elsewhere. Fix for dbg mode too.
* In case someone tries to access **any** of these .less files in dev/dbg add **all** to `.gitignore`. Finish coding shock. ;)
* Scoot/modify the comments in `oujs.less` file to indicate where things should usually go
* Create an "unstaged" area in `oujs-bootswatch.less` for unstaged/unincorporated CSS into the variables/mixin stream... e.g. move my fixes to the bottom. If we stick with bootstrap these should be added to the updates. Bootswatch may at some point twiddle with these values so putting at end forces them to happen with standard cascading in style sheets

Applies to OpenUserJS#249 and should be near parallel change for OpenUserJS#379
  • Loading branch information
Martii committed Jan 21, 2015
1 parent cd4ce67 commit 1239e56
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 32 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ prod.sh
/iisnode

public/less/bootstrap/oujs.css
public/less/bootstrap/oujs-variables.css
public/less/bootstrap/oujs-bootswatch.css
3 changes: 3 additions & 0 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ if (minify && !isDbg) {
}

app.use(lessMiddleware(__dirname + '/public', {
compiler: {
compress: false
},
parser: {
paths: [
path.join(__dirname, 'node_modules/bootstrap/less')
Expand Down
65 changes: 34 additions & 31 deletions public/less/bootstrap/oujs-bootswatch.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,6 @@
// Bootswatch
// -----------------------------------------------------

// c53b597
.label-info a {
color: #fff;
text-decoration: none;
}
// /c53b597

// ce08ea6
/*
* Homepage: http://www.google.com/fonts/specimen/Squada+One
* License: SIL Open Font License, 1.1
* From: @import url("https://fonts.googleapis.com/css?family=Squada+One");
*/
@font-face {
font-family: 'Squada One';
font-style: normal;
font-weight: 400;
src: local('Squada One'), local('SquadaOne-Regular'), url(../../fonts/squadaone.woff) format('woff');
}
// /ce08ea6

// 113f426
.breadcrumb {
margin-bottom: 10px;
}

.pagination {
margin: 10px 0;
}
// /113f426

p:last-child {
margin-bottom: 0;
}
Expand Down Expand Up @@ -160,3 +129,37 @@ table {
.label-inverse {
background-color: @gray-dark;
}


// Unstaged ===================================================================

// c53b597
.label-info a {
color: #fff;
text-decoration: none;
}
// /c53b597

// ce08ea6
/*
* Homepage: http://www.google.com/fonts/specimen/Squada+One
* License: SIL Open Font License, 1.1
* From: @import url("https://fonts.googleapis.com/css?family=Squada+One");
*/
@font-face {
font-family: 'Squada One';
font-style: normal;
font-weight: 400;
src: local('Squada One'), local('SquadaOne-Regular'), url(../../fonts/squadaone.woff) format('woff');
}
// /ce08ea6

// 113f426
.breadcrumb {
margin-bottom: 10px;
}

.pagination {
margin: 10px 0;
}
// /113f426
3 changes: 2 additions & 1 deletion public/less/bootstrap/oujs.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

// Core variables and mixins
@import "variables.less";
// OUJS overrides to upstream variables and mixins
// OUJS overrides to upstream variables
@import "oujs-variables.less";

@import "mixins.less";
// OUJS overrides to upstream mixins

// Reset
@import "normalize.less";
Expand Down

0 comments on commit 1239e56

Please sign in to comment.