thomas
/
website
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Switched to Bootstrap v3 RC1

Thomas Buck 11 years ago
parent
4304667004
commit
235cd9e8bb
4 changed files with 15 additions and 25 deletions
Unified View Show Diff Stats
  1. 6
    7
      page.html
  2. 0
    9
      static/css/bootstrap-responsive.min.css
  3. 4
    4
      static/css/bootstrap.min.css
  4. 5
    5
      static/js/bootstrap.min.js

+ 6
- 7
page.html View File

11 
     <link rel="alternate" type="application/rss+xml" title="Blog" href="rss.xml">
 11 
     <link rel="alternate" type="application/rss+xml" title="Blog" href="rss.xml">
12 
     <link type="text/css" rel="stylesheet" href="css/sh_bright.min.css" />
 12 
     <link type="text/css" rel="stylesheet" href="css/sh_bright.min.css" />
13 
     <link rel="stylesheet" href="css/bootstrap.min.css" type="text/css" media="screen" />
 13 
     <link rel="stylesheet" href="css/bootstrap.min.css" type="text/css" media="screen" />
14 
-    <link rel="stylesheet" href="css/bootstrap-responsive.min.css" type="text/css" media="screen" />
15 
     <link rel="stylesheet" href="css/gh-fork-ribbon.css" />
 14 
     <link rel="stylesheet" href="css/gh-fork-ribbon.css" />
16 
     <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'>
 15 
     <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'>
17 
     <script type="text/javascript" src="js/sh_main.js"></script>
 16 
     <script type="text/javascript" src="js/sh_main.js"></script>
33 
             print "</script>"
 32 
             print "</script>"
34 
     %-->
 33 
     %-->
35 
 </head>
 34 
 </head>
36 
-<body onload="sh_highlightDocument('/js/sh/', '.min.js');" style="font-size: 1.1em; font-family: 'Droid Sans', sans-serif;">
35 
+<body onload="sh_highlightDocument('/js/sh/', '.min.js');" style="font-size: 1.8em; font-family: 'Droid Sans', sans-serif;">
37 
     <!--%
 36 
     <!--%
38 
         if page.get("github", "") != "":
 37 
         if page.get("github", "") != "":
39 
             # GitHub Fork-Me Ribbon
 38 
             # GitHub Fork-Me Ribbon
44 
     %-->
 43 
     %-->
45 
     <div class="navbar navbar-fixed-top">
 44 
     <div class="navbar navbar-fixed-top">
46 
         <div class="navbar-inner">
 45 
         <div class="navbar-inner">
47 
-            <ul class="nav">
46 
+            <ul class="nav navbar-nav">
48 
                 <!--%
 47 
                 <!--%
49 
                     mpages = [p for p in pages if p.get("parent", "") == "main" and p.lang == "en"]
 48 
                     mpages = [p for p in pages if p.get("parent", "") == "main" and p.lang == "en"]
50 
                     mpages.sort(key=lambda p: int(p["position"]))
 49 
                     mpages.sort(key=lambda p: int(p["position"]))
51 
                     entry = '<li><a href="%s">%s</a></li>'
 50 
                     entry = '<li><a href="%s">%s</a></li>'
52 
-                    newEntry = '<li class="dropdown"><a href="%s" class="dropdown-toggle" data-toggle="dropdown">%s<b class="caret"></b></a><ul class="dropdown-menu">'
51 
+                    newEntry = '<li class="dropdown"><a href="%s" class="dropdown-toggle" data-toggle="dropdown">%s <b class="caret"></b></a><ul class="dropdown-menu">'
53 
                     newEntry2 = '<li class="dropdown-submenu"><a href="%s" class="dropdown-toggle disabled" data-toggle="dropdown">%s</a><ul class="dropdown-menu">'
 52 
                     newEntry2 = '<li class="dropdown-submenu"><a href="%s" class="dropdown-toggle disabled" data-toggle="dropdown">%s</a><ul class="dropdown-menu">'
54 
                     for p in mpages:
 53 
                     for p in mpages:
55 
                         sub = [r for r in pages if r.get("parent", "") == p.url.replace("/", "").replace(".html", "") and r.lang == "en"]
 54 
                         sub = [r for r in pages if r.get("parent", "") == p.url.replace("/", "").replace(".html", "") and r.lang == "en"]
76 
                         tmp = [p for p in page["lang_links"].iteritems()]
 75 
                         tmp = [p for p in page["lang_links"].iteritems()]
77 
                         if len(tmp) > 1:
 76 
                         if len(tmp) > 1:
78 
                             print '<li class="divider-vertical"></li>'
 77 
                             print '<li class="divider-vertical"></li>'
79 
-                            print '<li class="dropdown"><a href="language.html" class="dropdown-toggle" data-toggle="dropdown">Language<b class="caret"></b></a><ul class="dropdown-menu">'
78 
+                            print '<li class="dropdown"><a href="language.html" class="dropdown-toggle" data-toggle="dropdown">Language <b class="caret"></b></a><ul class="dropdown-menu">'
80 
                             print " ".join(["<li><a href='%s'>%s</a></li>" % (url, lang) for lang, url in page["lang_links"].iteritems()]).replace(">en<", ">English<").replace(">de<", ">Deutsch<")
 79 
                             print " ".join(["<li><a href='%s'>%s</a></li>" % (url, lang) for lang, url in page["lang_links"].iteritems()]).replace(">en<", ">English<").replace(">de<", ">Deutsch<")
81 
                             print "</ul></li>"
 80 
                             print "</ul></li>"
82 
                             print ''
 81 
                             print ''
87 
                         curobj.q.value = "site:xythobuz.de " + curobj.r.value
 86 
                         curobj.q.value = "site:xythobuz.de " + curobj.r.value
88 
                     }
 87 
                     }
89 
                 </script>
 88 
                 </script>
90 
-                <form class="navbar-search" action="http://www.google.com/search" method="get" onSubmit="sitesearch(this)">
89 
+                <form class="navbar-form pull-right" action="http://www.google.com/search" method="get" onSubmit="sitesearch(this)">
91 
                     <input name="q" type="hidden" />
 90 
                     <input name="q" type="hidden" />
92 
-                    <input name="r" type="text" class="search-query span2" placeholder="Search..." />
91 
+                    <input name="r" type="text" class="form-control" placeholder="Search..." />
93 
                 </form>
 92 
                 </form>
94 
             </ul>
 93 
             </ul>
95 
         </div>
 94 
         </div>

+ 0
- 9
static/css/bootstrap-responsive.min.css
File diff suppressed because it is too large
View File


+ 4
- 4
static/css/bootstrap.min.css
File diff suppressed because it is too large
View File


+ 5
- 5
static/js/bootstrap.min.js
File diff suppressed because it is too large
View File


Write Preview
Loading…
Cancel
Save