Merge pull request #45 from zendesk/asilva-fix-cph

Compile CSS and small fixes
zendesk · Jul 30, 2018 · e7be251 · e7be251
2 parents 31bc10e + 421cb56
commit e7be251
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 28 deletions.
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "Copenhagen",
   "author": "Zendesk",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "api_version": 1,
   "default_locale": "en-us",
   "settings": [{

diff --git a/style.css b/style.css
@@ -344,6 +344,12 @@ ul {
   text-decoration: none;
 }
 
+.form-field .hc-multiselect-toggle:focus {
+  outline: none;
+  border: 1px solid $brand_color;
+  text-decoration: none;
+}
+
 .form-field textarea {
   vertical-align: middle;
 }
@@ -480,9 +486,13 @@ ul {
 }
 
 .nav-wrapper .icon-menu {
+  border: 0;
+  color: $link_color;
+  cursor: pointer;
   display: inline-block;
   margin-right: 10px;
-  color: $link_color;
+  padding: 0;
+  width: auto;
 }
 
 @media (min-width: 768px) {
@@ -496,6 +506,11 @@ ul {
   margin-right: 0;
 }
 
+.nav-wrapper .icon-menu:hover, .nav-wrapper .icon-menu:focus, .nav-wrapper .icon-menu:active {
+  background-color: transparent;
+  color: $link_color;
+}
+
 /***** User info in header *****/
 .user-info {
   display: inline-block;
@@ -561,7 +576,6 @@ ul {
 .avatar {
   display: inline-block;
   position: relative;
-  margin-right: 10px;
 }
 
 .avatar img {
@@ -680,7 +694,7 @@ ul {
   top: 50%;
   transform: translateY(-50%);
   background-color: #fff;
-  color: #ddd;
+  color: #777;
   content: "\1F50D";
   font-size: 18px;
   position: absolute;
@@ -1157,11 +1171,10 @@ ul {
 
 @media (min-width: 1024px) {
   .article {
-    flex: 1;
+    flex: 1 0 66%;
     max-width: 66%;
     min-width: 640px;
     padding: 0 30px;
-    margin: 0 auto;
   }
 }
 
@@ -1193,6 +1206,10 @@ ul {
   }
 }
 
+.article-avatar {
+  margin-right: 10px;
+}
+
 .article-author {
   margin-bottom: 10px;
 }
@@ -1204,10 +1221,6 @@ ul {
   }
 }
 
-.article-title.no-author {
-  margin-bottom: 0.067em;
-}
-
 .article-title .icon-lock::before {
   content: "\1F512";
   font-size: 20px;
@@ -2212,7 +2225,7 @@ ul {
 }
 
 .status-label-open {
-  background-color: #e03b30;
+  background-color: #cc3340;
 }
 
 .status-label-closed {
@@ -2341,6 +2354,7 @@ ul {
 .post-meta {
   display: inline-block;
   flex: 1;
+  margin-left: 10px;
   vertical-align: middle;
 }
 
@@ -3453,6 +3467,7 @@ ul {
   color: $brand_text_color;
   line-height: normal;
   padding: 8px 20px;
+  outline-color: $brand_color;
 }
 
 .profile-header .description {

diff --git a/styles/_article.scss b/styles/_article.scss
@@ -38,6 +38,10 @@
     margin-top: 20px;
   }
 
+  &-avatar {
+    margin-right: 10px;
+  }
+
   &-author {
     margin-bottom: 10px;
   }
@@ -68,7 +72,6 @@
 
   &-meta {
     display: inline-block;
-    margin-left: 10px;
     vertical-align: middle;
   }
 

diff --git a/templates/article_page.hbs b/templates/article_page.hbs
@@ -6,27 +6,27 @@
   </nav>
 
   <div class="article-container" id="article-container">
-    {{#if settings.show_articles_in_section}}
-      <section class="article-sidebar">
+    <section class="article-sidebar">
+      {{#if settings.show_articles_in_section}}
         <section class="section-articles collapsible-sidebar">
-          <h3 class="collapsible-sidebar-title sidenav-title">{{t 'articles_in_section'}}</h3>
-          <ul>
-            {{#each section.articles}}
-              <li>
-                <a href="{{url}}" class="sidenav-item {{#is id ../article.id}}current-article{{/is}}">{{title}}</a>
-              </li>
-            {{/each}}
-          </ul>
-          {{#if section.more_articles}}
-            <a href="{{section.url}}" class="article-sidebar-item">{{t 'see_more'}}</a>
-          {{/if}}
+        <h3 class="collapsible-sidebar-title sidenav-title">{{t 'articles_in_section'}}</h3>
+        <ul>
+          {{#each section.articles}}
+            <li>
+              <a href="{{url}}" class="sidenav-item {{#is id ../article.id}}current-article{{/is}}">{{title}}</a>
+            </li>
+          {{/each}}
+        </ul>
+        {{#if section.more_articles}}
+          <a href="{{section.url}}" class="article-sidebar-item">{{t 'see_more'}}</a>
+        {{/if}}
         </section>
-      </section>
-    {{/if}}
+      {{/if}}
+    </section>
 
     <article class="article">
       <header class="article-header">
-        <h1 title="{{article.title}}" class="article-title {{#unless settings.show_article_author}}no-author{{/unless}}">
+        <h1 title="{{article.title}}" class="article-title">
           {{article.title}}
           {{#if article.internal}}
             <span class="icon-lock" title="{{t 'internal'}}"></span>