Explorar el Código

Switched to Bootstrap v3 RC1

Thomas Buck hace 11 años
padre
commit
235cd9e8bb

+ 6
- 7
page.html Ver fichero

@@ -11,7 +11,6 @@
11 11
     <link rel="alternate" type="application/rss+xml" title="Blog" href="rss.xml">
12 12
     <link type="text/css" rel="stylesheet" href="css/sh_bright.min.css" />
13 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 14
     <link rel="stylesheet" href="css/gh-fork-ribbon.css" />
16 15
     <link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'>
17 16
     <script type="text/javascript" src="js/sh_main.js"></script>
@@ -33,7 +32,7 @@
33 32
             print "</script>"
34 33
     %-->
35 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 37
         if page.get("github", "") != "":
39 38
             # GitHub Fork-Me Ribbon
@@ -44,12 +43,12 @@
44 43
     %-->
45 44
     <div class="navbar navbar-fixed-top">
46 45
         <div class="navbar-inner">
47
-            <ul class="nav">
46
+            <ul class="nav navbar-nav">
48 47
                 <!--%
49 48
                     mpages = [p for p in pages if p.get("parent", "") == "main" and p.lang == "en"]
50 49
                     mpages.sort(key=lambda p: int(p["position"]))
51 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 52
                     newEntry2 = '<li class="dropdown-submenu"><a href="%s" class="dropdown-toggle disabled" data-toggle="dropdown">%s</a><ul class="dropdown-menu">'
54 53
                     for p in mpages:
55 54
                         sub = [r for r in pages if r.get("parent", "") == p.url.replace("/", "").replace(".html", "") and r.lang == "en"]
@@ -76,7 +75,7 @@
76 75
                         tmp = [p for p in page["lang_links"].iteritems()]
77 76
                         if len(tmp) > 1:
78 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 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 80
                             print "</ul></li>"
82 81
                             print ''
@@ -87,9 +86,9 @@
87 86
                         curobj.q.value = "site:xythobuz.de " + curobj.r.value
88 87
                     }
89 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 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 92
                 </form>
94 93
             </ul>
95 94
         </div>

+ 0
- 9
static/css/bootstrap-responsive.min.css
La diferencia del archivo ha sido suprimido porque es demasiado grande
Ver fichero


+ 4
- 4
static/css/bootstrap.min.css
La diferencia del archivo ha sido suprimido porque es demasiado grande
Ver fichero


+ 5
- 5
static/js/bootstrap.min.js
La diferencia del archivo ha sido suprimido porque es demasiado grande
Ver fichero


Loading…
Cancelar
Guardar