From 3a9776689cad1b7e692e6253009dc5efb8034be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Fri, 5 Oct 2018 12:59:41 +0200
Subject: doc: Update online HTML header URLs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I2109f1a3113a724bfb6bc5a03b4c7b2d67f7e48c
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
---
 doc/global/html-header-online.qdocconf | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'doc/global')

diff --git a/doc/global/html-header-online.qdocconf b/doc/global/html-header-online.qdocconf
index 02b7375d32..ce69b57739 100644
--- a/doc/global/html-header-online.qdocconf
+++ b/doc/global/html-header-online.qdocconf
@@ -27,11 +27,13 @@ qhp.extraFiles += style/online.css \
 
 HTML.headerstyles = \
     "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/online.css\" />\n" \
-    "  <link rel=\"shortcut icon\" href=\"//d3hp9ud7yvwzy0.cloudfront.net/wp-content/themes/oneqt/images/favicon.ico.gzip\" />\n"
+    "  <link rel=\"shortcut icon\" href=\"//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/images/favicon.ico.gzip\" />\n"
 
 HTML.headerscripts = \
     "  <script type=\"text/javascript\"> wpThemeFolder = \'http://qt.io/wp-content/themes/oneqt\'; </script>\n" \
-    "  <script type=\"text/javascript\" src=\"//d3hp9ud7yvwzy0.cloudfront.net/wp-content/themes/oneqt/js/combo.js.gzip\"></script>\n" \
+    "  <script type=\"text/javascript\" src=\"//d33sqmjvzgs8hq.cloudfront.net/wp-includes/js/jquery/jquery.js.gzip\"></script>\n" \
+    "  <script type=\"text/javascript\" src=\"//d33sqmjvzgs8hq.cloudfront.net/wp-includes/js/jquery/jquery-migrate.min.js.gzip\"></script>\n" \
+    "  <script type=\"text/javascript\" src=\"//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/js/combo.js.gzip\"></script>\n" \
     "  <script type=\"text/javascript\" src=\"scripts/main.js\"></script>\n" \
     "  <script type=\"text/javascript\" src=\"scripts/extras.js\"></script>\n" \
     "  <script type=\"text/javascript\">\n" \
@@ -65,7 +67,7 @@ HTML.postheader = \
     "<header id=\"navbar\" class=\"\">\n" \
     "        <div class=\"cookies_yum\">\n" \
     "            <div>\n" \
-    "                <img src=\"//d3hp9ud7yvwzy0.cloudfront.net/wp-content/themes/oneqt/assets/images/cookie_small.png\" align=\"left\">\n" \
+    "                <img src=\"//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/images/cookie_small.png\" align=\"left\">\n" \
     "                <p class=\"close_button\">\n" \
     "                    We bake cookies in your browser for a better experience.  Using this site means that you consent. <a href=\"//qt.io/terms-conditions/\">Read More</a>\n" \
     "                </p>\n" \
-- 
cgit v1.2.3


From 3d8846b4b92b260779e59c038f13be818e6a5b95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Fri, 5 Oct 2018 13:56:45 +0200
Subject: doc: Update online CSS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Copied from the CSS served by http://doc.qt.io/

Change-Id: Id37447e0f6de4a08a2632df862ae36f73d284814
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
---
 doc/global/html-header-online.qdocconf       |    2 +
 doc/global/template/style/cookie-confirm.css |  219 +++++
 doc/global/template/style/online.css         | 1316 +++++++++++---------------
 3 files changed, 775 insertions(+), 762 deletions(-)
 create mode 100644 doc/global/template/style/cookie-confirm.css

(limited to 'doc/global')

diff --git a/doc/global/html-header-online.qdocconf b/doc/global/html-header-online.qdocconf
index ce69b57739..bec432c2e3 100644
--- a/doc/global/html-header-online.qdocconf
+++ b/doc/global/html-header-online.qdocconf
@@ -1,6 +1,7 @@
 # HTML Header with qt.io branding and online links
 
 HTML.stylesheets = template/style/online.css \
+                   template/style/cookie-confirm.css \
                    template/style/gsc.css \
                    template/style/list_arrow.png \
                    template/style/list_expand.png \
@@ -14,6 +15,7 @@ HTML.stylesheets = template/style/online.css \
 
 #for including files into the qch file. Relative to the outputdir of a QDoc build.
 qhp.extraFiles += style/online.css \
+                  style/cookie-confirm.css \
                   style/gsc.css \
                   style/list_arrow.png \
                   style/list_expand.png \
diff --git a/doc/global/template/style/cookie-confirm.css b/doc/global/template/style/cookie-confirm.css
new file mode 100644
index 0000000000..51e0e4a315
--- /dev/null
+++ b/doc/global/template/style/cookie-confirm.css
@@ -0,0 +1,219 @@
+body div#cookie-confirmation,
+body div#cookie-confirmation.can-use-gradients {
+   background:#222840 !important;
+   position:fixed !important;
+   box-shadow:0 0 10px #222840 !important;
+   border-bottom:none;
+   top:auto;
+   bottom:0;
+}
+body div#cookie-confirmation div#cookie-confirmation-inner,
+body div#cookie-confirmation.can-use-gradients div#cookie-confirmation-inner {
+   padding:0 30px !important;
+   overflow:hidden;
+   display:-ms-flexbox;
+   display:flex;
+   -ms-flex-direction:row;
+   flex-direction:row;
+   -ms-flex-align:center;
+   align-items:center;
+   height:60px;
+}
+
+body div#cookie-confirmation div#cookie-confirmation-inner p,
+body div#cookie-confirmation.can-use-gradients div#cookie-confirmation-inner p {
+  text-shadow:none !important;
+  font-family:"Titillium Web" !important;
+  font-size:inherit !important;
+  line-height:inherit !important;
+  float:left;
+  margin:0!important;
+}
+
+body div#cookie-confirmation div#cookie-confirmation-inner p a,
+body div#cookie-confirmation.can-use-gradients div#cookie-confirmation-inner p a {
+  font-family:inherit !important;
+  color:#41cd52 !important;
+  font-size:inherit !important;
+}
+body div#cookie-confirmation div#cookie-confirmation-inner #cookie-confirmation-buttons-area,
+body div#cookie-confirmation.can-use-gradients div#cookie-confirmation-inner #cookie-confirmation-buttons-area {
+  display:-ms-flexbox;
+  display:flex;
+  float:left;
+  margin-left:50px;
+}
+
+body div#cookie-confirmation div#cookie-confirmation-inner #cookie-confirmation-buttons-area a#confirmation-button,
+body div#cookie-confirmation.can-use-gradients div#cookie-confirmation-inner #cookie-confirmation-buttons-area a#confirmation-button {
+  text-shadow:none !important;
+  border-radius:0;
+  border:0 !important;
+  box-shadow:none;
+  line-height:32px !important;
+  height:32px !important;
+  font-size:16px !important;
+  font-weight:400 !important;
+  color:#fff !important;
+  font-family:"Titillium Web" !important;
+  display:inline-block;
+  padding:0 15px !important;
+  position:relative;
+  background:#41cd52 !important;
+  transition:all .2s ease-in-out;
+}
+body div#cookie-confirmation div#cookie-confirmation-inner #cookie-confirmation-buttons-area a#confirmation-button:hover,
+body div#cookie-confirmation.can-use-gradients div#cookie-confirmation-inner #cookie-confirmation-buttons-area a#confirmation-button:hover{
+  background:#17a81a !important;
+}
+
+body div#cookie-confirmation div#cookie-confirmation-inner #cookie-confirmation-buttons-area a#confirmation-button:after,
+body div#cookie-confirmation div#cookie-confirmation-inner #cookie-confirmation-buttons-area a#confirmation-button:before,
+body div#cookie-confirmation.can-use-gradients div#cookie-confirmation-inner #cookie-confirmation-buttons-area a#confirmation-button:after,
+body div#cookie-confirmation.can-use-gradients div#cookie-confirmation-inner #cookie-confirmation-buttons-area a#confirmation-button:before {
+  content:'';
+  width:20px;
+  height:20px;
+  background:#222840;
+  position:absolute;
+}
+
+body div#cookie-confirmation div#cookie-confirmation-inner #cookie-confirmation-buttons-area a#confirmation-button:before,
+body div#cookie-confirmation.can-use-gradients div#cookie-confirmation-inner #cookie-confirmation-buttons-area a#confirmation-button:before {
+  -ms-transform:rotate(45deg);
+  transform:rotate(45deg);
+  top:-12px;
+  left:-13px;
+}
+body div#cookie-confirmation div#cookie-confirmation-inner #cookie-confirmation-buttons-area a#confirmation-button:after,
+body div#cookie-confirmation.can-use-gradients div#cookie-confirmation-inner #cookie-confirmation-buttons-area a#confirmation-button:after {
+  -ms-transform:rotate(-135deg);
+  transform:rotate(-135deg);
+  top:auto;
+  right:-13px;
+  bottom:-12px;
+}
+
+/*! CSS Used from: Embedded */
+ div#cookie-confirmation{
+  position:absolute;
+  left:0;
+  top:0;
+  width:100%;
+  height:auto;
+  background-color:#2d2d2d;
+  border-bottom:1px solid gray;
+  border-bottom:1px solid rgba(0,0,0,0.5);
+  -webkit-box-shadow:0 1px 2px rgba(0,0,0,0.2);
+  -moz-box-shadow:0 1px 2px rgba(0,0,0,0.2);
+  box-shadow:0 1px 2px rgba(0,0,0,0.2);
+  font-size:14px !important;
+  line-height:18px !important;
+  font-family:helvetica neue,helvetica,arial,sans !important;
+  color:#fff !important;
+  text-shadow:0 1px 0 rgba(0,0,0,0.7) !important;
+  text-align:left !important;
+  z-index:100000000 !important;
+}
+div#cookie-confirmation.can-use-gradients{
+  background-color:rgba(0,0,0,0);
+  background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, rgba(0,0,0,0.9)), color-stop(100%, rgba(0,0,0,0.75)));
+  background-image:-webkit-linear-gradient(top, rgba(0,0,0,0.9),rgba(0,0,0,0.75));
+  background-image:-moz-linear-gradient(top, rgba(0,0,0,0.9),rgba(0,0,0,0.75));
+  background-image:-o-linear-gradient(top, rgba(0,0,0,0.9),rgba(0,0,0,0.75));
+  background-image:linear-gradient(top, rgba(0,0,0,0.9),rgba(0,0,0,0.75));
+  background-image:linear-gradient(to bottom, rgba(0,0,0,0.9),rgba(0,0,0,0.75));
+}
+ div#cookie-confirmation div#cookie-confirmation-inner{
+  padding:12px 18px 18px;
+}
+ div#cookie-confirmation div#cookie-confirmation-inner a{
+  font-family:helvetica neue,helvetica,arial,sans !important;
+  color:#add8e6 !important;
+  font-size:14px !important;
+  text-decoration:none !important;
+  background:none !important;
+  border:none !important;
+  font-weight:normal !important;
+}
+ div#cookie-confirmation div#cookie-confirmation-inner a:hover{
+  text-decoration:underline !important;
+  background:none !important;
+  border:none !important;
+}
+ div#cookie-confirmation div#cookie-confirmation-inner div#cookie-confirmation-buttons-area{
+  text-align:center !important;
+}
+ div#cookie-confirmation div#cookie-confirmation-inner a#confirmation-button{
+  font-family:helvetica neue,helvetica,arial,sans!important;
+  font-size:14px !important;
+  font-weight:normal !important;
+  margin-right:16px !important;
+  padding:4px 12px !important;
+  background-color:green !important;
+  border:1px solid gray !important;
+  border:1px solid rgba(0,0,0,0.5) !important;
+  background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, transparent), color-stop(100%, rgba(0,0,0,0.2)));
+  background-image:-webkit-linear-gradient(top, transparent,rgba(0,0,0,0.2));
+  background-image:-moz-linear-gradient(top, transparent,rgba(0,0,0,0.2));
+  background-image:-o-linear-gradient(top, transparent,rgba(0,0,0,0.2));
+  background-image:linear-gradient(top, transparent,rgba(0,0,0,0.2));
+  -webkit-border-radius:4px;
+  -moz-border-radius:4px;
+  -ms-border-radius:4px;
+  -o-border-radius:4px;
+  border-radius:4px;
+  -webkit-box-shadow:0 1px 2px rgba(0,0,0,0.2),inset 0 1px 0 rgba(255,255,255,0.5);
+  -moz-box-shadow:0 1px 2px rgba(0,0,0,0.2),inset 0 1px 0 rgba(255,255,255,0.5);
+  box-shadow:0 1px 2px rgba(0,0,0,0.2),inset 0 1px 0 rgba(255,255,255,0.5);
+  line-height:14px !important;
+  color:#fff !important;
+  text-shadow:0 1px 0 rgba(0,0,0,0.5) !important;
+  text-decoration:none !important;
+}
+ div#cookie-confirmation div#cookie-confirmation-inner a#confirmation-button:hover{
+  background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, transparent), color-stop(100%, rgba(0,0,0,0.3)));
+  background-image:-webkit-linear-gradient(top, transparent,rgba(0,0,0,0.3));
+  background-image:-moz-linear-gradient(top, transparent,rgba(0,0,0,0.3));
+  background-image:-o-linear-gradient(top, transparent,rgba(0,0,0,0.3));
+  background-image:linear-gradient(top, transparent,rgba(0,0,0,0.3));
+}
+ div#cookie-confirmation div#cookie-confirmation-inner a#confirmation-button:active{
+  background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, rgba(0,0,0,0.3)), color-stop(100%, rgba(0,0,0,0.3)));
+  background-image:-webkit-linear-gradient(top, rgba(0,0,0,0.3),rgba(0,0,0,0.3));
+  background-image:-moz-linear-gradient(top, rgba(0,0,0,0.3),rgba(0,0,0,0.3));
+  background-image:-o-linear-gradient(top, rgba(0,0,0,0.3),rgba(0,0,0,0.3));
+  background-image:linear-gradient(top, rgba(0,0,0,0.3),rgba(0,0,0,0.3));
+  -webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.2);
+  -moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.2);
+  box-shadow:inset 0 1px 2px rgba(0,0,0,0.2);
+}
+div#cookie-confirmation div#cookie-confirmation-inner p{
+  line-height:18px !important;
+  font-family:helvetica neue,helvetica,arial,sans !important;
+  font-weight:normal !important;
+  font-size:14px !important;
+  margin:0 0 16px !important;
+  padding:0 !important;
+  color:#fff !important;
+  text-align:left !important;
+}
+@media screen and (max-width: 480px) {
+  div#cookie-confirmation {
+  font-size:12px !important;
+  }
+  div#cookie-confirmation div#cookie-confirmation-inner {
+  padding:8px 14px 14px !important;
+  }
+  div#cookie-confirmation div#cookie-confirmation-inner a {
+  font-size:12px !important;
+  }
+  div#cookie-confirmation div#cookie-confirmation-inner a#confirmation-button {
+  font-size:12px !important;
+  }
+  div#cookie-confirmation div#cookie-confirmation-inner p {
+  font-size:12px !important;
+  margin-bottom:12px !important;
+  line-height:15px !important;
+  }
+}
diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css
index 7d84863b74..4bccee7409 100644
--- a/doc/global/template/style/online.css
+++ b/doc/global/template/style/online.css
@@ -1,3 +1,5 @@
+@import url('cookie-confirm.css') screen;
+
 #navbar {
   position:fixed;
   top:0;
@@ -6,254 +8,172 @@
   background:#fff;
   width:100%
 }
-#navbar .container {
-  overflow:visible
-}
-.fixed .container {
+#navbar .container, .fixed .container {
+  max-width:1280px;
+  margin:0 auto;
+  padding:0 3.9%; /* 0? */
+  position:relative;
   overflow:visible
 }
-.box-shadowed-nav #navbar {
-  border-bottom:1px solid #eee
-}
 #navbar .navbar-header {
   position:relative
 }
-#navbar .navbar-toggle {
-  display:none;
-  float:right;
-  line-height:18px;
-  min-width:95px;
-  position:relative;
-  text-align:center;
-  border-left:1px solid #eee;
-  border-right:1px solid #eee;
-  padding:10px 0 10px 0
+#menuextras li a:hover span {
+  color: #41cd52;
+}
+/* new header */
+#mm-wrap, #mm-wrap #mm-helper,
+#mm-wrap #mm-helper li.mm-item,
+#mm-wrap #mm-helper a.mm-link {
+    -moz-transition: none;
+    -o-transition: none;
+    -webkit-transition: none;
+    transition: none;
+    -webkit-border-radius: 0 0 0 0;
+    -moz-border-radius: 0 0 0 0;
+    -ms-border-radius: 0 0 0 0;
+    -o-border-radius: 0 0 0 0;
+    border-radius: 0 0 0 0;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    -ms-box-shadow: none;
+    -o-box-shadow: none;
+    box-shadow: none;
+    background: none;
+    border: 0;
+    bottom: auto;
+    box-sizing: border-box;
+    clip: auto;
+    color: #090e21;
+    display: block;
+    float: none;
+    font-family: inherit;
+    font-size: 14px;
+    height: auto;
+    left: auto;
+    line-height: 1.7;
+    list-style-type: none;
+    margin: 0;
+    min-height: 0;
+    opacity: 1;
+    outline: none;
+    overflow: visible;
+    padding: 0;
+    position: relative;
+    right: auto;
+    text-align: left;
+    text-decoration: none;
+    text-transform: none;
+    top: auto;
+    vertical-align: baseline;
+    visibility: inherit;
+    width: auto;
+}
+#mm-wrap #mm-helper {
+  visibility:visible;
+  text-align:right;
+  padding:0 0px 0 0px
 }
-#navbar .navbar-toggle:hover figure {
-  background:#5caa15
+#navbar #mm-wrap #mm-helper li.mm-item {
+  border-right:solid #f3f3f4 1px;
+  padding-right:30px;
+  padding-left:30px
 }
-#navbar .navbar-toggle span {
-  color:#bdbebf;
-  font-weight:300
+#navbar #mm-wrap #mm-helper li.mm-item > a:hover {
+  opacity: .5
 }
-#navbar .navbar-toggle figure {
-  background:#7fc241;
-  border-radius:100%;
-  -webkit-border-radius:100%;
-  -moz-border-radius:100%;
-  transition:all 0.2s ease-in-out;
-  -webkit-transition:all 0.2s ease-in-out;
-  -moz-transition:all 0.2s ease-in-out;
-  -ms-transition:all 0.2s ease-in-out;
-  -o-transition:all 0.2s ease-in-out;
-  height:26px;
-  width:34px;
-  padding:8px 0 0 0;
-  margin-top:3px;
-  margin-left:auto;
-  margin-right:auto;
-  text-align:center
-}
-#navbar .navbar-toggle figure span.line {
+#mm-wrap #mm-helper > li.mm-item {
+  margin:0 0 0 0;
   display:inline-block;
-  width:1.125em;
-  height:0.1875em;
-  background:#fff;
-  transition:0.3s;
-  position:relative;
-  vertical-align:middle;
-  margin-top:-3px
-}
-#navbar .navbar-toggle figure span.line:before,#navbar .navbar-toggle figure span.line:after {
-  display:inline-block;
-  width:1.125em;
-  height:0.1875em;
-  background:#fff;
-  position:absolute;
-  left:0;
-  content:'';
-  -webkit-transform-origin:0.28571rem center;
-  transform-origin:0.28571rem center;
-  transition:0.3s;
-  -webkit-transition:0.3s;
-  -moz-transition:0.3s;
-  -ms-transition:0.3s;
-  -o-transition:0.3s
-}
-#navbar .navbar-toggle figure span.line:before {
-  top:6px
-}
-#navbar .navbar-toggle figure span.line:after {
-  top:-6px
-}
-#navbar .navbar-toggle.opened figure {
-  background:#5caa15
+  height:auto;
+  vertical-align:middle
 }
-#navbar .navbar-toggle.opened span {
-  color:#5caa15
+#navbar #mm-wrap #mm-helper li.mm-item:nth-child(3) {
+  border-right:0
 }
-#navbar .navbar-toggle.opened span.line {
-  background:transparent
+#mm-wrap #mm-helper a.mm-link {
+  cursor: pointer
 }
-#navbar .navbar-toggle.opened span.line:before,#navbar .navbar-toggle.opened span.line:after {
-  -webkit-transform-origin:50% 50%;
-  -moz-transform-origin:50% 50%;
-  transform-origin:50% 50%;
-  top:0;
-  width:23px;
-  margin-left:-2px
-}
-#navbar .navbar-toggle.opened span.line:before {
-  transform:rotate3d(0, 0, 1, 45deg);
-  -webkit-transform:rotate3d(0, 0, 1, 45deg);
-  -moz-transform:rotate3d(0, 0, 1, 45deg);
-  -ms-transform:rotate3d(0, 0, 1, 45deg);
-  -o-transform:rotate3d(0, 0, 1, 45deg);
-  left:0
-}
-#navbar .navbar-toggle.opened span.line:after {
-  transform:rotate3d(0, 0, 1, -45deg);
-  -webkit-transform:rotate3d(0, 0, 1, -45deg);
-  -moz-transform:rotate3d(0, 0, 1, -45deg);
-  -ms-transform:rotate3d(0, 0, 1, -45deg);
-  -o-transform:rotate3d(0, 0, 1, -45deg)
+@media (max-width: 1279px) {
+  #navbar {
+    padding:0;
+    position:relative;
+  }
+  #navbar .container {
+    max-width:100%
+  }
+  .container {
+    padding:0 2%
+  }
 }
 #navbar .navbar-oneQt {
   display:inline;
   float:left;
   width:31px;
-  padding:20px 8px;
-  margin:0 15px 0 0
+  color:#41cd52
 }
 #navbar .navbar-oneQt:before {
   content:attr(data-icon);
   position:absolute;
-  top:15px;
+  top:14px;
   left:0;
-  color:#80c342;
+  color:#41cd52;
   font-family:'Qt Icons';
   line-height:1;
-  font-size:3.125em;
-  transition:all 0.2s ease-in-out;
-  -webkit-transition:all 0.2s ease-in-out;
-  -moz-transition:all 0.2s ease-in-out;
-  -ms-transition:all 0.2s ease-in-out;
-  -o-transition:all 0.2s ease-in-out
-}
-.navbar-oneQt {
-  color: #80c342 !important;
-}
-.navbar-oneQt:hover {
-  color: #80c342;
-}
-#navbar .navbar-menu {
+  font-size:40px;
+  transition:all 0.3s ease-in-out;
+}
+#mm-wrap {
+  clear:both;
+  background:rgba(255, 255, 255, 0.1);
+  -webkit-border-radius:0px 0px 0px 0px;
+  -moz-border-radius:0px 0px 0px 0px;
+  -ms-border-radius:0px 0px 0px 0px;
+  -o-border-radius:0px 0px 0px 0px;
+  border-radius:0px 0px 0px 0px
+}
+#mm-wrap #mm-helper li.mm-item:last-child a {
+  background:transparent url("icon_avatar.png") 50% 50% no-repeat !important;
+  background-size:24px !important;
+  width:24px !important;
+  height:24px !important;
+}
+#navbar #mm-wrap #mm-helper li.mm-item > a {
+  opacity:1;
+  -webkit-transition:all 0.3s ease-in-out;
+  -moz-transition:all 0.3s ease-in-out;
+  -ms-transition:all 0.3s ease-in-out;
+  -o-transition:all 0.3s ease-in-out;
+  transition:all 0.3s ease-in-out;
+}
+#mm-wrap #mm-helper > li.mm-item > a.mm-link {
+  border-top:0px solid #fff;
+  border-left:0px solid #fff;
+  border-right:0px solid #fff;
+  border-bottom:0px solid #fff;
+  outline:none;
+  text-decoration:none;
+  padding:0 0 0 0;
+  line-height:70px;
+  font-weight:normal;
+  height:70px;
+  vertical-align:baseline;
+  text-align:left;
   width:auto;
-  float:left
-}
-.lt-ie9 #navbar {
-  border-bottom:1px solid #ddd
-}
-#mainmenu {
-  float:left;
-  list-style:none;
-  margin-left:16px
-}
-#mainmenu li {
-  float:left;
-  margin-left:0;
-  list-style-type:none !important
-}
-#mainmenu li a {
   display:block;
-  padding:29px 0.7em;
-  font-size:1.125em;
-  font-weight:300;
-  line-height:20px;
-  height:80px;
-  color:#26282a;
+  color:#090e21;
+  text-transform:none;
   text-decoration:none;
-  border:0px solid #80c342;
-  -webkit-transition:all 0.2s ease-in-out;
-  box-sizing:border-box;
-  -webkit-box-sizing:border-box;
-  -moz-box-sizing:border-box;
-  *behavior:url(boxsizing.htc)
-}
-#mainmenu li a:hover {
-  color:#5caa15;
-  border-bottom:4px solid #80C342
-}
-#mainmenu li.current-menu-item a {
-  color:#5caa15;
-  border-bottom:4px solid #80C342
-}
-#menuextras, #mainmenu, #menuextraslanguages {
-  margin-bottom:0
- }
-#menuextras {
-  display:inline-block;
-  float:right;
-  list-style-type:none;
-  margin-right:0;
-  margin-left:0;
-  letter-spacing:-0.31em;
-  line-height:0
-}
-#menuextras li {
-  letter-spacing:normal;
-  float:left;
-  display:inline-block
-}
-#menuextras li a {
-  display:inline-block;
-  text-align:center;
-  height:80px;
-  border-left:1px solid #eee;
-  padding-top:14px;
-  box-sizing:border-box;
-  overflow:hidden;
-  min-width:85px;
-  font-weight:100
-}
-#menuextras li:last-child a {
-  border-right:1px solid #eee;
-}
-#menuextras li a:before {
-  display:inline-block;
-  font-family:'Qt Icons';
-  content:attr(data-icon);
-  font-size:2.125em;
-  width:100%;
-  color:#80c342;
-  line-height:1;
-  transition:all 0.2s ease-in-out;
-  -webkit-transition:all 0.2s ease-in-out;
-  -moz-transition:all 0.2s ease-in-out;
-  -ms-transition:all 0.2s ease-in-out;
-  -o-transition:all 0.2s ease-in-out
-}
-#menuextras li a:hover:before {
-  color:#5caa15
-}
-#menuextras .search.open a {
-  color:#006325
-}
-#menuextras .search a {
-  border-right:1px solid #eee
-}
-#menuextras li a span {
-  color:#bdbebf;
-  display:inline-block;
-  overflow:hidden;
-  max-height:30px;
-  transition:max-height 0.2s ease-in-out;
-  -webkit-transition:max-height 0.2s ease-in-out;
-  -moz-transition:max-height 0.2s ease-in-out;
-  -ms-transition:max-height 0.2s ease-in-out;
-  -o-transition:max-height 0.2s ease-in-out;
-  line-height:1.4;
-  font-size:0.875em
-}
+  background:rgba(0, 0, 0, 0);
+  -webkit-border-radius:0px 0px 0px 0px;
+  -moz-border-radius:0px 0px 0px 0px;
+  -ms-border-radius:0px 0px 0px 0px;
+  -o-border-radius:0px 0px 0px 0px;
+  border-radius:0px 0px 0px 0px;
+  font-family:inherit;
+  font-size:14px;
+}
+/* end new header */
 @media (min-width: 1320px) {
   .context .flowListDiv dl.flowList {
     -webkit-column-count:3;
@@ -262,44 +182,20 @@
   }
 }
 @media (min-width: 1120px) {
-  #navbar.fixed,#navbar.shadow_bottom {
-    -moz-box-shadow:0px 0px 8px rgba(0,0,0,0.2);
-    -webkit-box-shadow:0px 0px 8px rgba(0,0,0,0.2);
-    box-shadow:0px 0px 8px rgba(0,0,0,0.2)
-  }
-  #navbar.fixed #menuextras li a,#navbar.shadow_bottom #menuextras li a {
-    padding-top:9px;
-    height:50px
-  }
-  #navbar.fixed #menuextras li a span,#navbar.shadow_bottom #menuextras li a span {
-    max-height:0
-  }
-  #navbar.fixed #menuextras li a:before,#navbar.shadow_bottom #menuextras li a:before {
-    font-size:30px
+  #navbar.fixed {
+    -moz-box-shadow:0px 0px 8px rgba(0,0,0,0.23);
+    -webkit-box-shadow:0px 0px 8px rgba(0,0,0,0.23);
+    box-shadow:0px 0px 8px rgba(0,0,0,0.23)
   }
-  #navbar.fixed #mainmenu li a {
+  #navbar.fixed #mm-wrap #mm-helper > li.mm-item > a.mm-link {
     height:50px;
-    padding:14px 0.7em
-  }
-  #navbar.fixed #mainmenu li a:hover {
-    border-bottom:4px solid #5caa15
-  }
-  #navbar.fixed .navbar-toggle {
-    padding:13px 14px 9px
-  }
-  #navbar.fixed #menuextras li.navbar-search {
-    padding:0px 0
-  }
-  #navbar.fixed #menuextras ul.menuextraslinks,#navbar.fixed #menuextras ul.menuextraslanguages {
-    display:none
+    line-height:50px
   }
   #navbar.fixed .navbar-oneQt:before {
     font-size:35px;
     top:7px
   }
-  #navbar.fixed #mainmenu li.current-menu-item a {
-    border-bottom:4px solid #80C342
-  }
+
   .flowListDiv dl.flowList {
     -webkit-column-count:2;
     -moz-column-count:2;
@@ -311,85 +207,13 @@
     padding:0;
     position:relative
   }
-  #navbar .container {
-    max-width:100%
-  }
-  #navbar .menuextraslanguages {
-    bottom:10px !important;
-    right:0
-  }
-  #navbar .menuextraslanguages li a {
-    color:#7fc241 !important
-  }
-  #navbar .menuextraslanguages li.active a,#navbar .menuextraslanguages li a:hover {
-    border-color:#7fc241 !important
+  #navbar .navbar-oneQt:before {
+    left:10px
   }
   #navbar .container {
+    max-width:100%;
     padding:0
   }
-  #navbar .navbar-toggle {
-    display:block
-  }
-  #navbar .navbar-oneQt,#navbar.fixed .navbar-oneQt,#navbar .navbar-oneQt:hover {
-    margin-left:0;
-    height:26px;
-    width:22px;
-    padding:7px 20px 7px 15px
-  }
-  #navbar .navbar-oneQt:before {
-    left:20px
-  }
-  #navbar .navbar-menu {
-    max-height:0;
-    overflow:hidden;
-    width:100%;
-    border-top:1px solid #eee;
-    -webkit-transition:all 600ms ease-in-out;
-    -moz-transition:all 600ms ease-in-out;
-    -o-transition:all 600ms ease-in-out;
-    transition:all 600ms ease-in-out;
-    position:relative
-  }
-  #mainmenu {
-    float:none;
-    width:100%;
-    padding:0;
-    margin:0
-  }
-  #mainmenu li {
-    float:none;
-    list-style:none
-  }
-  #mainmenu li:nth-child(odd) {
-    background:rgba(0,0,0,0)
-  }
-  #mainmenu li a,#navbar.fixed #mainmenu li a {
-    padding:10px;
-    border-left:3px solid #fff;
-    height:auto;
-    width:100%
-  }
-  #mainmenu li.current-menu-item a,#navbar.fixed #mainmenu li.current-menu-item a {
-    border-bottom:none;
-    border-left:3px solid #5caa15;
-    padding:10px
-  }
-  #mainmenu li a:hover {
-    border-bottom:0;
-    padding:10px;
-    border-left:3px solid #5caa15
-  }
-  #navbar.fixed {
-    -moz-box-shadow:0px 0px 0px rgba(0,0,0,0);
-    -webkit-box-shadow:0px 0px 0px rgba(0,0,0,0);
-    box-shadow:0px 0px 0px rgba(0,0,0,0)
-  }
-  .lt-ie9 #navbar.fixed {
-    border-bottom:none
-  }
-  #menuextras li.navbar-search {
-    padding:5px 0
-  }
   #footerbar .container {
     padding:0
   }
@@ -406,11 +230,11 @@
   #footerbar .footer-main .theqtcompany {
     clear:both;
     float:left;
-    margin:30px 0 28px 3%
+    margin:30px 0 8px 3%
   }
   #footerbar .footer-main .footer-social {
     float:left;
-    padding:30px 0px 0px 3%
+    padding:50px 0px 0px 3%
   }
   #footerbar #menu-footer-submenu {
     clear:both;
@@ -422,121 +246,6 @@
     margin-left: 0
   }
 }
-.in-page-nav {
-  width:100%;
-  background:#eeeeee
-}
-.in-page-nav ul {
-  margin:0 auto;
-  letter-spacing:-0.31em;
-  max-width:1180px;
-  text-align:center
-}
-.in-page-nav ul li {
-  display:inline-block;
-  letter-spacing:normal
-}
-.in-page-nav ul li a {
-  color:#26282a;
-  padding:25px 10px;
-  display:inline-block
-}
-body.qt-account #navbar .navbar-oneQt {
-  width:auto;
-  height:auto
-}
-body.qt-account #navbar .navbar-oneQt:before {
-  left:0;
-  position:relative;
-  display:inline-block;
-  vertical-align:middle;
-  top:0;
-  margin-right:20px
-}
-body.qt-account #navbar .navbar-oneQt h2 {
-  margin:0;
-  color:#000;
-  display:inline-block;
-  vertical-align:middle
-}
-.landing header[role="banner"] {
-  background:#26282a
-}
-.landing header[role="banner"] figure {
-  max-width:1180px;
-  margin:auto;
-  position:relative
-}
-.landing header[role="banner"] figure img {
-  max-width:100%
-}
-.landing header[role="banner"] figcaption {
-  color:#fff;
-  position:absolute;
-  left:0px;
-  width:100%;
-  text-align:center
-}
-.landing header[role="banner"] figcaption.top {
-  top:0
-}
-.landing header[role="banner"] figcaption.bottom {
-  bottom:0
-}
-.landing header[role="banner"] figcaption h1 {
-  margin:50px auto 0 auto;
-  max-width:70%;
-  font-weight:600
-}
-.landing header[role="banner"] figcaption h3 {
-  margin-bottom:40px
-}
-.cookies_yum {
-  background-color:#d6d6d6;
-  display:none;
-  line-height:1.625em;
-  width:100%
-}
-.cookies_yum img {
-  width:25px;
-  top:6px;
-  display:inline-block;
-  position:absolute;
-  left:6px
-}
-.cookies_yum div {
-  margin:0 auto;
-  max-width:1280px;
-  min-height:30px;
-  padding:6px 0px 6px 0px;
-  position:relative
-}
-.cookies_yum p {
-  color:#585a5c;
-  margin:0px;
-  font-size:0.79em;
-  display:inline-block;
-  line-height:1.2;
-  padding:0 30px 0 50px
-}
-.cookies_yum p a {
-  white-space:nowrap
-}
-.cookies_yum a:hover {
-  color:white
-}
-.cookies_yum .close {
-  width:15px;
-  height:15px;
-  background-image:url("cookiebar-x.png");
-  background-size:15px 30px;
-  background-position:top left;
-  cursor:pointer;
-  top:13px;
-  right:13px;
-  position:absolute;
-  transition:none;
-}
 #sidebar-toggle,#toc-toggle {
   width:24px;
   height:14px;
@@ -552,199 +261,10 @@ body.qt-account #navbar .navbar-oneQt h2 {
 #sidebar-content > h2 {
   display:none
 }
-.cookies_yum .close:hover {
-  background-position:bottom left
-}
-#bottom_header {
-  display:block;
-  position:absolute;
-  width:100%;
-  z-index:50;
-  padding-top:15px
-}
-#bottom_header .container {
-  overflow:visible
-}
-#bottom_header .left {
-  font-weight:bolder
-}
-#bottom_header a {
-  color:white;
-  transition-duration:0.3s
-}
-#bottom_header .left a:hover {
-  padding-left:10px
-}
-.fixed .menuextraslanguages {
-  opacity:0;
-  visibility:hidden
-}
-@media (max-width: 1120px) {
-  .fixed .menuextraslanguages {
-    opacity:1 !important;
-    visibility:visible !important
-  }
-}
-#navbar .menuextraslanguages {
-  position:absolute;
-  right:0;
-  bottom:-35px;
-  transition:all 0.2s ease-in-out;
-  -webkit-transition:all 0.2s ease-in-out;
-  -moz-transition:all 0.2s ease-in-out;
-  -ms-transition:all 0.2s ease-in-out;
-  -o-transition:all 0.2s ease-in-out
-}
-#navbar .menuextraslanguages li {
-  display:inline;
-  list-style:none;
-  margin-left:3px;
-  padding:0px 4px;
-  font-size:0.6875em
-}
-#navbar .menuextraslanguages li.dark a {
-  color:#868482
-}
-#navbar .menuextraslanguages li.dark a:hover {
-  border:2px solid #868482
-}
-#navbar .menuextraslanguages li.active.dark a {
-  border-color:#868482;
-  color:#868482
-}
-#navbar .menuextraslanguages a {
-  color:#fff;
-  padding:2px 4px;
-  border:2px solid transparent
-}
-#navbar .menuextraslanguages a:hover,#navbar .menuextraslanguages li.active a {
-  border:2px solid #fff;
-  color:#fff
-}
-#bottom_header .dark,#bottom_header .dark.active {
-  color:#868482;
-  transition-duration:0.3s;
-  border-color:#868482 !important
-}
-#navbar .big_bar {
-  width:100%;
-  height:100px;
-  background-color:#80C342;
-  display:none;
-  position:relative
-}
-#navbar .big_bar.search {
-  height:auto;
-  overflow:hidden;
-  display:none
-}
-#navbar .big_bar ::-webkit-input-placeholder {
-  color:#fff
-}
-#navbar .big_bar :-moz-input-placeholder {
-  color:#fff
-}
-#navbar .big_bar ::-moz-input-placeholder {
-  color:#fff
-}
-#navbar .big_bar :-ms-input-placeholder {
-  color:#fff
-}
-#navbar .big_bar:hover>div .big_bar_button.account {
-  background-position:right bottom
-}
-#navbar .big_bar.account h1 {
-  padding-top:20px
-}
-#navbar .big_bar.account h1,#navbar .big_bar.account h1 a {
-  color:#FFF;
-  margin-bottom:5px
-}
-#navbar .big_bar.account h1 a:hover {
-  color:#328930
-}
-#navbar .big_bar_button:hover {
-  background-position:left bottom;
-  cursor:pointer
-}
-#navbar .big_bar_button.account {
-  background-position:right top
-}
-#navbar .big_bar input.big_bar_search {
-  background:none repeat scroll 0 0 transparent;
-  border:medium none;
-  color:#fff;
-  display:block;
-  float:left;
-  font-size:4em;
-  outline:0 none;
-  width:70%;
-  line-height:1.3;
-  height:auto;
-  margin:10px 5%;
-  padding:0;
-  box-sizing:border-box;
-  -webkit-box-sizing:border-box;
-  -moz-box-sizing:border-box;
-  *behavior:url(boxsizing.htc)
-}
-#navbar .big_bar_button {
-  background-color:transparent;
-  border:none;
-  width:18%;
-  transition-duration:0.3s;
-  display:block;
-  float:left;
-  position:relative;
-  font-family:'QT Icons';
-  font-size:3.5em;
-  color:#fff;
-  margin:15px 2% 0 0 !important;
-  text-align:right;
-  padding-right:2px !important;
-  transition:all 0.2s ease-in-out;
-  -webkit-transition:all 0.2s ease-in-out;
-  -moz-transition:all 0.2s ease-in-out;
-  -ms-transition:all 0.2s ease-in-out;
-  -o-transition:all 0.2s ease-in-out
-}
-#navbar .big_bar_button:focus,#navbar .big_bar_button:hover {
-  outline:0;
-  color:#ebebeb
-}
-.hero_slide>div {
-  width:80%;
-  margin:0 auto
-}
-.hero_slide>div:first-child>div {
-  width:80%;
-  margin:0 auto
-}
-.hero_slide .content {
-  margin-top:70px
-}
-.hero_bar {
-  padding-top:50px;
-  padding-bottom:18px
-}
-.hero_bar p {
-  font-size:0.875em;
-  text-align:center
-}
-.hero_bar .arrow {
-  bottom:65px;
-  display:block;
-  margin:0 auto;
-  position:relative;
-  right:260px;
-  width:230px
-}
-.hero_bar .comment {
-  margin:0
-}
 #footerbar {
-  background:#26282a;
-  color:#fff
+  background:#222840;
+  color:#fff;
+  font-size: 0.9em;
 }
 #footerbar.fixed {
   bottom:0;
@@ -761,10 +281,11 @@ body.qt-account #navbar .navbar-oneQt h2 {
 }
 #footerbar .footer-main .footer-nav li a {
   display:block;
-  padding:31px 10px 15px 0;
+  padding:30px 0 10px 0;
   line-height:20px;
   height:20px;
-  color:#d6d6d6
+  color:#fff;
+  font-weight: 600;
 }
 #footerbar .footer-main .footer-nav li a:hover,#footerbar .footer-main .footer-nav li.current-menu-item a {
   color:#eee
@@ -774,7 +295,8 @@ body.qt-account #navbar .navbar-oneQt h2 {
   margin-bottom:0
 }
 #footerbar .footer-main .footer-nav .sub-menu li {
-  float:none
+  float:none;
+  width: 100%;
 }
 #footerbar .footer-main .footer-nav .sub-menu ul {
   padding:1px 1em;
@@ -785,11 +307,11 @@ body.qt-account #navbar .navbar-oneQt h2 {
   margin-bottom:0
 }
 #footerbar .footer-main .footer-nav .sub-menu li a {
-  padding:1px 0;
-  font-size:0.786em;
-  line-height:8px;
+  padding:2px 0;
+  font-size:1em;
   float:none;
-  color:#d6d6d6
+  color:#cecfd5;
+  font-weight: 400;
 }
 #footerbar .footer-main .footer-nav .sub-menu li a:hover,#footerbar .footer-main .footer-nav .sub-menu li.current-menu-item a {
   color:#eee
@@ -806,7 +328,6 @@ body.qt-account #navbar .navbar-oneQt h2 {
 #footerbar .footer-social {
   display:inline;
   float:right;
-  padding-top:31px;
   width:164px
 }
 #footerbar .footer-main .footer-social>div {
@@ -847,34 +368,33 @@ body.qt-account #navbar .navbar-oneQt h2 {
   margin-bottom:0
 }
 @font-face {
-  font-family:'Open Sans';
-  font-style:normal;
-  font-weight:300;
-  src:local("Open Sans Light"),local("OpenSans-Light"),url(//fonts.gstatic.com/s/opensans/v10/DXI1ORHCpsQm3Vp6mXoaTYnF5uFdDttMLvmWuJdhhgs.ttf) format("truetype")
-}
+  font-family: 'Titillium Web';
+  font-style: normal;
+  font-weight: 400;
+  src: url("//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/fonts/titillium-web-v4-latin_latin-ext-regular.eot");
+  /* IE9 Compat Modes */
+  src: local("Titillium Web"), local("TitilliumWeb-Regular"), url("//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/fonts/titillium-web-v4-latin_latin-ext-regular.eot?#iefix") format("embedded-opentype"), url("//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/fonts/titillium-web-v4-latin_latin-ext-regular.woff2") format("woff2"), url("//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/fonts/titillium-web-v4-latin_latin-ext-regular.woff") format("woff"), url("//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/fonts/titillium-web-v4-latin_latin-ext-regular.ttf") format("truetype"), url("//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/fonts/titillium-web-v4-latin_latin-ext-regular.svg#TitilliumWeb") format("svg");
+  /* Legacy iOS */
+}
+/* titillium-web-italic - latin_latin-ext */
 @font-face {
-  font-family:'Open Sans';
-  font-style:normal;
-  font-weight:400;
-  src:local("Open Sans"),local("OpenSans"),url(//fonts.gstatic.com/s/opensans/v10/cJZKeOuBrn4kERxqtaUH3aCWcynf_cDxXwCLxiixG1c.ttf) format("truetype")
-}
-@font-face {
-  font-family:'Open Sans';
-  font-style:normal;
-  font-weight:600;
-  src:local("Open Sans Semibold"),local("OpenSans-Semibold"),url(//fonts.gstatic.com/s/opensans/v10/MTP_ySUJH_bn48VBG8sNSonF5uFdDttMLvmWuJdhhgs.ttf) format("truetype")
-}
-@font-face {
-  font-family:'Open Sans';
-  font-style:normal;
-  font-weight:700;
-  src:local("Open Sans Bold"),local("OpenSans-Bold"),url(//fonts.gstatic.com/s/opensans/v10/k3k702ZOKiLJc3WVjuplzInF5uFdDttMLvmWuJdhhgs.ttf) format("truetype")
-}
+  font-family: 'Titillium Web';
+  font-style: italic;
+  font-weight: 400;
+  src: url("//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/fonts/titillium-web-v4-latin_latin-ext-italic.eot");
+  /* IE9 Compat Modes */
+  src: local("Titillium WebItalic"), local("TitilliumWeb-Italic"), url("//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/fonts/titillium-web-v4-latin_latin-ext-italic.eot?#iefix") format("embedded-opentype"), url("//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/fonts/titillium-web-v4-latin_latin-ext-italic.woff2") format("woff2"), url("//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/fonts/titillium-web-v4-latin_latin-ext-italic.woff") format("woff"), url("//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/fonts/titillium-web-v4-latin_latin-ext-italic.ttf") format("truetype"), url("//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/fonts/titillium-web-v4-latin_latin-ext-italic.svg#TitilliumWeb") format("svg");
+  /* Legacy iOS */
+}
+/* titillium-web-600 - latin_latin-ext */
 @font-face {
-  font-family:'Open Sans';
-  font-style:normal;
-  font-weight:800;
-  src:local("Open Sans Extrabold"),local("OpenSans-Extrabold"),url(//fonts.gstatic.com/s/opensans/v10/EInbV5DfGHOiMmvb1Xr-honF5uFdDttMLvmWuJdhhgs.ttf) format("truetype")
+  font-family: 'Titillium Web';
+  font-style: normal;
+  font-weight: 600;
+  src: url("//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/fonts/titillium-web-v4-latin_latin-ext-600.eot");
+  /* IE9 Compat Modes */
+  src: local("Titillium WebSemiBold"), local("TitilliumWeb-SemiBold"), url("//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/fonts/titillium-web-v4-latin_latin-ext-600.eot?#iefix") format("embedded-opentype"), url("//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/fonts/titillium-web-v4-latin_latin-ext-600.woff2") format("woff2"), url("//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/fonts/titillium-web-v4-latin_latin-ext-600.woff") format("woff"), url("//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/fonts/titillium-web-v4-latin_latin-ext-600.ttf") format("truetype"), url("//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/fonts/titillium-web-v4-latin_latin-ext-600.svg#TitilliumWeb") format("svg");
+  /* Legacy iOS */
 }
 @font-face {
   font-family:'Droid Sans Mono';
@@ -889,6 +409,14 @@ body.qt-account #navbar .navbar-oneQt h2 {
   font-weight:normal;
   font-style:normal
 }
+@font-face {
+  font-family:'social-icons';
+  src:url("../style/social-icons.eot?54625607");
+  src:url("../style/social-icons.eot?54625607#iefix") format("embedded-opentype"),
+      url("../style/social-icons.woff?54625607") format("woff");
+  font-weight:normal;
+  font-style:normal
+}
 .clearfix:before,.clearfix:after {
   content:" ";
   display:table
@@ -911,20 +439,15 @@ html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abb
 html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,caption,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video {
   vertical-align:baseline
 }
-body {
-  font-family:“Open Sans”, Arial, Helvetica, sans-serif;
-  line-height:1.5;
-  font-weight:400
-}
 h1,h2,h3,h4,h5,h6 {
   font-weight:300
 }
 .context h2,.context h3,.context h4,.context h5,.context h6 {
-  margin:1.5em 0 1em
+  margin:1.5em 0 0.75em
 }
 .context h1 {
-  margin-bottom:1em;
-  font-size:3.125em
+  margin-bottom:0.75em;
+  font-size:2.25em;
 }
 .context h3.fn,.context h3.flags {
   color:#26282a;
@@ -982,13 +505,24 @@ h1,h2,h3,h4,h5,h6 {
   padding:3px 5px 3px 10px;
   text-align:right
 }
+.centerAlign.functionIndex {
+  text-align:center;
+  font-size:150%;
+  margin-bottom: 1em
+}
 article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section {
   display:block
 }
 body {
   line-height:1;
-  font-family:"Open Sans", Arial, Helvetica, sans-serif;
-  transition-duration:1s
+  font-family:'Titillium Web', Arial, Helvetica, sans-serif;
+  font-weight:400;
+  transition-duration:1s;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  font-size: 16px;
+  background-color:#f3f3f4;
+  color:#404244;
 }
 ol,ul {
   list-style:none
@@ -997,25 +531,29 @@ ol,ul {
   margin-top:0.75em;
   margin-left:20px
 }
-
-.context ol > li {
-  margin-left: 20px
-}
-
 .mainContent ol>li {
-  list-style-type: decimal;
+  list-style-type:decimal;
+  margin-left:15px
 }
-
 .mainContent ol.a >li {
-  list-style-type: lower-alpha;
+  list-style-type:lower-alpha;
 }
-
 .mainContent ol.A >li {
-  list-style-type: upper-alpha;
+  list-style-type:upper-alpha;
+}
+.mainContent ol.i >li {
+  list-style-type:lower-roman;
+}
+.mainContent ol.I >li {
+  list-style-type:upper-roman;
+}
+.context li p {
+  margin-top:1em
 }
-
 blockquote,q {
-  quotes:none
+  quotes:none;
+  border-left:10px solid #ddd;
+  padding-left:10px
 }
 blockquote:before,blockquote:after,q:before,q:after {
   content:'';
@@ -1025,24 +563,33 @@ blockquote:before,blockquote:after,q:before,q:after {
 table {
   border-collapse:collapse;
   border-spacing:0;
-  margin-bottom:25px;
+  margin-bottom:5px;
   width:100%
 }
 a {
-  color:#5caa15;
+  color:#17a81a;
   text-decoration:none;
   transition-duration:0.3s
 }
 a:hover {
-  color:#46a2da
+  color:#17a81a
 }
-.main,.navbar-header,#footerbar>div {
+.main,#footerbar>div {
   max-width:1280px;
   width:95%;
   margin:0 auto
 }
 .main {
-  margin-top:100px
+  margin-top:80px
+}
+@media (max-width: 1120px) {
+  .main,.navbar-header,#footerbar>div {
+    width: 100%;
+    margin: 0;
+  }
+  .main .main-rounded {
+    padding: 0 15px;
+  }
 }
 .main_index {
   background-color:#fff
@@ -1063,14 +610,14 @@ a:hover {
   width:80%;
   display:inline-block;
   background-color:#fff;
-  padding:35px;
+  padding: 25px 35px 20px 30px;
   -webkit-box-sizing:border-box;
   -moz-box-sizing:border-box;
   -ms-box-sizing:border-box;
   box-sizing:border-box
 }
 .col-1 h2 {
-  font-size:2.1875em;
+  font-size:1.8em;
   font-weight:300;
   line-height:1.1;
   margin-bottom:0.83em;
@@ -1096,18 +643,31 @@ div.multi-column div {
 }
 .sidebar {
   display:block;
-  float:right;
+  position:relative;
+  position:sticky;
+  float:left;
   -webkit-box-sizing:border-box;
   -moz-box-sizing:border-box;
   -ms-box-sizing:border-box;
   box-sizing:border-box;
   width:20%;
-  padding-left:30px
+  padding-right:20px
+}
+.sidebar li {
+  text-overflow:ellipsis;
+  overflow:hidden
 }
 .toc,.sectionlist {
-  padding:35px;
+  padding:25px;
   background-color:#fff;
-  margin-bottom:2em
+  margin-bottom:1.25em
+}
+.sidebar .sectionlist p {
+  margin-bottom:0
+}
+.sectionlist.promo {
+  padding:0;
+  background-color:#f3f3f4
 }
 .sidebar-content:empty {
   display:none;
@@ -1115,13 +675,13 @@ div.multi-column div {
 }
 .col-2 h2,.toc h3,.sidebar-content h2,.sidebar-content h3,.sectionlist h2 {
   font-weight:400;
-  margin-bottom:2em
+  margin-bottom:1em
 }
 .toc h3 a {
   color:#404244
 }
 .title {
-  font-size:3em;
+  font-size:2.25em;
   font-weight:300;
   letter-spacing:-1px;
   line-height:1.15em;
@@ -1129,12 +689,12 @@ div.multi-column div {
   word-wrap:break-word
 }
 .navigationbar,col-1 h2 {
-  font-size:0.75em
+  font-size:0.85em
 }
 .navigationbar h1 {
-  font-size:3.125em;
-  margin-bottom:1em;
-  margin-top:1em
+  font-size:2.5em;
+  margin-bottom:0.85em;
+  margin-top:0.85em
 }
 .navigationbar li {
   display:inline-block;
@@ -1143,11 +703,7 @@ div.multi-column div {
   padding-right:10px;
   color:#585a5c
 }
-.navigationbar li a {
-  color:#58585c
-}
-body {
-  background-color:#eee;
+.navigationbar ul:last-of-type li a {
   color:#404244
 }
 .sectionlist li {
@@ -1161,20 +717,18 @@ dd {
   margin-bottom:1.56em
 }
 .mainContent li {
-  margin-top:0.8em;
+  margin-top:0.5em;
   line-height:1.25em
 }
 .mainContent li.level2 {
   margin-left:10px;
   margin-top:0.4em;
   font-size:0.9375em;
-  line-height:1.15em;
 }
 .mainContent p {
-  line-height:1.56em;
+  line-height:1.25em;
   margin-bottom:1.5em;
-  color:#404244;
-  max-width:85%
+  color:#404244
 }
 .mainContent b {
   font-weight:600
@@ -1189,7 +743,8 @@ dd {
   margin-top:25px;
   max-width:100%
 }
-.naviNextPrevious.headerNavi {
+.naviNextPrevious.headerNavi,
+p.naviNextPrevious + p {
   display:none
 }
 .nextPage {
@@ -1201,6 +756,9 @@ dd {
 .nextPage:after {
   content:" >"
 }
+.navigationbar li a {
+  color:#404244
+}
 .navigationbar li:after {
   color:#404244;
   content:"›";
@@ -1211,9 +769,6 @@ dd {
   right:-2px;
   top:-4px
 }
-.navigationbar ul:last li a {
-  color:#80c342
-}
 .sub-navigation {
   margin-top:10px
 }
@@ -1221,7 +776,8 @@ dd {
   content:none
 }
 .navigationbar {
-  margin-bottom:10px
+  margin-bottom:10px;
+  line-height:1em
 }
 #buildversion {
   font-style:italic;
@@ -1229,13 +785,17 @@ dd {
   float:right
 }
 .copy-notice {
-  width:65%;
+  width:75%;
   font-size:0.75em;
-  margin-top:50px;
-  margin-bottom:25px;
+  margin:20px 35px 0 10px;
   line-height:1.75em;
+  float:right;
   color:#585a5c
 }
+.copy-notice.index {
+  margin-top:10px;
+  float:none
+}
 li a.active {
   color:#585a5c
 }
@@ -1266,36 +826,51 @@ li a.active {
   list-style-image:url("list_arrow.png");
   margin-left:15px;
   color:#404244;
-  line-height:1.16em
+  margin-top:0.65em;
+  line-height:1em
+}
+.mainContent table p {
+  margin:0px;
+  padding:0px
 }
 .mainContent table p {
   margin:0px;
   padding:0px;
-  max-width:initial;
-  min-height:2em
+  min-height:1.25em
 }
-.mainContent table p.centerAlign {
-  text-align:center
+.mainContent .qmldoc {
+  margin-top:0.75em
 }
 .context h2 {
-  font-size:2.1875em
+  margin-top: 1.5em;
+  font-size:1.75em
 }
 .context h3 {
-  font-size:1.75em
+  font-size:1.35em
 }
 .context h4 {
-  font-size:1.375em
+  font-size:1.15em
 }
 .context p img {
   margin-top:0.75em;
   max-width:100%
 }
+.context .table table img {
+  max-width:initial
+}
 .context .border img {
-   box-shadow:3px 3px 8px 3px rgba(200,200,200,0.5)
- }
+  box-shadow:3px 3px 8px 3px rgba(200,200,200,0.5)
+}
 .context .border .player {
-   box-shadow:3px 3px 8px 3px rgba(200,200,200,0.5)
- }
+  box-shadow:3px 3px 8px 3px rgba(200,200,200,0.5)
+}
+.context p.figCaption {
+  transform:translateY(-30px);
+  color:#606366;
+  font-size:95%;
+  margin-left:3px;
+  font-style:italic
+}
 .context table {
   vertical-align:initial
 }
@@ -1313,6 +888,10 @@ table td,table th {
   padding:5px 20px;
   line-height:1.3
 }
+.context .fixed table td {
+  min-width:50%;
+  width:50%
+}
 table.alignedsummary,table.propsummary {
   width:initial
 }
@@ -1320,7 +899,7 @@ table.valuelist td.tblval {
   font-size:0.75em
 }
 div.main_index .row {
-  border-bottom:1px solid #eee
+  border-bottom:10px solid #f3f3f4
 }
 div.main_index .row {
   position:relative
@@ -1329,7 +908,7 @@ div.main_index .row>div {
   display:inline-block;
   width:50%;
   vertical-align:top;
-  padding:50px;
+  padding:2em 3em;
   -webkit-box-sizing:border-box;
   -moz-box-sizing:border-box;
   -ms-box-sizing:border-box;
@@ -1349,14 +928,14 @@ div.main_index .row:after {
   top:0;
   right:50%;
   height:100%;
-  width:1px;
-  background-color:#eee
+  width:10px;
+  background-color:#f3f3f4
 }
 div.table {
   overflow-x:auto
 }
 .context tr > td > pre {
-  font-size:0.85em
+  font-size:0.75em
 }
 p.qt_commercial {
   border:3px solid #5caa15;
@@ -1380,8 +959,12 @@ div.qt_commercial {
   border-top:5px solid #5caa15;
   margin-bottom:50px
 }
+div.pre {
+  position:relative;
+  height:auto
+}
 pre, .LegaleseLeft {
-  background-color:#404244;
+  background-color:#3a4055;
   color:#fff;
   display:block;
   font-family:"Droid Sans Mono";
@@ -1389,12 +972,85 @@ pre, .LegaleseLeft {
   overflow-x:auto;
   margin-bottom:25px;
   padding:25px;
-  margin-top:0.75em
+  margin-top:0.75em;
+  font-size: .8em;
 }
 .mainContent .LegaleseLeft p {
   color:#fff;
   white-space: pre-wrap
 }
+pre .str,code .str {
+  color:#aaaaaa
+}
+pre .kwd,code .kwd {
+  color:#ffff55
+}
+pre .com,code .com {
+  color:#55ffff
+}
+pre .typ,code .typ {
+  color:#4f9d08
+}
+pre a .typ,code a .typ {
+  color:#21be2b
+}
+pre .lit,code .lit {
+  color:#ff55ff
+}
+pre .pun,code .pun {
+  color:#fff
+}
+pre .pln,code .pln {
+  color:#fff
+}
+@media print {
+  pre {
+    background-color:#eee !important
+  }
+  pre .str,code .str {
+    color:#060
+  }
+  pre .kwd,code .kwd{
+    color:#006;
+    font-weight:bold
+  }
+  pre .com,code .com {
+    color:#600
+  }
+  pre .typ,code .typ {
+    color:#404;
+    font-weight:bold
+  }
+  pre .lit,code .lit {
+    color:#044
+  }
+  pre .pun,code .pun {
+    color:#440
+  }
+  pre .pln,code .pln {
+    color:#000
+  }
+}
+pre.wrap {
+  white-space:pre-wrap
+}
+pre span.wrap {
+  display:none;
+  background:url("wrap.png") no-repeat;
+  right:0;
+  top:2px;
+  position:absolute;
+  width:20px;
+  height:14px;
+  margin:4px;
+  opacity:0.65
+}
+span.wrap:hover {
+  opacity:1
+}
+span.wrap:active {
+  opacity:0.75
+}
 .copy_text {
   background-color:#46a2da;
   color:#fff;
@@ -1488,6 +1144,7 @@ pre:hover>.copy_text {
     padding:10px
   }
   .sidebar {
+    position:relative;
     padding-top:0
   }
   .search .sidebar {
@@ -1496,7 +1153,7 @@ pre:hover>.copy_text {
   }
   .col-2 h2,.toc h3,.sidebar-content h2,.sidebar-content h3,.sectionlist h2 {
     text-align:center;
-    margin-bottom:0
+    margin-bottom:5px
   }
   div.main_index .row:after {
     content:none
@@ -1504,18 +1161,12 @@ pre:hover>.copy_text {
   div.main_index .row>div {
     display:block !important;
     width:100%;
-    padding:0;
+    padding:15px;
     margin:0
   }
   .context,.sidebar,.col-1 {
     width:100%
   }
-  .main_index h2,h1 {
-    text-align:center
-  }
-  .context h4,.context h3,.context h2 {
-    text-align:center
-  }
   .sidebar-content,.col-2,.toc {
     background-color:#fff;
     margin-bottom:1em;
@@ -1528,7 +1179,6 @@ pre:hover>.copy_text {
     display:block
   }
   .mainContent p {
-    line-height:1.56em;
     margin-bottom:1em;
     max-width:100%
   }
@@ -1538,6 +1188,22 @@ pre:hover>.copy_text {
   .sectionlist {
     padding:0
   }
+  .sidebar > .sectionlist {
+    padding:20px
+  }
+  .sectionlist.promo {
+    max-width:46%;
+    margin:0 auto 1em auto;
+    float:left;
+    padding:0 2%
+  }
+  .sidebar .sidebar-content {
+    clear:both
+  }
+  .copy-notice {
+    float:none;
+    width:initial
+  }
 }
 [id]:target,[name]:target,[name]:target+* {
   -webkit-animation:highlighter 3s;
@@ -1586,6 +1252,25 @@ pre:hover>.copy_text {
 #footer {
   clear:both
 }
+.footer-social i {
+  font-family: "social-icons";
+  font-style: normal;
+  font-size:150%;
+  margin: .55em;
+  color: #cecfd5
+}
+.footer-social i:hover {
+  color: #eee
+}
+.footer-social .icon-twitter:before {
+  content: '\f099'
+}
+.footer-social .icon-facebook:before {
+  content: '\f09a'
+}
+.footer-social .icon-youtube:before {
+  content: '\f16a'
+}
 .menuextraslanguages {
   display:none;
   visibility:hidden
@@ -1596,7 +1281,7 @@ form.gsc-search-box {
   margin-right: 0 !important;
   margin-bottom: 4px !important;
   margin-left: 0 !important;
-  width: 100% !important;
+  width: 102.5% !important;
 }
 table.gsc-search-box {
   border-style: none !important;
@@ -1614,13 +1299,30 @@ table.gsc-search-box td.gsc-input {
   padding-right: 0px !important;
 }
 table.gsc-search-box td.gsc-input input {
-  background-position: 15px center !important;
+  background-position: 10px center !important;
 }
 
 td.gsc-search-button {
+  line-height: 1.0;
+  position: relative;
+  left: -29px;
   width: 1% !important;
 }
 
+td.gsib_b {
+  display:none
+}
+
+button.gsc-search-button {
+  background-color: #aaa;
+}
+
+button.gsc-search-button svg {
+  height:20px;
+  width:12px;
+  padding:2px !important;
+}
+
 td.gsc-clear-button {
   width: 14px !important;
   visibility:hidden !important;
@@ -1638,6 +1340,7 @@ table.gsc-branding {
   border-width: 0 !important;
   border-spacing: 0 0 !important;
   width: 100% !important;
+  display:none
 }
 
 .gsc-branding-text {
@@ -1704,7 +1407,6 @@ input.gsc-search-button:focus {
 input.gsc-input {
   background-color: #fff !important;
   border: 1px solid #d6d6d6 !important;
-  border-radius: 5px !important;
   box-sizing: border-box !important;
   -moz-box-sizing: border-box !important;
   color: #868482 !important;
@@ -1714,7 +1416,7 @@ input.gsc-input {
 }
 
 input {
-  font-family: 'Open Sans', Arial, Helvetica, sans-serif !important;
+  font-family: 'Titillium Web', Arial, Helvetica, sans-serif !important;
   line-height: 1.5 !important;
   font-weight: 300 !important;
   vertical-align:middle
@@ -1726,9 +1428,34 @@ input:focus {
   color: #000;
 }
 
-a.qa-mark:target:before {
-  content: "***";
-  color: #ff0000;
+.animation {
+  width: 100%;
+  border-style: none;
+  border-width: 0
+}
+
+.player {
+  width: auto;
+  position: relative;
+  display: table;
+  margin-bottom:1.5em;
+}
+
+.playcontrol {
+  display: none;
+  background: url("play_icon.svg") no-repeat center,
+    linear-gradient(
+      rgba(0,0,0,0.15), rgba(0,0,0,0.15)
+    );
+  background-size: 25%;
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  left: 0%;
+  right: 0%;
+  top: 0%;
+  bottom: 0%;
+  margin: auto
 }
 
 .mainContent .video {
@@ -1743,6 +1470,7 @@ a.qa-mark:target:before {
   padding-top:60%;
   display:block
 }
+
 .mainContent .video iframe {
   width:100%;
   height:100%;
@@ -1750,3 +1478,67 @@ a.qa-mark:target:before {
   top:0;
   left:0
 }
+
+/* expand/collapse code sections */
+pre input {
+  display:none;
+  visibility:hidden
+}
+pre label {
+  display:block;
+  margin:-3px 3px 0 -16px;
+  text-align:center;
+  color:#21be2b;
+  float:left;
+}
+pre label:hover {
+  color:#fff
+}
+pre label::before {
+  font-weight:600;
+  font-size:16px;
+  content:"+";
+  display:inline-block;
+  width:16px;
+  height:16px
+}
+#ec_expand {
+  height:16px;
+  overflow:hidden;
+  transition:height 0.35s;
+}
+#ec_expand::before {
+  content:"...*/";
+  color:#aaa;
+  background-color:#3a4055;
+  z-index:99 !important;
+  right:25px;
+  position:absolute
+}
+#ec_toggle:checked ~ #ec_expand {
+  height:initial
+}
+#ec_toggle:checked ~ #ec_expand::before {
+  content:""
+}
+#ec_toggle:checked ~ label::before {
+  content:"-"
+}
+
+/* permalinks */
+h2:hover > .plink,
+h3:hover > .plink,
+h4:hover > .plink,
+h5:hover > .plink {
+  opacity:1
+}
+a.plink {
+  opacity: 0;
+  padding-left: 8px;
+  font-size: 0.8em;
+  font-weight: 600;
+  transition: opacity 180ms ease-in-out;
+}
+a.plink::before {
+  content:'\00B6'
+}
-- 
cgit v1.2.3


From 17fc079acd9cad3985a1f9cafaeaea6eec1a734f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Fri, 5 Oct 2018 14:24:53 +0200
Subject: doc: Update online navigation header to match http://doc.qt.io/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I8154abc8cf2bb5895a75c4e41ff06cb99e4fedc5
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
---
 doc/global/html-header-online.qdocconf | 69 +++++++++-------------------------
 1 file changed, 18 insertions(+), 51 deletions(-)

(limited to 'doc/global')

diff --git a/doc/global/html-header-online.qdocconf b/doc/global/html-header-online.qdocconf
index bec432c2e3..d674e76bb0 100644
--- a/doc/global/html-header-online.qdocconf
+++ b/doc/global/html-header-online.qdocconf
@@ -65,58 +65,25 @@ HTML.endheader = \
 # minimal header
 HTML.postheader = \
     "<body>\n" \
-    "<div class=\"header\" id=\"header\">\n" \
-    "<header id=\"navbar\" class=\"\">\n" \
-    "        <div class=\"cookies_yum\">\n" \
-    "            <div>\n" \
-    "                <img src=\"//d33sqmjvzgs8hq.cloudfront.net/wp-content/themes/oneqt/assets/images/cookie_small.png\" align=\"left\">\n" \
-    "                <p class=\"close_button\">\n" \
-    "                    We bake cookies in your browser for a better experience.  Using this site means that you consent. <a href=\"//qt.io/terms-conditions/\">Read More</a>\n" \
-    "                </p>\n" \
-    "                <a class=\"close\"></a>\n" \
-    "            </div>\n" \
+    "<div class=\"header\" id=\"tmpl_header\">\n" \
+    "<header class=\"\" id=\"navbar\"><div id=\"cookie-confirmation\" style=\"display:none\"><div id=\"cookie-confirmation-inner\"><p>We bake cookies in your browser for a better experience.  Using this site means that you consent.\n" \
+    "<a href=\"https://www1.qt.io/terms-conditions/ \">Read more</a></p><div id=\"cookie-confirmation-buttons-area\"><a href=\"#\" id=\"confirmation-button\">Continue »</a>\n" \
+    "</div></div>\n" \
+    "<script>\n" \
+    "    $('#confirmation-button').on('click', function() { $('#cookie-confirmation').fadeOut(); createCookie(\"cookies_nom\", \"yum\", 180); });\n" \
+    "    if (!(readCookie('cookies_nom') == 'yum')) { $('#cookie-confirmation').fadeIn(); }\n" \
+    "</script>\n" \
+    "</div>\n" \
+    "<div class=\"container\">\n" \
+    "    <div class=\"navbar-header cf\">\n" \
+    "        <div id=\"mm-wrap\">\n" \
+    "            <ul id=\"mm-helper\" class=\"mm-menu\" data-event=\"hover_intent\" data-effect=\"fade\" data-effect-speed=\"200\" data-panel-width=\"#navbar\" data-panel-inner-width=\"1280px\" data-second-click=\"go\" data-document-click=\"collapse\" data-vertical-behaviour=\"accordion\" data-breakpoint=\"0\">\n" \
+    "                <li class=\"mm-item\"><a class=\"mm-link\" href=\"http://blog.qt.io/\" tabindex=\"0\">Blog</a></li>\n" \
+    "                <li class=\"mm-item\"><a class=\"mm-link\" href=\"https://www.qt.io/contact-us/\" tabindex=\"0\">Contact Us</a></li>\n" \
+    "                <li class=\"mm-item\"><a title=\"Qt Account\" class=\"mm-link\" href=\"https://account.qt.io/\" tabindex=\"0\"></a></li>\n" \
+    "            </ul>\n" \
     "        </div>\n" \
-    "        <div class=\"container\">\n" \
-    "                <div class=\"navbar-header clearfix\">\n" \
-    "                    <a href=\"#\" class=\"navbar-toggle\">\n" \
-    "                        <figure>\n" \
-    "                            <span class=\"line\"></span>\n" \
-    "                        </figure>\n" \
-    "                        <span>Menu</span>\n" \
-    "                    </a>\n" \
-    "                    <ul id=\"menuextras\">\n" \
-    "                        <li>\n" \
-    "                            <a href=\"//qt.io/partners/\" data-icon=\"\">\n" \
-    "                                <span>Partners</span>\n" \
-    "                            </a>\n" \
-    "                        </li>\n" \
-    "                        <li>\n" \
-    "                            <a target=\"_blank\" href=\"http://blog.qt.io/\" data-icon=\"\">\n" \
-    "                                <span>Blog</span>\n" \
-    "                            </a>\n" \
-    "                        </li>\n" \
-    "                        <li class=\"sign-in\">\n" \
-    "                             <a data-icon=\"\" class=\"signin\" href=\"https://account.qt.io/login\"><span>Sign in</span></a>\n" \
-    "                        </li>\n" \
-    "                    </ul>\n" \
-    "                    <a href=\"http://qt.io/\" class=\"navbar-oneQt retina\" data-icon=\"\">\n" \
-    "                    </a>\n" \
-    "                    <nav class=\"navbar-menu clearfix\" role=\"navigation\">\n" \
-    "                        <ul id=\"mainmenu\" class=\"menu\"><li id=\"menu-item-18\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-18\"><a href=\"http://qt.io/download/\">Download</a></li>\n" \
-    "<li id=\"menu-item-12207\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-12207\"><a href=\"http://www.qt.io/qt-for-device-creation/\">Device Creation</a></li>\n" \
-    "<li id=\"menu-item-12208\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-12208\"><a href=\"http://www.qt.io/application-development/\">Application Development</a></li>\n" \
-    "<li id=\"menu-item-1381\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1381\"><a href=\"http://www.qt.io/services/\">Services</a></li>\n" \
-    "<li id=\"menu-item-20\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-20\"><a href=\"http://www.qt.io/developers/\">Developers</a></li>\n" \
-    "</ul>                        <ul class=\"menuextraslanguages\">\n" \
-    "                            <li class=\"active dark\"><a class=\"dark\" href=\"http://qt.io/support/\">EN</a></li><li class=\"dark\"><a class=\"dark\" href=\"http://qt.io/ru/\">RU</a></li><li class=\"dark\"><a class=\"dark\" href=\"http://qt.io/zh-hans/\">ZH</a></li></ul>\n" \
-    "                    </nav>\n" \
-    "                </div>\n" \
-    "            </div>\n" \
-    "<div class=\"big_bar account\" style=\"\">\n" \
-    "    <div class=\"container\">\n" \
-    "        <h1><!-- mclude oneqt_no_cache_bMrsJxAh /wp-content/themes/oneqt/php_login_info_bottom_header.php --><!-- /mclude oneqt_no_cache_bMrsJxAh -->\n" \
-    "            <div class=\"col-1 right big_bar_button account\" style=\"margin-top:5px !important;\"></div>\n" \
-    "        </h1>\n" \
+    "        <a class=\"navbar-oneQt retina\" data-icon=\"\" href=\"https://www.qt.io/\"></a>\n" \
     "    </div>\n" \
     "</div>\n" \
     "</header>\n" \
-- 
cgit v1.2.3


From 5fd48d78d59128cf57a1c4eae3980c23497a8def Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Mon, 17 Dec 2018 16:22:39 +0100
Subject: Bump copyright year to 2019

Task-number: QTBUG-72635
Change-Id: Idc9bd97fe873b332d7ff72cb44a00334a472404f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
---
 doc/global/config.qdocconf                    | 2 +-
 doc/global/html-footer-online.qdocconf        | 2 +-
 doc/global/html-footer.qdocconf               | 2 +-
 doc/global/qt-module-defaults-online.qdocconf | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'doc/global')

diff --git a/doc/global/config.qdocconf b/doc/global/config.qdocconf
index 81190c2478..0b276c400f 100644
--- a/doc/global/config.qdocconf
+++ b/doc/global/config.qdocconf
@@ -3,7 +3,7 @@
 dita.metadata.default.author      = Qt Project
 dita.metadata.default.permissions = all
 dita.metadata.default.publisher   = Qt Project
-dita.metadata.default.copyryear = 2018
+dita.metadata.default.copyryear = 2019
 dita.metadata.default.copyrholder = The Qt Company Ltd
 dita.metadata.default.audience = programmer
 
diff --git a/doc/global/html-footer-online.qdocconf b/doc/global/html-footer-online.qdocconf
index f2631555c1..c4465fce66 100644
--- a/doc/global/html-footer-online.qdocconf
+++ b/doc/global/html-footer-online.qdocconf
@@ -78,7 +78,7 @@ HTML.footer += \
     "    <ul id=\"menu-footer-submenu\" class=\"right clearfix\"><li id=\"menu-item-1795\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1795\"><a title=\"Sign into your account.\" href=\"https://account.qt.io/login\">Sign In</a></li>\n" \
     "      <li id=\"menu-item-10375\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-10375\"><a href=\"mailto:feedback@theqtcompany.com?Subject=Feedback%20about%20doc.qt.io%20site\">Feedback</a></li>\n" \
     "      <li id=\"menu-item-1494\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1494\"><a href=\"http://qt.io/contact-us/\">Contact us</a></li>\n" \
-    "      <li id=\"menu-item-4472\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-4472\"><a href=\"http://qt.io/about-us/\">© 2018 The Qt Company</a></li>\n" \
+    "      <li id=\"menu-item-4472\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-4472\"><a href=\"http://qt.io/about-us/\">© 2019 The Qt Company</a></li>\n" \
     "    </ul>\n" \
     "</div>\n" \
     "</div>\n" \
diff --git a/doc/global/html-footer.qdocconf b/doc/global/html-footer.qdocconf
index c0122a7c4f..04f7fa0d79 100644
--- a/doc/global/html-footer.qdocconf
+++ b/doc/global/html-footer.qdocconf
@@ -8,7 +8,7 @@ HTML.footer = \
     "</div>\n" \
     "<div class=\"footer\">\n" \
     "   <p>\n" \
-    "   <acronym title=\"Copyright\">&copy;</acronym> 2018 The Qt Company Ltd.\n" \
+    "   <acronym title=\"Copyright\">&copy;</acronym> 2019 The Qt Company Ltd.\n" \
     "   Documentation contributions included herein are the copyrights of\n" \
     "   their respective owners.<br/>" \
     "   The documentation provided herein is licensed under the terms of the" \
diff --git a/doc/global/qt-module-defaults-online.qdocconf b/doc/global/qt-module-defaults-online.qdocconf
index 1bed0c7934..f2e897db65 100644
--- a/doc/global/qt-module-defaults-online.qdocconf
+++ b/doc/global/qt-module-defaults-online.qdocconf
@@ -5,7 +5,7 @@
 HTML.footer = \
     "   </div>\n" \
     "   <p class=\"copy-notice\">\n" \
-    "   <acronym title=\"Copyright\">&copy;</acronym> 2018 The Qt Company Ltd.\n" \
+    "   <acronym title=\"Copyright\">&copy;</acronym> 2019 The Qt Company Ltd.\n" \
     "   Documentation contributions included herein are the copyrights of\n" \
     "   their respective owners. " \
     "   The documentation provided herein is licensed under the terms of the" \
-- 
cgit v1.2.3


From 3eac688ec005833509bffc7097c378af9c5b515f Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Thu, 10 Jan 2019 08:46:52 +0100
Subject: Documentation: Add \nullptr macro and use where applicable

Qt for Python users reading the documentation assume that int(0) can
be passed for pointer parameters. Use the newly introduced \nullptr to
disambiguate this.

In a follow-up step, the \nullptr macro can be defined as None
when generating the Qt for Python documentation.

Task-number: PYSIDE-903
Change-Id: I3a45f87175a0668ab5f3f95f0aff409f7e3ef027
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
---
 doc/global/macros.qdocconf | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc/global')

diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf
index 704b1da277..ef3ca1dc1d 100644
--- a/doc/global/macros.qdocconf
+++ b/doc/global/macros.qdocconf
@@ -14,6 +14,7 @@ macro.macos             = "macOS"
 macro.menu              = "\\b"
 macro.oslash.HTML       = "&oslash;"
 macro.ouml.HTML         = "&ouml;"
+macro.nullptr           = "\\c{nullptr}"
 macro.QA                = "\\e{Qt Assistant}"
 macro.QD                = "\\e{Qt Designer}"
 macro.QL                = "\\e{Qt Linguist}"
-- 
cgit v1.2.3


From c7f6761bc98593744f8f8f9d2b864656f8d36a58 Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@qt.io>
Date: Fri, 13 Jul 2018 15:12:17 +0200
Subject: Doc: Remove background colors from simplified offline CSS

The simplified style needs to work for both light and dark themes
in Qt Creator's help system. Background and text colors are already
applied according to the active theme, this commit removes the rest
of the hardcoded element colors that do not look good with a dark
theme.

Task-number: QTBUG-49417
Task-number: QTBUG-69327
Change-Id: Ib5ebe2755e98ca120f0500ab82713a37ec7199bd
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
---
 doc/global/template/style/offline-simple.css | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'doc/global')

diff --git a/doc/global/template/style/offline-simple.css b/doc/global/template/style/offline-simple.css
index 82e99c42ac..b89ca5a808 100644
--- a/doc/global/template/style/offline-simple.css
+++ b/doc/global/template/style/offline-simple.css
@@ -1,5 +1,4 @@
 pre, .LegaleseLeft {
-  background-color: #f0f0f0;
   font-family: Courier, monospace;
   font-weight: 600;
   vertical-align: top;
@@ -40,7 +39,6 @@ h1.title {
 }
 
 h2, p.h2 {
-  background-color: #F2F3F4;
   padding: 4px;
   margin: 30px 0px 20px 10px;
 }
@@ -67,10 +65,6 @@ ul li, ol li {
 }
 
 h3.fn, span.fn {
-  border-width: 3px;
-  border-style: solid;
-  border-color: #aaaaaa;
-  background-color: #eeeeee;
   word-spacing: 3px;
   padding: 5px;
   text-decoration: none;
@@ -94,10 +88,6 @@ table td {
   padding: 6px 10px 6px 10px;
 }
 
-table tr.odd {
-  background-color: #eeeeee;
-}
-
 table.qmlname td {
   padding: 0px;
   margin-left: 6px;
@@ -144,19 +134,10 @@ span.naviSeparator {
   margin: 0;
 }
 
-.navigationbar table tr {
-  background-color: #eeeeee;
-}
-
-td#buildversion {
-  background-color: #ffffff;
-}
-
 .footer, .footer p {
   padding: 5px 0px 5px 0px;
   margin: 45px 15px 5px 15px;
   font-size: 8.5pt;
-  background-color: #cccccc;
 }
 
 .footer p {
-- 
cgit v1.2.3