Procházet zdrojové kódy

Brushing up styles and layout

Artur Paikin před 9 roky
rodič
revize
81b62a97bc

+ 0 - 1
website/themes/uppy/layout/partials/header.ejs

@@ -1 +0,0 @@
-

+ 1 - 1
website/themes/uppy/layout/partials/main_menu.ejs

@@ -1,6 +1,6 @@
 <li>
 <li>
   <form id="search-form" class="MainMenu-search">
   <form id="search-form" class="MainMenu-search">
-    <input type="text" id="search-query" class="st-default-search-input">
+    <input type="text" id="search-query" class="MainMenu-searchQuery st-default-search-input">
   </form>
   </form>
 </li>
 </li>
 <li><a href="/guide/" class="nav-link<%- page.path.match(/guide/) ? ' current' : '' %>">Guide</a></li>
 <li><a href="/guide/" class="nav-link<%- page.path.match(/guide/) ? ' current' : '' %>">Guide</a></li>

+ 5 - 2
website/themes/uppy/source/css/_common.scss

@@ -23,6 +23,7 @@ body {
 
 
 .page {
 .page {
   background-color: $color-white;
   background-color: $color-white;
+  min-height: 100vh;
 }
 }
 
 
 a {
 a {
@@ -148,9 +149,11 @@ a.button {
   border-top: 6px solid $color-primary;
   border-top: 6px solid $color-primary;
 }
 }
 
 
-
- .page-inner .MainHeader {
+  .page-inner .MainHeader {
     display: none;
     display: none;
+    @media #{$screen-large} {
+      display: block;
+    }
   }
   }
 
 
 .MainMenu {
 .MainMenu {

+ 6 - 25
website/themes/uppy/source/css/_page.scss

@@ -12,7 +12,7 @@
   height: $size-headerHeight;
   height: $size-headerHeight;
   line-height: $size-headerHeight;
   line-height: $size-headerHeight;
 
 
-  .break { display: none; }
+  // .break { display: none; }
 
 
   li {
   li {
     display: inline-block;
     display: inline-block;
@@ -26,7 +26,7 @@
   &:hover, &.current { border-bottom: 3px solid $color-primary; }
   &:hover, &.current { border-bottom: 3px solid $color-primary; }
 }
 }
 
 
-#search-query {
+.MainMenu-searchQuery {
   height: 30px;
   height: 30px;
   line-height: 30px;
   line-height: 30px;
   padding: 0 15px 0 30px;
   padding: 0 15px 0 30px;
@@ -35,8 +35,8 @@
   border-radius: 15px;
   border-radius: 15px;
   margin-right: 10px;
   margin-right: 10px;
   transition: border-color .2s ease;
   transition: border-color .2s ease;
-  background: svg('search.svg', '[fill]: #{$color-gray}') 8px 5px no-repeat;
-  background-size: 20px;
+  background: svg('search.svg', '[fill]: #{$color-lightgray}') 8px 6px no-repeat;
+  background-size: 18px;
   &:focus { border-color: $color-primary; }
   &:focus { border-color: $color-primary; }
 }
 }
 
 
@@ -70,14 +70,13 @@
   z-index: 9;
   z-index: 9;
   box-shadow: 0 0 4px rgba(0,0,0,.25);
   box-shadow: 0 0 4px rgba(0,0,0,.25);
 
 
-  @media #{$screen-medium} {
+  @media #{$screen-large} {
     display: none;
     display: none;
   }
   }
 
 
   .menu-button {
   .menu-button {
     background: none;
     background: none;
     border: 0;
     border: 0;
-
     position: absolute;
     position: absolute;
     width: 24px;
     width: 24px;
     height: 24px;
     height: 24px;
@@ -91,7 +90,6 @@
     position: absolute;
     position: absolute;
     width: 30px;
     width: 30px;
     height: 30px;
     height: 30px;
-    // background: url(../images/cute-puppy-2.png) center center no-repeat;
     top: 5px;
     top: 5px;
     left: 50%;
     left: 50%;
     margin-left: -15px;
     margin-left: -15px;
@@ -329,24 +327,7 @@
 //   iframe { margin: 0 !important; }
 //   iframe { margin: 0 !important; }
 // }
 // }
 
 
-@media screen and (max-width: 720px) {
-  // body {
-  //   -webkit-text-size-adjust: none;
-  //   font-size: 14px;
-  // }
-
-  // #header {
-  //   display: none;
-  // }
-
-  // #logo {
-  //   display: none;
-  // }
-
-  // #mobile-bar {
-  //   display: block;
-  // }
-
+@media screen and (max-width: 860px) {
   .nav-link {
   .nav-link {
     padding-bottom: 1px;
     padding-bottom: 1px;
     &:hover, &.current {
     &:hover, &.current {

+ 2 - 1
website/themes/uppy/source/css/_settings.scss

@@ -23,6 +23,7 @@ $color-border     : #dddddd;
 $color-codebg     : #f8f8f8;
 $color-codebg     : #f8f8f8;
 $color-red        : #ff6666;
 $color-red        : #ff6666;
 $color-gray       : #7f8c8d;
 $color-gray       : #7f8c8d;
+$color-lightgray  : #adbdbe;
 $color-darkgray   : #34393A;
 $color-darkgray   : #34393A;
 $color-violet     : #492e7c;
 $color-violet     : #492e7c;
 $color-orange     : #e96900;
 $color-orange     : #e96900;
@@ -39,4 +40,4 @@ $size-headerHeight: 40px;
 
 
 // small screen
 // small screen
 $screen-medium: 'only screen and (min-width: 769px)';
 $screen-medium: 'only screen and (min-width: 769px)';
-// $screen-medium: 'only screen and (min-width: 860px)';
+$screen-large: 'only screen and (min-width: 860px)';