Skip to content

Commit

Permalink
Merge branch 'master' into anselmbradford-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
anselmbradford authored Jul 26, 2019
2 parents de18bc6 + b8c1d14 commit 0643ff0
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 14 deletions.
4 changes: 2 additions & 2 deletions cfgov/unprocessed/css/molecules/global-header-cta.less
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
&__horizontal {
border-left: 1px solid @gray-40;
padding-left: unit( @grid_gutter-width / 2 / @base-font-size-px, em );
padding-top: unit( @grid_gutter-width / 3 / @base-font-size-px, em );
padding-bottom: unit( @grid_gutter-width / 3 / @base-font-size-px, em );
padding-top: 13px;
padding-bottom: 11px;
}

&__list a {
Expand Down
13 changes: 6 additions & 7 deletions cfgov/unprocessed/css/molecules/global-search.less
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
border-left: 1px solid transparent;

.respond-to-max( @bp-xs-max, {
font-size: unit( @size-iv / @base-font-size-px, em );
font-size: 18px;
} );

&:focus {
Expand Down Expand Up @@ -180,10 +180,9 @@
// Up to desktops.
.respond-to-max( @bp-sm-max, {
&_trigger{
padding-top: unit( @grid_gutter-width / 2 / @size-iv, em );
padding-bottom: unit( @grid_gutter-width / 2 / @size-iv, em );
height: unit( @mobile_trigger_ht__px / @size-iv, em );
min-width: unit( @mobile_trigger_ht__px / @size-iv, em );
padding-top: 5px;
height: @mobile_trigger_ht__px;
min-width: @mobile_trigger_ht__px;

&[aria-expanded="true"] {
background: @gray-10;
Expand Down Expand Up @@ -250,15 +249,15 @@
display: block;
// Center on the call to action (CTA) divider to right of search.
padding-top: 6px;
padding-bottom: 6px;
padding-bottom: 5px;
// Match CTA offset from divider.
padding-right: @margin_half__em;

overflow: hidden;

&_trigger {
// Match height of input with button.
padding: 7px 0;
padding: 8px 0;

&[aria-expanded="true"] {
.u-invisible();
Expand Down
10 changes: 5 additions & 5 deletions cfgov/unprocessed/css/organisms/mega-menu.less
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,10 @@ body {
.respond-to-max( @bp-sm-max, {
&_trigger {
display: none;
height: unit( @mobile_trigger_ht__px / 18px, em );
min-width: unit( @mobile_trigger_ht__px / 18px, em );
padding-top: unit( @grid_gutter-width / 2 / 18px, em );
padding-bottom: unit( @grid_gutter-width / 2 / 18px, em );
height: @mobile_trigger_ht__px;
min-width: @mobile_trigger_ht__px;
padding-top: 14px;
padding-bottom: 14px;

position: absolute;
top: 0;
Expand All @@ -278,7 +278,7 @@ body {
border: none;
border-right: 1px solid @gray-40;
color: @black;
font-size: unit( 18px / @base-font-size-px, em );
font-size: 18px;

.js & {
display: block;
Expand Down

0 comments on commit 0643ff0

Please sign in to comment.