mirror of
https://github.com/sudoxnym/habitica-self-host.git
synced 2026-08-03 12:40:00 +00:00
don't add bootstrap css files in when instantiating derby-ui-boostrap,
instead compile in with the css. index.coffee directives are run against static pages too, which overwrites our bootstrap responsive (which we need) with the app's custom responsive styles. We may change this, but for now this commit allows us to keep the marketing site and main site styles separate
This commit is contained in:
parent
49dedf8f2f
commit
0c1151b123
4 changed files with 7 additions and 7 deletions
|
|
@ -1,7 +1,7 @@
|
|||
derby = require 'derby'
|
||||
app = derby.createApp module
|
||||
{get, view, ready} = app
|
||||
derby.use require('derby-ui-boot'), {styles: ['bootstrap']}
|
||||
derby.use require('derby-ui-boot'), {styles: []}
|
||||
derby.use require '../../ui'
|
||||
derby.use require 'derby-auth/components'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
@import "nib/vendor";
|
||||
@import "../../public/vendor/bootstrap/docs/assets/css/bootstrap.css";
|
||||
@import "./female_sprites.styl";
|
||||
@import "./male_sprites.styl";
|
||||
@import "./shop_sprites.styl";
|
||||
|
|
@ -12,6 +13,7 @@
|
|||
|
||||
@import "./scrollbars.styl";
|
||||
|
||||
|
||||
@import "../../public/vendor/bootstrap-datepicker/css/datepicker.css";
|
||||
|
||||
// fix exploding to very wide for some reason
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
HabitRPG | Gamify Your Life
|
||||
|
||||
<Head:>
|
||||
<app:head:head active="front"/>
|
||||
<app:head:head />
|
||||
|
||||
<Body:>
|
||||
<div id="wrap">
|
||||
<app:header:header />
|
||||
<app:header:header active="front"/>
|
||||
|
||||
|
||||
<div class='jumbotron masthead'>
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class='container'>
|
||||
<p style="height:600;"><iframe src="http://player.vimeo.com/video/57639356" width="960" height="539" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe></p>
|
||||
<p style="height:600;"><iframe src="http://player.vimeo.com/video/57639356" width="100%" height="539" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe></p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2,11 +2,9 @@
|
|||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css" rel="stylesheet">
|
||||
<link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap.min.css" rel="stylesheet">
|
||||
<link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css" rel="stylesheet">
|
||||
|
||||
<link href="/vendor/bootstrap/docs/assets/css/docs.css" rel="stylesheet">
|
||||
|
||||
<link href="/css/static-pages.css" rel="stylesheet">
|
||||
<link href="/css/footer.css" rel="stylesheet">
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue