thomas
/
website
Bevaka 1
Stjärnmärk 0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 0 Wiki Aktiviteter
Bläddra i källkod

Revert "Switched to Bootstrap v3 RC1" 

This reverts commit 235cd9e8bb.
Thomas Buck 11 år sedan
förälder
af003269ba
incheckning
c884c6c1ee
4 ändrade filer med 25 tillägg och 15 borttagningar
Unifierad Vy Visa Diff Statistik
  1. 7
    6
      page.html
  2. 9
    0
      static/css/bootstrap-responsive.min.css
  3. 4
    4
      static/css/bootstrap.min.css
  4. 5
    5
      static/js/bootstrap.min.js

+ 7
- 6
page.html Visa fil

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

+ 9
- 0
static/css/bootstrap-responsive.min.css
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 4
- 4
static/css/bootstrap.min.css
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 5
- 5
static/js/bootstrap.min.js
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


Write Förhandsgranska
Laddar…
Avbryt
Spara