Fixes:
- Top bar uses flex until it's wide enough, then grid - Fix button active style when top bar has colour
This commit is contained in:
		
							parent
							
								
									842cf22300
								
							
						
					
					
						commit
						99f3a5dbcc
					
				| 
						 | 
					@ -13,17 +13,17 @@
 | 
				
			||||||
  line-height: 60px
 | 
					  line-height: 60px
 | 
				
			||||||
  background-color: var(--card-bg-color)
 | 
					  background-color: var(--card-bg-color)
 | 
				
			||||||
  -webkit-box-shadow: 0px 2px 1px 0px var(--primary-shadow-color)
 | 
					  -webkit-box-shadow: 0px 2px 1px 0px var(--primary-shadow-color)
 | 
				
			||||||
  display: grid
 | 
					  display: flex
 | 
				
			||||||
  grid-template-columns: 1fr auto 1fr
 | 
					 | 
				
			||||||
  align-items: center
 | 
					  align-items: center
 | 
				
			||||||
 | 
					  align-content: center
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @media only screen and (min-width: 901px)
 | 
				
			||||||
 | 
					    display: grid
 | 
				
			||||||
 | 
					    grid-template-columns: 1fr 440px 1fr
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  @include top-nav-is-colored
 | 
					  @include top-nav-is-colored
 | 
				
			||||||
    background-color: var(--primary-color)
 | 
					    background-color: var(--primary-color)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.menuIcon // the hamburger menu button
 | 
					 | 
				
			||||||
  @include top-nav-is-colored
 | 
					 | 
				
			||||||
    background-color: var(--primary-color-active)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  @media only screen and (max-width: 680px)
 | 
					  @media only screen and (max-width: 680px)
 | 
				
			||||||
    display: none
 | 
					    display: none
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -51,6 +51,9 @@
 | 
				
			||||||
    background-color: var(--tertiary-text-color)
 | 
					    background-color: var(--tertiary-text-color)
 | 
				
			||||||
    transition: background 0.2s ease-in
 | 
					    transition: background 0.2s ease-in
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @include top-nav-is-colored
 | 
				
			||||||
 | 
					      background-color: var(--primary-color-active)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.side // parts of the top nav either side of the search bar
 | 
					.side // parts of the top nav either side of the search bar
 | 
				
			||||||
  display: flex
 | 
					  display: flex
 | 
				
			||||||
  align-items: center
 | 
					  align-items: center
 | 
				
			||||||
| 
						 | 
					@ -93,6 +96,9 @@
 | 
				
			||||||
        background-image: var(--logo-text-bar-color)
 | 
					        background-image: var(--logo-text-bar-color)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.middle // the middle part of the top nav which contains the search bar
 | 
					.middle // the middle part of the top nav which contains the search bar
 | 
				
			||||||
 | 
					  max-width: 440px
 | 
				
			||||||
 | 
					  flex: 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  .searchContainer
 | 
					  .searchContainer
 | 
				
			||||||
    display: flex
 | 
					    display: flex
 | 
				
			||||||
    align-items: center
 | 
					    align-items: center
 | 
				
			||||||
| 
						 | 
					@ -105,9 +111,6 @@
 | 
				
			||||||
      background-color: var(--side-nav-color)
 | 
					      background-color: var(--side-nav-color)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    .searchInput
 | 
					    .searchInput
 | 
				
			||||||
      width: 420px
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      @media only screen and (max-width: 680px)
 | 
					 | 
				
			||||||
      flex: 1
 | 
					      flex: 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  .searchFilters
 | 
					  .searchFilters
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue