diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-08-20 12:00:36 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-08-23 12:29:23 (GMT) |
| commit | 1bb64da35315e8c8b59d4cdb9dbae234cb2bcf8c (patch) | |
| tree | 88ff401006fed9bb8d9200d5d627fac163c35d84 | |
| parent | 44f923b115e5c9a34ff20d049192ba9125172456 (diff) | |
| download | Qt-1bb64da35315e8c8b59d4cdb9dbae234cb2bcf8c.zip Qt-1bb64da35315e8c8b59d4cdb9dbae234cb2bcf8c.tar.gz Qt-1bb64da35315e8c8b59d4cdb9dbae234cb2bcf8c.tar.bz2 | |
Doc: fixing creator bugs, removing menus and textbox in the header
(cherry picked from commit 4aafc4e55e0906be0cc39911b2c1a4ffe71c4d91)
| -rw-r--r-- | doc/src/template/style/narrow.css | 3 | ||||
| -rwxr-xr-x | doc/src/template/style/style.css | 4 | ||||
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 13 |
3 files changed, 14 insertions, 6 deletions
diff --git a/doc/src/template/style/narrow.css b/doc/src/template/style/narrow.css index 349048f..de5b0a0 100644 --- a/doc/src/template/style/narrow.css +++ b/doc/src/template/style/narrow.css @@ -203,6 +203,9 @@ *border: 1px solid #fff; *height: 17px; _height: 18px; + /* to be fixed */ + display: none; + /* to be fixed */ } .narrow .indexbox .indexIcon { diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css index a05efd2..4772260 100755 --- a/doc/src/template/style/style.css +++ b/doc/src/template/style/style.css @@ -1505,6 +1505,10 @@ .creator .toc { margin:10px 20px 10px 10px; } + + .creator #narrowsearch, .creator #narrowmenu{ + display:none; + } /* end of creator spec*/ } diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 52a61e0..75d8893 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1808,18 +1808,19 @@ void HtmlGenerator::generateHeader(const QString& title, // Adding jquery and functions - providing online tools and search features out() << " <script src=\"scripts/jquery.js\" type=\"text/javascript\"></script>\n"; out() << " <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n"; - // Adding style and js for small windows - out() << " <script src=\"./scripts/superfish.js\" type=\"text/javascript\"></script>\n"; - out() << " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/superfish.css\" />"; - out() << " <script src=\"./scripts/narrow.js\" type=\"text/javascript\"></script>\n"; - out() << " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/narrow.css\" />\n"; + // Adding syntax highlighter // future release - // Setting some additional style sheet related details depending on configuration (e.g. online/offline) + // Setting some additional style sheet related details depending on configuration (e.g. Online/Creator) switch (application) { case Online: + // Adding style and js for small windows + out() << " <script src=\"./scripts/superfish.js\" type=\"text/javascript\"></script>\n"; + out() << " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/superfish.css\" />"; + out() << " <script src=\"./scripts/narrow.js\" type=\"text/javascript\"></script>\n"; + out() << " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/narrow.css\" />\n"; // Browser spec styles out() << " <!--[if IE]>\n"; out() << "<meta name=\"MSSmartTagsPreventParsing\" content=\"true\">\n"; |