From 3adc55c0226a7a79b2a6361467efec1af008cf36 Mon Sep 17 00:00:00 2001
From: Carlos Valle <carlos.m.valle@gmail.com>
Date: Thu, 29 Mar 2018 17:21:43 -0400
Subject: [PATCH 1/2] Logo updated and css clean up

---
 .../site-components/header/header.template.html  |  4 ++--
 src/patterns/pages/page-a/page.template.html     |  4 ++--
 src/patterns/pages/page-b/page.template.html     |  4 ++--
 src/prototypes/components/picker/template.html   | 12 ++++++------
 .../prototypes-components.component.ts           |  4 +---
 src/styles/docs.scss                             |  6 +++++-
 src/styles/sam-design-system/patterns/_home.scss |  2 +-
 .../sam-design-system/prototypes/_base.scss      |  5 -----
 src/styles/transition/_button.scss               |  3 +++
 src/styles/transition/_input.scss                |  6 ++++++
 src/styles/transition/_label.scss                |  7 +++++++
 src/styles/transition/_radio.scss                | 16 ++++++++++++++++
 src/styles/transition/_select.scss               |  1 -
 src/styles/transition/_title.scss                |  3 +++
 14 files changed, 54 insertions(+), 23 deletions(-)
 create mode 100644 src/styles/transition/_button.scss
 create mode 100644 src/styles/transition/_input.scss
 create mode 100644 src/styles/transition/_label.scss
 create mode 100644 src/styles/transition/_radio.scss
 create mode 100644 src/styles/transition/_title.scss

diff --git a/src/app/site-components/header/header.template.html b/src/app/site-components/header/header.template.html
index debea3e17..55a49294f 100644
--- a/src/app/site-components/header/header.template.html
+++ b/src/app/site-components/header/header.template.html
@@ -1,7 +1,7 @@
 <header class="site-header">
   <nav class="site-container">
 
-    <a [routerLink]="['/']" class="text-logo">
+    <a [routerLink]="['/']" class="text-logo" style="display: none;">
       SAM Design System
     </a>
     
@@ -28,7 +28,7 @@
       </svg>
     </a>
     
-    <a [routerLink]="['/']" style="display: none;">
+    <a [routerLink]="['/']">
       <svg width="224px" height="43px" viewBox="0 0 224 43" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
         <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
           <g id="sam.govds-logo" transform="translate(0.000000, -2.000000)">
diff --git a/src/patterns/pages/page-a/page.template.html b/src/patterns/pages/page-a/page.template.html
index 977891d38..a822aa1e1 100755
--- a/src/patterns/pages/page-a/page.template.html
+++ b/src/patterns/pages/page-a/page.template.html
@@ -18,8 +18,8 @@
 				Learning Center
 			</sam-title>
 			<div class="sam search">
-				<input class="sam input" type="search" placeholder="Search">
-				<button class="sam button left attached">
+				<input class="sam transition input" type="search" placeholder="Search">
+				<button class="sam transition button left attached">
 					<sam-icon name="search"></sam-icon>
 				</button>
 			</div>
diff --git a/src/patterns/pages/page-b/page.template.html b/src/patterns/pages/page-b/page.template.html
index 98587bcca..e143a43a2 100755
--- a/src/patterns/pages/page-b/page.template.html
+++ b/src/patterns/pages/page-b/page.template.html
@@ -19,8 +19,8 @@
 				Learning Center
 			</sam-title>
 			<div class="sam search">
-				<input class="sam input" type="search" placeholder="Search">
-				<button class="sam button left attached">
+				<input class="sam transition input" type="search" placeholder="Search">
+				<button class="sam transition button left attached">
 					<sam-icon name="search"></sam-icon>
 				</button>
 			</div>
diff --git a/src/prototypes/components/picker/template.html b/src/prototypes/components/picker/template.html
index c574db962..2a631ff8d 100644
--- a/src/prototypes/components/picker/template.html
+++ b/src/prototypes/components/picker/template.html
@@ -5,20 +5,20 @@
   </sam-title>
   
   <div class="sam search">
-    <input class="sam input" type="search" placeholder="Search">
-    <button class="sam button left attached">
+    <input class="sam transition input" type="search" placeholder="Search">
+    <button class="sam transition button left attached">
       <sam-icon name="search"></sam-icon>
     </button>
   </div>
   
   <div class="picker-radios">
     <span>
-      <input type="radio" id="search-all"name="search" value="all" checked>
-      <label for="search-all">Search All</label>
+      <input class="sam transition" type="radio" id="search-all"name="search" value="all" checked>
+      <label class="sam transition" for="search-all">Search All</label>
     </span>
     <span>
-      <input type="radio" id="search-here" name="search" value="here">
-      <label for="search-here">
+      <input class="sam transition" type="radio" id="search-here" name="search" value="here">
+      <label class="sam transition" for="search-here">
         Search here
       </label>
     </span>
diff --git a/src/prototypes/components/prototypes-components.component.ts b/src/prototypes/components/prototypes-components.component.ts
index 299687b98..218fbbce0 100644
--- a/src/prototypes/components/prototypes-components.component.ts
+++ b/src/prototypes/components/prototypes-components.component.ts
@@ -10,9 +10,7 @@ import {
 
 @Component({
   template:  `
-  <div class="prototype-page">
-    <router-outlet></router-outlet>
-  </div>
+  <router-outlet></router-outlet>
   <div class="patterns-menu">
     <a routerLink="/prototypes">Prototypes Home</a>
     <span class="patterns-menu-divider"></span>
diff --git a/src/styles/docs.scss b/src/styles/docs.scss
index fbeca10ab..31174ad6e 100644
--- a/src/styles/docs.scss
+++ b/src/styles/docs.scss
@@ -16,7 +16,12 @@
  * Removes overwrites that happen in sam-front-end layer
  */
 
+@import "transition/input";
 @import "transition/select";
+@import "transition/radio";
+@import "transition/label";
+@import "transition/button";
+@import "transition/title";
 
 /* SAM Design System Pages
    ========================================================================== */
@@ -45,7 +50,6 @@
 
 @import "sam-design-system/patterns/home";
 
-
 /**
  * Components
  */
diff --git a/src/styles/sam-design-system/patterns/_home.scss b/src/styles/sam-design-system/patterns/_home.scss
index 0af0d27c8..559465bd0 100644
--- a/src/styles/sam-design-system/patterns/_home.scss
+++ b/src/styles/sam-design-system/patterns/_home.scss
@@ -25,7 +25,7 @@ ol.row{
   text-decoration: none;
 }
 .card-title {
-  margin-bottom: 1rem;
+  margin-bottom: 1rem !important;
   color: #16243A;
   font-size: 1em;
   line-height: 1.25;
diff --git a/src/styles/sam-design-system/prototypes/_base.scss b/src/styles/sam-design-system/prototypes/_base.scss
index 8d4c731a7..e69de29bb 100644
--- a/src/styles/sam-design-system/prototypes/_base.scss
+++ b/src/styles/sam-design-system/prototypes/_base.scss
@@ -1,5 +0,0 @@
-.prototype-page{
-  background-color: #f8f8fb;
-  display: inline-block;
-  width: 100%;
-}
\ No newline at end of file
diff --git a/src/styles/transition/_button.scss b/src/styles/transition/_button.scss
new file mode 100644
index 000000000..8afffa516
--- /dev/null
+++ b/src/styles/transition/_button.scss
@@ -0,0 +1,3 @@
+button.sam.transition{
+  margin: 0;
+}
\ No newline at end of file
diff --git a/src/styles/transition/_input.scss b/src/styles/transition/_input.scss
new file mode 100644
index 000000000..cc6af316f
--- /dev/null
+++ b/src/styles/transition/_input.scss
@@ -0,0 +1,6 @@
+input.sam.transition,
+select.sam.transition{
+  height: initial;
+  margin: 0;
+  line-height: 1.15;
+}
\ No newline at end of file
diff --git a/src/styles/transition/_label.scss b/src/styles/transition/_label.scss
new file mode 100644
index 000000000..76b423116
--- /dev/null
+++ b/src/styles/transition/_label.scss
@@ -0,0 +1,7 @@
+label.sam.transition{
+  display: inline;
+}
+
+label.sam.transition::before{
+  content: none;
+}
\ No newline at end of file
diff --git a/src/styles/transition/_radio.scss b/src/styles/transition/_radio.scss
new file mode 100644
index 000000000..b57bdf875
--- /dev/null
+++ b/src/styles/transition/_radio.scss
@@ -0,0 +1,16 @@
+input[type="radio"].sam.transition{
+  opacity: 1;
+  -webkit-appearance: radio;
+  -moz-appearance: radio;
+  margin: 0;
+  position: static;
+  max-width: none;
+  cursor: default;
+  height: auto;
+  display: inline-block;
+  width: auto;
+}
+
+input[type="radio"].sam.transition:focus{
+  box-shadow: none;
+}
\ No newline at end of file
diff --git a/src/styles/transition/_select.scss b/src/styles/transition/_select.scss
index 32730db8c..691516c37 100644
--- a/src/styles/transition/_select.scss
+++ b/src/styles/transition/_select.scss
@@ -2,7 +2,6 @@ select.sam.transition{
   background-image: none;
   display: inline-block;
   padding: initial;
-  height: initial;
   -webkit-appearance: menulist;
   -moz-appearance: menulist; 
   max-width: fit-content;
diff --git a/src/styles/transition/_title.scss b/src/styles/transition/_title.scss
new file mode 100644
index 000000000..602c9b863
--- /dev/null
+++ b/src/styles/transition/_title.scss
@@ -0,0 +1,3 @@
+sam-title h1.sam.title{
+  line-height: 25.5px;
+}
\ No newline at end of file

From 44b42c4c61f2dd9b6728669c81df9d7e622e29e6 Mon Sep 17 00:00:00 2001
From: Carlos Valle <carlos.m.valle@gmail.com>
Date: Thu, 29 Mar 2018 17:31:51 -0400
Subject: [PATCH 2/2] Deploy

---
 src/styles/sam-design-system/patterns/_home.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/styles/sam-design-system/patterns/_home.scss b/src/styles/sam-design-system/patterns/_home.scss
index 559465bd0..cb1baf687 100644
--- a/src/styles/sam-design-system/patterns/_home.scss
+++ b/src/styles/sam-design-system/patterns/_home.scss
@@ -103,7 +103,6 @@ ol.row{
   }
 }
 
-
 .patterns-menu{
   color: white;
   padding: .5rem;