Merge pull request #12 from Dtphelan1/master

Collaboration branding changes
standardhealth · Nov 16, 2016 · a147d5b · a147d5b
2 parents f638450 + 1e13443
commit a147d5b
Show file tree

Hide file tree

Showing 15 changed files with 351 additions and 352 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-*.DS_Store
-_site/
+_site
 .sass-cache
-.jekyll-assets-cache
+.jekyll-metadata
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -149,4 +149,4 @@ DEPENDENCIES
   rake (= 10.4.2)
 
 BUNDLED WITH
-   1.13.5
+   1.13.6
diff --git a/_includes/head.html b/_includes/head.html
@@ -1,12 +1,12 @@
   <head>
-<!--     <title>Standard Health Record Initiative, universal health record, EHR, EMR, Open Source, semantic interoperability, Health IT, Elctronic Health Record, Syntheticmass,MITRE</title>
+<!--     <title>Standard Health Record Collaborative, universal health record, EHR, EMR, Open Source, semantic interoperability, Health IT, Elctronic Health Record, Syntheticmass,MITRE</title>
  -->    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width">
-    <meta name="description" content="The Standard Health Record Initiative is working to create a single, high-quality health record for every individual in the United States.">
+    <meta name="description" content="The Standard Health Record Collaborative is working to create a single, high-quality health record for every individual in the United States.">
     <meta name="keywords" content="HealthIT,medical errors,semantic interoperability,healthcare interoperability,interoperability,Electronic Health Record,Electronic Medical Record,EMR,EHR,synthetic patient,SyntheticMass,MITRE,Personal Health Record,Universal Health Record,National Health Record
       ">
-    <title>Standard Health Record Initiative | One human, one health record {% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
+    <title>Standard Health Record Collaborative | One human, one health record {% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
     <script src="//ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
 
     <link href='//fonts.googleapis.com/css?family=Lato:400,300,400italic,700' rel='stylesheet' type='text/css'>

diff --git a/assets/img/completeness.svg b/assets/img/completeness.svg
diff --git a/assets/img/mail_icon.svg b/assets/img/mail_icon.svg
diff --git a/assets/img/navbar_toggle.svg b/assets/img/navbar_toggle.svg
diff --git a/assets/img/shr_brand_logo.svg b/assets/img/shr_brand_logo.svg
diff --git a/assets/img/timeline-border-first.svg b/assets/img/timeline-border-first.svg
diff --git a/assets/img/timeline-border-last.svg b/assets/img/timeline-border-last.svg
diff --git a/assets/img/timeline-border.svg b/assets/img/timeline-border.svg
diff --git a/assets/img/world-map-low.svg b/assets/img/world-map-low.svg
diff --git a/favicon-16x16.png b/favicon-16x16.png
diff --git a/favicon-32x32.png b/favicon-32x32.png
diff --git a/favicon.ico b/favicon.ico
diff --git a/feedback.html b/feedback.html
@@ -9,7 +9,7 @@
     <div class="row feedback">
       <div class="col-xs-12 col-sm-8 col-md-6 col-sm-offset-2 col-md-offset-3">
         <h1 class="title">Feedback</h1>
-        <p class="text-center">If you would like to provide feedback or start a dialogue about the SHR, please reach out at <a href="mailto:shr-project-list@lists.mitre.org" style="white-space:nowrap">SHR Initiative</a>.</p>
+        <p class="text-center">If you would like to provide feedback or start a dialogue about the SHR, please reach out at <a href="mailto:shr-project-list@lists.mitre.org" style="white-space:nowrap">SHR Collaborative</a>.</p>
         <p class="text-center" style="margin-bottom: 0px;"><a href="https://github.com/standardhealth"><img src="assets/img/GitHub-Mark-64px.png"></a> </p>
         <p class="text-center"><a href="https://github.com/standardhealth">Join us on GitHub</a></p>
       </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -149,4 +149,4 @@ DEPENDENCIES @@
       rake (= 10.4.2)
     BUNDLED WITH
-.13.5
+.13.6