Merge fix and integrate changes

assets/scss/_portal.scss

@@ -2,26 +2,17 @@
 *
 */
 
-.question {
-  padding: 0.75rem 0;
-}
 .section-nav {
   padding-top: 0 !important;
+  border: 0 !important;
 }
 .sidebar{
   top: 0 !important;
+  border: 0 !important;
 }
 .toc-entry a:hover {
   color: #59316B !important;
 }
-.footer a.nav-link {
-  padding: 0.2rem;
-}
-footer .border{
-  border: 0 !important;
-  border-bottom: 1px solid rgba(255,255,255,0.3) !important;
-}
-
 .sidetopics {
   position: fixed !important;
   margin-top: 400px;
@@ -32,8 +23,35 @@ footer .border{
   min-height: 500px;
   margin-bottom: 200px;
 }
-
+#topics h5{
+  padding-top: 7rem;
+}
+.question {
+  padding: 0.75rem 0;
+}
 .footer {
   position: relative;
   z-index:99999999999;
 }
+.footer a.nav-link {
+  padding: 0.2rem;
+}
+footer .border{
+  border: 0 !important;
+  border-bottom: 1px solid rgba(255,255,255,0.3) !important;
+}
+
+
+
+ @include media-breakpoint-down(sm) {
+   .display-4 {
+     font-size: 2rem;
+   }
+ }
+
+ @include media-breakpoint-up(md) {
+ }
+
+ @include media-breakpoint-up(lg) {
+
+ }

assets/scss/_tor.scss

@@ -2,9 +2,9 @@
  * Base structure
  */
 
-/* Move down content because we have a fixed navbar that is 3.5rem tall */
+/* Move down content because we have a fixed navbar that is 4.5rem tall */
 .page {
-  padding-top: 3.5rem;
+  padding-top: 4.5rem;
 }
 
 /* Reset */
@@ -59,6 +59,31 @@
   url('fonts/TorIcons/tor-icons.svg?#tor-icons') format('svg');
 }
 
+.font-family-serif {
+  font-family: $font-family-serif !important;
+}
+
+.font-weight-light  { font-family: Source Sans Pro Light }
+
+.font-weight-bold   { font-family: Source Sans Pro Bold  }
+
+h6 {
+  text-transform: uppercase;
+  font-weight: bold;
+  color: $purple;
+}
+p {
+  font-size: 1.3rem; // We need at least 18px minuim +_+
+  color: $gray-900;
+  line-height: 2rem;
+}
+mark,.mark {
+  color: $purple;
+}
+
+
+/** Icons **/
+
 .ti:before {
     font-family: Tor Icons !important;
     font-style: normal;
@@ -157,34 +182,6 @@
     content: "\f11e";
 }
 
-.font-family-serif {
-  font-family: $font-family-serif !important;
-}
-
-.font-weight-light  { font-family: Source Sans Pro Light }
-
-.font-weight-bold   { font-family: Source Sans Pro Bold  }
-
-h6 {
-  text-transform: uppercase;
-  font-weight: bold;
-  color: $purple;
-}
-p {
-  font-size: 1.3rem; // We need at least 18px minuim +_+
-  color: $gray-900;
-  line-height: 2rem;
-}
-.display-5 {
-  font-size: 1.5em;
-}
-.display-6 {
-  font-size: 1.3em
-}
-mark,.mark {
-  color: $purple;
-}
-
 .bd-sidebar{
   border: 0 !important;
 }
@@ -213,7 +210,7 @@ mark,.mark {
 }
 
 .navbar-brand {
-  padding-left: 80px;
+  /*padding-left: 80px;*/
   span {
     font-size: 0.6em;
     display: flex;
@@ -471,8 +468,6 @@ a.side-nav.active {
     color: $primary !important;
 }
 
-
-
 .smalltopics {
     display: none;
 }
@@ -482,7 +477,7 @@ a.side-nav.active {
 @include media-breakpoint-down(md) {
     nav.sidetopics {
         display: none !important;
-	visibility: hidden !important;
+	      visibility: hidden !important;
     }
 
     nav.smalltopics {

assets/scss/bootstrap-reboot.css

@@ -0,0 +1,279 @@
+/*!
+ * Bootstrap Reboot v4.0.0-beta.2 (https://getbootstrap.com)
+ * Copyright 2011-2017 The Bootstrap Authors
+ * Copyright 2011-2017 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
+ */
+*,
+*::before,
+*::after {
+  box-sizing: border-box; }
+
+html {
+  font-family: sans-serif;
+  line-height: 1.15;
+  -webkit-text-size-adjust: 100%;
+  -ms-text-size-adjust: 100%;
+  -ms-overflow-style: scrollbar;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0); }
+
+@-ms-viewport {
+  width: device-width; }
+article, aside, dialog, figcaption, figure, footer, header, hgroup, main, nav, section {
+  display: block; }
+
+body {
+  margin: 0;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  font-size: 1rem;
+  font-weight: 400;
+  line-height: 1.5;
+  color: #212529;
+  text-align: left;
+  background-color: #fff; }
+
+[tabindex="-1"]:focus {
+  outline: none !important; }
+
+hr {
+  box-sizing: content-box;
+  height: 0;
+  overflow: visible; }
+
+h1, h2, h3, h4, h5, h6 {
+  margin-top: 0;
+  margin-bottom: 0.5rem; }
+
+p {
+  margin-top: 0;
+  margin-bottom: 1rem; }
+
+abbr[title],
+abbr[data-original-title] {
+  text-decoration: underline;
+  text-decoration: underline dotted;
+  cursor: help;
+  border-bottom: 0; }
+
+address {
+  margin-bottom: 1rem;
+  font-style: normal;
+  line-height: inherit; }
+
+ol,
+ul,
+dl {
+  margin-top: 0;
+  margin-bottom: 1rem; }
+
+ol ol,
+ul ul,
+ol ul,
+ul ol {
+  margin-bottom: 0; }
+
+dt {
+  font-weight: 700; }
+
+dd {
+  margin-bottom: .5rem;
+  margin-left: 0; }
+
+blockquote {
+  margin: 0 0 1rem; }
+
+dfn {
+  font-style: italic; }
+
+b,
+strong {
+  font-weight: bolder; }
+
+small {
+  font-size: 80%; }
+
+sub,
+sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline; }
+
+sub {
+  bottom: -.25em; }
+
+sup {
+  top: -.5em; }
+
+a {
+  color: #007bff;
+  text-decoration: none;
+  background-color: transparent;
+  -webkit-text-decoration-skip: objects; }
+  a:hover {
+    color: #0056b3;
+    text-decoration: underline; }
+
+a:not([href]):not([tabindex]) {
+  color: inherit;
+  text-decoration: none; }
+  a:not([href]):not([tabindex]):focus, a:not([href]):not([tabindex]):hover {
+    color: inherit;
+    text-decoration: none; }
+  a:not([href]):not([tabindex]):focus {
+    outline: 0; }
+
+pre,
+code,
+kbd,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em; }
+
+pre {
+  margin-top: 0;
+  margin-bottom: 1rem;
+  overflow: auto;
+  -ms-overflow-style: scrollbar; }
+
+figure {
+  margin: 0 0 1rem; }
+
+img {
+  vertical-align: middle;
+  border-style: none; }
+
+svg:not(:root) {
+  overflow: hidden; }
+
+a,
+area,
+button,
+[role="button"],
+input:not([type="range"]),
+label,
+select,
+summary,
+textarea {
+  touch-action: manipulation; }
+
+table {
+  border-collapse: collapse; }
+
+caption {
+  padding-top: 0.75rem;
+  padding-bottom: 0.75rem;
+  color: #868e96;
+  text-align: left;
+  caption-side: bottom; }
+
+th {
+  text-align: inherit; }
+
+label {
+  display: inline-block;
+  margin-bottom: .5rem; }
+
+button {
+  border-radius: 0; }
+
+button:focus {
+  outline: 1px dotted;
+  outline: 5px auto -webkit-focus-ring-color; }
+
+input,
+button,
+select,
+optgroup,
+textarea {
+  margin: 0;
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit; }
+
+button,
+input {
+  overflow: visible; }
+
+button,
+select {
+  text-transform: none; }
+
+button,
+html [type="button"],
+[type="reset"],
+[type="submit"] {
+  -webkit-appearance: button; }
+
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+  padding: 0;
+  border-style: none; }
+
+input[type="radio"],
+input[type="checkbox"] {
+  box-sizing: border-box;
+  padding: 0; }
+
+input[type="date"],
+input[type="time"],
+input[type="datetime-local"],
+input[type="month"] {
+  -webkit-appearance: listbox; }
+
+textarea {
+  overflow: auto;
+  resize: vertical; }
+
+fieldset {
+  min-width: 0;
+  padding: 0;
+  margin: 0;
+  border: 0; }
+
+legend {
+  display: block;
+  width: 100%;
+  max-width: 100%;
+  padding: 0;
+  margin-bottom: .5rem;
+  font-size: 1.5rem;
+  line-height: inherit;
+  color: inherit;
+  white-space: normal; }
+
+progress {
+  vertical-align: baseline; }
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+  height: auto; }
+
+[type="search"] {
+  outline-offset: -2px;
+  -webkit-appearance: none; }
+
+[type="search"]::-webkit-search-cancel-button,
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none; }
+
+::-webkit-file-upload-button {
+  font: inherit;
+  -webkit-appearance: button; }
+
+output {
+  display: inline-block; }
+
+summary {
+  display: list-item; }
+
+template {
+  display: none; }
+
+[hidden] {
+  display: none !important; }
+
+/*# sourceMappingURL=bootstrap-reboot.css.map */

assets/scss/bootstrap-reboot.css.map

@@ -0,0 +1,7 @@
+{
+"version": 3,
+"mappings": "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",
+"sources": ["bootstrap-reboot.scss","_reboot.scss","_variables.scss","mixins/_hover.scss"],
+"names": [],
+"file": "bootstrap-reboot.css"
+}

assets/static/bootstrap.css

@@ -6356,9 +6356,9 @@ a.text-dark:focus, a.text-dark:hover {
 /*
  * Base structure
  */
-/* Move down content because we have a fixed navbar that is 3.5rem tall */
+/* Move down content because we have a fixed navbar that is 4.5rem tall */
 .page {
-  padding-top: 3.5rem; }
+  padding-top: 4.5rem; }
 
 /* Reset */
 .no-border {
@@ -6391,6 +6391,29 @@ a.text-dark:focus, a.text-dark:hover {
 @font-face {
   font-family: Tor Icons;
   src: url("fonts/TorIcons/tor-icons.eot?#iefix") format("embedded-opentype"), url("fonts/TorIcons/tor-icons.woff2") format("woff2"), url("fonsts/TorIcons/tor-icons.woff") format("woff"), url("fonts/TorIcons/tor-icons.ttf") format("truetype"), url("fonts/TorIcons/tor-icons.svg?#tor-icons") format("svg"); }
+.font-family-serif {
+  font-family: "Source Serif Pro", -apple-system, "Georgia", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !important; }
+
+.font-weight-light {
+  font-family: Source Sans Pro Light; }
+
+.font-weight-bold {
+  font-family: Source Sans Pro Bold; }
+
+h6 {
+  text-transform: uppercase;
+  font-weight: bold;
+  color: #7D4698; }
+
+p {
+  font-size: 1.3rem;
+  color: #212529;
+  line-height: 2rem; }
+
+mark, .mark {
+  color: #7D4698; }
+
+/** Icons **/
 .ti:before {
   font-family: Tor Icons !important;
   font-style: normal;
@@ -6487,34 +6510,6 @@ a.text-dark:focus, a.text-dark:hover {
 .ti-valid:before {
   content: "\f11e"; }
 
-.font-family-serif {
-  font-family: "Source Serif Pro", -apple-system, "Georgia", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !important; }
-
-.font-weight-light {
-  font-family: Source Sans Pro Light; }
-
-.font-weight-bold {
-  font-family: Source Sans Pro Bold; }
-
-h6 {
-  text-transform: uppercase;
-  font-weight: bold;
-  color: #7D4698; }
-
-p {
-  font-size: 1.3rem;
-  color: #212529;
-  line-height: 2rem; }
-
-.display-5 {
-  font-size: 1.5em; }
-
-.display-6 {
-  font-size: 1.3em; }
-
-mark, .mark {
-  color: #7D4698; }
-
 .bd-sidebar {
   border: 0 !important; }
 
@@ -6541,7 +6536,7 @@ mark, .mark {
   background-position: 10px 12px; }
 
 .navbar-brand {
-  padding-left: 80px; }
+  /*padding-left: 80px;*/ }
   .navbar-brand span {
     font-size: 0.6em;
     display: flex; }
@@ -6888,25 +6883,17 @@ a.side-nav.active {
 /* Support Portal Styles
 *
 */
-.question {
-  padding: 0.75rem 0; }
-
 .section-nav {
-  padding-top: 0 !important; }
+  padding-top: 0 !important;
+  border: 0 !important; }
 
 .sidebar {
-  top: 0 !important; }
+  top: 0 !important;
+  border: 0 !important; }
 
 .toc-entry a:hover {
   color: #59316B !important; }
 
-.footer a.nav-link {
-  padding: 0.2rem; }
-
-footer .border {
-  border: 0 !important;
-  border-bottom: 1px solid rgba(255, 255, 255, 0.3) !important; }
-
 .sidetopics {
   position: fixed !important;
   margin-top: 400px;
@@ -6917,10 +6904,26 @@ footer .border {
   min-height: 500px;
   margin-bottom: 200px; }
 
+#topics h5 {
+  padding-top: 7rem; }
+
+.question {
+  padding: 0.75rem 0; }
+
 .footer {
   position: relative;
   z-index: 99999999999; }
 
+.footer a.nav-link {
+  padding: 0.2rem; }
+
+footer .border {
+  border: 0 !important;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.3) !important; }
+
+@media (max-width: 767px) {
+  .display-4 {
+    font-size: 2rem; } }
 .bd-toc {
   order: 2;
   padding-top: 1.5rem;

templates/contact.html

@@ -8,10 +8,10 @@
 
       <p class="mb-3">Don't see your question answered here? The best way to contact the Tor support team is to reach out to us on ​<mark><a href="https://www.torproject.org/about/contact.html.en#irc">IRC in #tor on OFTC</a></mark>. If you've never been on IRC before, ​<mark><a href="https://wiki.mozilla.org/IRC">here are some instructions to get started</a></mark>. These instructions are for a Mozilla IRC server, so instead of irc.mozilla.org you'll use OFTC. The OFTC server addresses are: irc.oftc.net:6667 (alternative ports: 6668-6670, 7000) or irc.oftc.net:6697 for SSL (alternative port: 9999) (we recommend SSL).</p>
 
-      
+
       <p class="mb-3">Once you get connected and create a nickname, you can join the channel #tor. ​<mark><a href="https://web.archive.org/web/20160911070100/http://www.irchelp.org:80/irchelp/irctutorial.html">More info on getting started on IRC</a></mark>. and here's some info on ​<mark><a href="https://wiki.debian.org/GettingHelpOnIrc">IRC conventions and etiquette</a></mark>. Once you're on the channel, simply ask your question, be patient, and whoever is available will help you.</p>
 
-      
+
       {% set contactbag = 'contact+' + this.alt %}
       {% for id, item in bag(contactbag).items() %}
       <div class="question">
@@ -24,7 +24,7 @@
           {{ item.description|safe }}
         </div>
       </div>
-      
+
       {% endfor %}
     </div>
   </div>

templates/faq.html

@@ -4,7 +4,7 @@
   </h3>
   <div id="faq" role="tabpanel" data-parent="#topics">
     <div id="faqAccordion" data-children=".question">
-      <h5 class="text-muted text-uppercase mb-3">Most Frequently Asked Questions</h5>
+      <h5 class="text-muted text-uppercase mb-3 p-0">Most Frequently Asked Questions</h5>
       {% set faqbag = 'faq+' + this.alt %}
       {% for id, item in bag(faqbag).items() %}
         <div class="question">

templates/jumbotron.html

@@ -6,10 +6,10 @@
           <h1 class="display-4 no-border font-weight-light pt-3 pb-4">How can we help?</h1>
           <div class="row">
             <form class="form-inline form-wide justify-content-md-center" action="https://duckduckgo.com/" method="get">
-              <div class="col-6">
-                <div class="offset-md-1 col-10 input-group input-group-lg">
+              <div class="col-md-6 col-sm-12">
+                <div class="offset-lg-1 offset-md-1 col-10 input-group p-0">
 		              <input name="sites" value="https://www.torproject.org" type="hidden">
-                  <input class="form-control form-wide rounded-left" type="text" name="q" placeholder="Using DuckDuckGo…" aria-label="Search">
+                  <input class="form-control form-wide rounded-left border-0" type="text" name="q" placeholder="Using DuckDuckGo…" aria-label="Search">
                   <span class="input-group-btn">
                     <button class="btn btn-light" type="submit">Search</button>
                   </span>
@@ -22,7 +22,7 @@
       <div class="container-fluid">
         <div class="row flex-xl-nowrap">
           {% include 'sidenav.html' %}
-          <main role="main" class="col-sm-12 ml-sm-auto col-md-12 col-lg-9 mr-5">
+          <main role="main" class="col-sm-12 ml-sm-auto col-md-12 col-lg-9">
 
 	    {% include 'topics.html' %}
 

templates/miscellaneus.html

@@ -4,7 +4,7 @@
   </h3>
   <div id="miscellaneus" role="tabpanel" data-parent="#topics">
     <div id="miscellaneusAccordion" data-children=".question">
-      <h5 class="text-muted text-uppercase">Miscellaneus</h5>
+      <h5 class="text-muted text-uppercase">Miscellaneous</h5>
       {% set miscbag = 'miscellaneus+' + this.alt %}
       {% for id, item in bag(miscbag).items() %}
       <div class="question">
@@ -17,7 +17,7 @@
           {{ item.description|safe }}
         </div>
       </div>
-      
+
       {% endfor %}
     </div>
   </div>

templates/navbar.html

@@ -9,16 +9,16 @@
   <div class="collapse navbar-collapse hamburger-menu" id="navbarSupportedContent">
     <div class="justify-content-md-center mx-auto pt-2">
       <ul class="navbar-nav">
-	{% set menubag = 'menu+' + this.alt %}
-	{% for id, item in bag(menubag).items() %}
-	<li{% if this.is_child_of(item.path) %} class="nav-item active" {% else %} class="nav-item"{% endif %}>
-          <a class="nav-link" href="{{ item.path }}">{{ item.label }}
-            {% if this.is_child_of(item.path) %}
-            <span class="sr-only">(current)</span>
-            {% endif %}
-          </a>
-	</li>
-	{% endfor %}
+      	{% set menubag = 'menu+' + this.alt %}
+      	{% for id, item in bag(menubag).items() %}
+      	<li{% if this.is_child_of(item.path) %} class="nav-item active" {% else %} class="nav-item"{% endif %}>
+                <a class="nav-link" href="{{ item.path }}">{{ item.label }}
+                  {% if this.is_child_of(item.path) %}
+                  <span class="sr-only">(current)</span>
+                  {% endif %}
+                </a>
+      	</li>
+	      {% endfor %}
       </ul>
     </div>
     <div class="mt-2 btn-group dropdown pr-2">

templates/onionservices.html

@@ -17,8 +17,8 @@
           {{ item.description|safe }}
         </div>
       </div>
-      
-      {% endfor %} 
+
+      {% endfor %}
     </div>
   </div>
 </div>

templates/operators.html

@@ -17,7 +17,7 @@
           {{ item.description|safe }}
         </div>
       </div>
-      
+
     {% endfor %}
     </div>
   </div>

templates/sidenav.html

@@ -20,7 +20,7 @@
 
 
 <nav class="col-sm-3 col-md-2 d-none d-sm-block section-nav bg-white sidebar sidetopics" id="sidenav-topics">
-  <h4 class="text-primary offset-md-1">Topics</h4> 
+  <h4 class="text-primary offset-md-1">Topics</h4>
   <ul class="nav nav-pills flex-column">
     {% set topicbag = 'topics+' + this.alt %}
     {% for id, item in bag(topicbag).items() %}