Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source 
Conflicts:
	styles/app/index.styl
This commit is contained in:
Tyler Renelle
2013-03-21 11:27:42 -06:00
parent be305f918e 7c77126129
commit ae9546180c
10 changed files with 1071 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
-12
View File
@@ -1,18 +1,6 @@
[submodule "public/vendor/bootstrap-datepicker"]
path = public/vendor/bootstrap-datepicker
url = https://github.com/eternicode/bootstrap-datepicker.git
[submodule "public/vendor/bootstrap-growl"]
path = public/vendor/bootstrap-growl
url = https://github.com/ifightcrime/bootstrap-growl.git
[submodule "public/vendor/bootstrap"]
path = public/vendor/bootstrap
url = https://github.com/twitter/bootstrap.git
[submodule "public/vendor/github-buttons"]
path = public/vendor/github-buttons
url = https://github.com/mdo/github-buttons.git
[submodule "public/vendor/jquery-cookie"]
path = public/vendor/jquery-cookie
url = https://github.com/carhartl/jquery-cookie.git
[submodule "public/vendor/jquery-ui"]
path = public/vendor/jquery-ui
url = https://github.com/jquery/jquery-ui.git
public/css/docs.css
+1067
View File
File diff suppressed because it is too large Load Diff
public/vendor/bootstrap
Vendored
-1
Submodule public/vendor/bootstrap deleted from eb24718add
public/vendor/bootstrap-datepicker
Vendored
-1
Submodule public/vendor/bootstrap-datepicker deleted from 3f12c74bcd
public/vendor/bootstrap-growl
Vendored
-1
Submodule public/vendor/bootstrap-growl deleted from c033de329b
public/vendor/jquery-cookie
Vendored
-1
Submodule public/vendor/jquery-cookie deleted from cefb0c3999
styles/app/index.styl
-8
View File
@@ -1,9 +1,4 @@
@import "nib/vendor";
@import "../../public/vendor/bootstrap/docs/assets/css/bootstrap.css";
// REMOVEME adding into master since we need bootstrap-responsive, remove this once develop is merged in
@import "../../public/vendor/bootstrap/docs/assets/css/bootstrap-responsive.css";
@import "./female_sprites.styl";
@import "./male_sprites.styl";
@import "./shop_sprites.styl";
@@ -14,12 +9,9 @@
@import "./alerts.styl";
@import "./helpers.styl";
@import "./responsive.styl";
@import "./scrollbars.styl";
@import "../../public/vendor/bootstrap-datepicker/css/datepicker.css";
// fix exploding to very wide for some reason
.datepicker
width: 210px
views/app/index.html
+2
View File
@@ -21,6 +21,8 @@
<!-- CDN -->
<link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.1/css/bootstrap.min.css" rel="stylesheet">
<link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css" rel="stylesheet">
<link href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.0.0/css/datepicker.css" rel="stylesheet">
<Header:>
<app:modals:modals />
views/static/front.html
+1 -1
View File
@@ -21,7 +21,7 @@
</div>
</div>
<div class='container'>
<p style="height:600;"><iframe src="http://player.vimeo.com/video/57639356" width="100%" height="539" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe></p>
<p style="height:600;"><iframe src="//player.vimeo.com/video/57639356" width="100%" height="539" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe></p>
</div>
</div>
views/static/head.html
+1 -1
View File
@@ -6,7 +6,7 @@
<link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.1/css/bootstrap.min.css" rel="stylesheet">
<link href="//cdnjs.cloudflare.com/ajax/libs/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/docs.css" rel="stylesheet">
<link href="/css/static-pages.css" rel="stylesheet">
<link href="/css/footer.css" rel="stylesheet">