Skip to content

Commit

Permalink
# style
Browse files Browse the repository at this point in the history
  • Loading branch information
@masijiaqiu
masijiaqiu committed Mar 31, 2018
1 parent f827898 commit e05fcb4
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 58 deletions.
2 changes: 1 addition & 1 deletion initial/src/main/resources/static/css/bootstrap.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 11 additions & 1 deletion initial/src/main/resources/static/css/style.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions initial/src/main/resources/templates/individual.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ <h2 class="fh5co-heading animate-box" data-animate-effect="fadeInLeft">Welcome t

<div class="animate-box">

<div name="mkck main table" id="individual-report" class="fh5co-narrow-content fh5co-border-bottom row">
<div name="mkck main table" id="individual-report" class="fh5co-narrow-table fh5co-border-bottom row">
<table class="pop-table" border="0">
<thead>
<tr>
Expand Down Expand Up @@ -404,7 +404,7 @@ <h2 class="fh5co-heading animate-box" data-animate-effect="fadeInLeft">Welcome t
<canvas id="canvas-pie2"></canvas>
</div>

<div name="mkck main table" id="lab-results" class="fh5co-narrow-content fh5co-border-bottom row">
<div name="mkck main table" id="lab-results" class="fh5co-narrow-table fh5co-border-bottom row">
<table class="pop-table" border="0">
<thead>
<tr>
Expand Down
30 changes: 6 additions & 24 deletions initial/src/main/resources/templates/mkck.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@
datasets: [{
data: [1,1],
backgroundColor: [
window.chartColors.blue,
window.chartColors.red,
'#BACCA9',
'#E89E8A',
],
label: 'Gender Distribution'
}],
Expand All @@ -134,8 +134,8 @@
datasets: [{
data: [1,1],
backgroundColor: [
window.chartColors.green,
window.chartColors.orange,
'#F5D9AD',
'#717487',
],
label: 'Patients Condition'
}],
Expand Down Expand Up @@ -201,32 +201,14 @@ <h2 class="fh5co-heading animate-box" data-animate-effect="fadeInLeft">MKCK (pre

<div class="fh5co-narrow-content fh5co-border-bottom">
<div class="row animate-box" data-animate-effect="fadeInLeft">
<div name="mkck main table" id="individual-report" class="fh5co-narrow-content fh5co-border-bottom row">
<div name="mkck main table" id="individual-report" class="column_2">
<canvas id="canvas-pie1"></canvas>
</div>

<div name="mkck main table" id="individual-report" class="fh5co-narrow-content fh5co-border-bottom row">
<div name="mkck main table" id="individual-report" class="column_2">
<canvas id="canvas-pie2"></canvas>
</div>

<div name="mkck intro diagram" class="row">
<div class="col-md-4 col-sm-6 col-xs-6 col-xxs-12 work-item">
<img src="images/Population.png" alt="KidneyWatch Population Diagram" class="img-responsive" >
<h3 class="fh5co-work-title">Population Trend</h3>
<p>2012 - 2018</p>
</div>
<div class="col-md-4 col-sm-6 col-xs-6 col-xxs-12 work-item">
<img src="images/work_2.jpg" alt="KidneyWatch Population Diagram" class="img-responsive" >
<h3 class="fh5co-work-title">Age Distribution</h3>
<p>2018-04-01</p>
</div>
<div class="clearfix visible-sm-block"></div>
<div class="col-md-4 col-sm-6 col-xs-6 col-xxs-12 work-item">
<img src="images/work_3.jpg" alt="KidneyWatch Population Diagram" class="img-responsive" >
<h3 class="fh5co-work-title">Gender Distribution</h3>
<p>2018-04-01</p>
</div>
</div>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion initial/target/classes/static/css/bootstrap.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 11 additions & 1 deletion initial/target/classes/static/css/style.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions initial/target/classes/templates/home.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,11 @@
}, {
label: 'Female',
backgroundColor: '#E89E8A',
<<<<<<< Updated upstream
data: []
=======
data: [1,1,1,1]
>>>>>>> Stashed changes
}]

};
Expand Down
4 changes: 2 additions & 2 deletions initial/target/classes/templates/individual.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ <h2 class="fh5co-heading animate-box" data-animate-effect="fadeInLeft">Welcome t

<div class="animate-box">

<div name="mkck main table" id="individual-report" class="fh5co-narrow-content fh5co-border-bottom row">
<div name="mkck main table" id="individual-report" class="fh5co-narrow-table fh5co-border-bottom row">
<table class="pop-table" border="0">
<thead>
<tr>
Expand Down Expand Up @@ -404,7 +404,7 @@ <h2 class="fh5co-heading animate-box" data-animate-effect="fadeInLeft">Welcome t
<canvas id="canvas-pie2"></canvas>
</div>

<div name="mkck main table" id="lab-results" class="fh5co-narrow-content fh5co-border-bottom row">
<div name="mkck main table" id="lab-results" class="fh5co-narrow-table fh5co-border-bottom row">
<table class="pop-table" border="0">
<thead>
<tr>
Expand Down
22 changes: 2 additions & 20 deletions initial/target/classes/templates/mkck.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,32 +201,14 @@ <h2 class="fh5co-heading animate-box" data-animate-effect="fadeInLeft">MKCK (pre

<div class="fh5co-narrow-content fh5co-border-bottom">
<div class="row animate-box" data-animate-effect="fadeInLeft">
<div name="mkck main table" id="individual-report" class="fh5co-narrow-content fh5co-border-bottom row">
<div name="mkck main table" id="individual-report" class="column_2">
<canvas id="canvas-pie1"></canvas>
</div>

<div name="mkck main table" id="individual-report" class="fh5co-narrow-content fh5co-border-bottom row">
<div name="mkck main table" id="individual-report" class="column_2">
<canvas id="canvas-pie2"></canvas>
</div>

<div name="mkck intro diagram" class="row">
<div class="col-md-4 col-sm-6 col-xs-6 col-xxs-12 work-item">
<img src="images/Population.png" alt="KidneyWatch Population Diagram" class="img-responsive" >
<h3 class="fh5co-work-title">Population Trend</h3>
<p>2012 - 2018</p>
</div>
<div class="col-md-4 col-sm-6 col-xs-6 col-xxs-12 work-item">
<img src="images/work_2.jpg" alt="KidneyWatch Population Diagram" class="img-responsive" >
<h3 class="fh5co-work-title">Age Distribution</h3>
<p>2018-04-01</p>
</div>
<div class="clearfix visible-sm-block"></div>
<div class="col-md-4 col-sm-6 col-xs-6 col-xxs-12 work-item">
<img src="images/work_3.jpg" alt="KidneyWatch Population Diagram" class="img-responsive" >
<h3 class="fh5co-work-title">Gender Distribution</h3>
<p>2018-04-01</p>
</div>
</div>
</div>
</div>

Expand Down
12 changes: 6 additions & 6 deletions initial/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/Users/lucasmeng/kidney_watch/initial/src/main/java/KW/PatientRepository.java
/Users/lucasmeng/kidney_watch/initial/src/main/java/KW/Patient.java
/Users/lucasmeng/kidney_watch/initial/src/main/java/KW/MainController.java
/Users/lucasmeng/kidney_watch/initial/src/main/java/KW/Application.java
/Users/lucasmeng/kidney_watch/initial/src/main/java/KW/LabTestRepository.java
/Users/lucasmeng/kidney_watch/initial/src/main/java/KW/LabTest.java
/Users/choumasijia/Projects/kidney_watch/initial/src/main/java/KW/MainController.java
/Users/choumasijia/Projects/kidney_watch/initial/src/main/java/KW/Patient.java
/Users/choumasijia/Projects/kidney_watch/initial/src/main/java/KW/Application.java
/Users/choumasijia/Projects/kidney_watch/initial/src/main/java/KW/LabTest.java
/Users/choumasijia/Projects/kidney_watch/initial/src/main/java/KW/PatientRepository.java
/Users/choumasijia/Projects/kidney_watch/initial/src/main/java/KW/LabTestRepository.java

0 comments on commit e05fcb4

Please sign in to comment.