Skip to content

Commit

Permalink
Merge pull request #152 from GSA-IAE-APPS/site-improvements
Browse files Browse the repository at this point in the history
Logo updated and css clean up
  • Loading branch information
CarlosValle-REISys authored and GitHub Enterprise committed Mar 29, 2018
2 parents c53fbe0 + 44b42c4 commit abc996d
Show file tree
Hide file tree
Showing 14 changed files with 54 additions and 24 deletions.
4 changes: 2 additions & 2 deletions src/app/site-components/header/header.template.html
Original file line number Diff line number Diff line change
@@ -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>

Expand All @@ -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)">
Expand Down
4 changes: 2 additions & 2 deletions src/patterns/pages/page-a/page.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/patterns/pages/page-b/page.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 6 additions & 6 deletions src/prototypes/components/picker/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 1 addition & 3 deletions src/prototypes/components/prototypes-components.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 5 additions & 1 deletion src/styles/docs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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
========================================================================== */
Expand Down Expand Up @@ -45,7 +50,6 @@

@import "sam-design-system/patterns/home";


/**
* Components
*/
Expand Down
3 changes: 1 addition & 2 deletions src/styles/sam-design-system/patterns/_home.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -103,7 +103,6 @@ ol.row{
}
}


.patterns-menu{
color: white;
padding: .5rem;
Expand Down
5 changes: 0 additions & 5 deletions src/styles/sam-design-system/prototypes/_base.scss
Original file line number Diff line number Diff line change
@@ -1,5 +0,0 @@
.prototype-page{
background-color: #f8f8fb;
display: inline-block;
width: 100%;
}
3 changes: 3 additions & 0 deletions src/styles/transition/_button.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
button.sam.transition{
margin: 0;
}
6 changes: 6 additions & 0 deletions src/styles/transition/_input.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
input.sam.transition,
select.sam.transition{
height: initial;
margin: 0;
line-height: 1.15;
}
7 changes: 7 additions & 0 deletions src/styles/transition/_label.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
label.sam.transition{
display: inline;
}

label.sam.transition::before{
content: none;
}
16 changes: 16 additions & 0 deletions src/styles/transition/_radio.scss
Original file line number Diff line number Diff line change
@@ -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;
}
1 change: 0 additions & 1 deletion src/styles/transition/_select.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions src/styles/transition/_title.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
sam-title h1.sam.title{
line-height: 25.5px;
}

0 comments on commit abc996d

Please sign in to comment.