steve
/
mybuddy
mirror of https://github.com/snachodog/mybuddy.git
1
0
Fork 0
Code Issues 3 Packages Projects 1 Releases Wiki Activity

Replace inline CSS for diaper change types card and prepare for other sass styling.

This commit is contained in:
Christopher Charbonneau Wells 2017-08-21 11:03:18 -04:00
parent 3d0af7f9a5
commit b05b268c7e
10 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
babyblotter/static_site/scss/_functions.scss Normal file
View File

@ -0,0 +1,3 @@
@import "../../../node_modules/bootstrap/scss/functions";
/* Baby Blotter site-wide custom functions. */

4
babyblotter/static_site/scss/_variables.scss Normal file
View File

@ -0,0 +1,4 @@
@import "functions";
@import "../../../node_modules/bootstrap/scss/variables";
/* Baby Blotter site-wide custom variables. */

4
babyblotter/static_site/scss/babyblotter.scss
View File

@ -1,4 +1,4 @@
@import "../../../node_modules/bootstrap/scss/functions"; @import "functions";
@import "../../../node_modules/bootstrap/scss/variables"; @import "variables";
@import "custom"; @import "custom";
@import "../../../node_modules/bootstrap/scss/bootstrap"; @import "../../../node_modules/bootstrap/scss/bootstrap";

7
dashboard/static/scss/cards.scss Normal file
View File

@ -0,0 +1,7 @@
@import "../../../babyblotter/static_site/scss/variables";
.card-diaperchange {
.progress {
height: $progress-height * 2;
}
}

2
dashboard/templates/cards/diaperchange.html
View File

@ -1,4 +1,4 @@
<div class="card border-danger mb-3"> <div class="card card-diaperchange border-danger mb-3">
<div class="card-header text-white bg-danger h4"> <div class="card-header text-white bg-danger h4">
<i class="fa fa-trash pull-left" aria-hidden="true"></i> <i class="fa fa-trash pull-left" aria-hidden="true"></i>
{% block header %}{% endblock %} {% block header %}{% endblock %}

20
dashboard/templates/cards/diaperchange_types.html
View File

@ -9,13 +9,19 @@
{% block content %} {% block content %}
{% for date, info in stats.items %} {% for date, info in stats.items %}
<div class="progress mt-3"> <div class="progress mt-3">
<div class="progress-bar bg-info lead"
role="progressbar" {% if info.wet_pct > 0 %}
style="width: {{ info.wet_pct }}%; height: 30px; line-height: 30px">{{ info.wet }} wet</div> <div class="progress-bar bg-info lead"
<div class="progress-bar bg-dark lead" role="progressbar"
role="progressbar" style="width: {{ info.wet_pct }}%;">{{ info.wet }}&nbsp;wet</div>
style="width: {{ info.solid_pct }}%; height: 30px; line-height: 30px"> {% endif %}
<strong>{{ info.solid }}</strong> solid</div>
{% if info.solid_pct > 0 %}
<div class="progress-bar bg-dark lead"
role="progressbar"
style="width: {{ info.solid_pct }}%;">
<strong>{{ info.solid }}</strong>&nbsp;solid</div>
{% endif %}
</div> </div>
<div class="text-center text-dark small"> <div class="text-center text-dark small">
{{ date|date:'D' }} {{ date|date:'D' }}

2
dashboard/templates/cards/feeding.html
View File

@ -1,4 +1,4 @@
<div class="card border-primary mb-3"> <div class="card card-feeding border-primary mb-3">
<div class="card-header text-white bg-primary h4"> <div class="card-header text-white bg-primary h4">
<i class="fa fa-spoon pull-left" aria-hidden="true"></i> <i class="fa fa-spoon pull-left" aria-hidden="true"></i>
{% block header %}{% endblock %} {% block header %}{% endblock %}

2
dashboard/templates/cards/sleep.html
View File

@ -1,4 +1,4 @@
<div class="card border-dark mb-3"> <div class="card card-sleep border-dark mb-3">
<div class="card-header text-white bg-dark h4"> <div class="card-header text-white bg-dark h4">
<i class="fa fa-bed pull-left" aria-hidden="true"></i> <i class="fa fa-bed pull-left" aria-hidden="true"></i>
{% block header %}{% endblock %} {% block header %}{% endblock %}

2
dashboard/templates/cards/tummytime.html
View File

@ -1,4 +1,4 @@
<div class="card border-success mb-3"> <div class="card card-tummytime border-success mb-3">
<div class="card-header text-white bg-success h4"> <div class="card-header text-white bg-success h4">
<i class="fa fa-smile-o pull-left" aria-hidden="true"></i> <i class="fa fa-smile-o pull-left" aria-hidden="true"></i>
{% block header %}{% endblock %} {% block header %}{% endblock %}

5
gulpfile.js
View File

@ -21,7 +21,10 @@ gulp.task('app:scripts', function() {
gulp.task('app:styles', function (cb) { gulp.task('app:styles', function (cb) {
pump([ pump([
gulp.src('babyblotter/static_site/scss/babyblotter.scss'), gulp.src([
'babyblotter/static_site/scss/babyblotter.scss',
'*/static/scss/*.scss'
]),
sass().on('error', sass.logError), sass().on('error', sass.logError),
concat('app.css'), concat('app.css'),
gulp.dest('babyblotter/static/babyblotter/css/') gulp.dest('babyblotter/static/babyblotter/css/')