Changeset 12074 for main

Timestamp:

28 Nov 2014, 05:45:31 (10 years ago)

Author:

Henrik Bettermann

Message:

Display an image instead of text for NGREN logo.

Location:

main/ngren.theme/trunk/ngren/theme/ngren_theme

Files:

• about-us.html (modified) (1 diff)
• css/style.css (modified) (9 diffs)
• dr-mt-johnson.html (modified) (1 diff)
• example.html (modified) (1 diff)
• full.html (modified) (1 diff)
• home.html (modified) (1 diff)
• img/ngren_logo.png (modified) (previous)
• img/ngren_logo_short.png (added)
• services.html (modified) (1 diff)

main/ngren.theme/trunk/ngren/theme/ngren_theme/about-us.html

@@ -55 +55 @@
         <div id="header-head">
           <div id="logo-container">
-            <a href="home.html">
-              <img id="logo" src="img/ngren_logo.png" alt="NgREN logo" />
-            </a>
             <h1>
-              <a href="home.html">Nigerian Research and<br/>Education Network
-              <br/><sup><font size="2">RC1011289</font></sup></a>
+              <a class="header-logo" href="home.html">
+                  Nigerian Research and Education Network
+              </a>
             </h1>
           </div>

main/ngren.theme/trunk/ngren/theme/ngren_theme/css/style.css

@@ -133 +133 @@
 
 #logo-container {
-  height:90px;
-  margin:20px;
+  height:140px;
+  margin:0px;
   text-align:center;
   float:left;
@@ -146 +146 @@
 }
 
-#logo-container #logo {
-  float: left;
-  margin: 5px;
-  margin-top: -10px;
-  width: 150px;
+.header-logo {
+  display:block;
+  width:500px;
+  height:125px;
+  background:url(../img/ngren_logo.png) no-repeat;
+  text-indent: 100%;
+  white-space: nowrap;
+  overflow: hidden;
+  margin:0 auto;
+  background-size: 500px;
 }
 
@@ -159 +164 @@
   top: 0px;
   text-align:left;
-  margin-left:10px;
+  margin-left: 20px;
 }
 
@@ -214 +219 @@
 
 .navbar-form input[type="text"] {
-  width:200px;
+  width:150px;
 }
 
@@ -786 +791 @@
 
 @media (max-width: 1200px) {
+
   .left-col, .right-col {
     width:100%;
@@ -800 +806 @@
 
 @media (max-width: 981px) {
+
+#logo-container h1 {
+    margin: 15px;
+  }
+
   .slider-container .slider-image {
     top:0px;
@@ -827 +838 @@
 
 @media (max-width: 767px) {
+
 
   /** Base **/
@@ -909 +921 @@
   /** Header **/
 
-
   #logo-container {
-    margin:10px;
+    margin:0px;
     text-align:none;
-    float:none;
+    float:center;
     position:relative;
-  }
+    height:90px;
+  }
+
 
   #header-head {
@@ -927 +940 @@
   }
 
-  #logo-container #logo{
-    float:none;
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
-    margin-bottom: 0px;
-    margin-bottom: -15px;
-
-  }
-
-  #logo-container h1 {
-    visibility:hidden;
-    height: 0px;
+
+  .header-logo {
+      display:block;
+      width:300px;
+      height:120px;
+      background:url(../img/ngren_logo.png) no-repeat;
+      text-indent: 100%;
+      white-space: nowrap;
+      overflow: hidden;
+      margin:0 auto;
+      background-size: 300px;
   }
 }

main/ngren.theme/trunk/ngren/theme/ngren_theme/dr-mt-johnson.html

@@ -55 +55 @@
         <div id="header-head">
           <div id="logo-container">
-            <a href="home.html">
-              <img id="logo" src="img/ngren_logo.png" alt="NgREN logo" />
-            </a>
             <h1>
-              <a href="home.html">Nigerian Research and<br/>Education Network
-              <br/><sup><font size="2">RC1011289</font></sup></a>
+              <a class="header-logo" href="home.html">
+                  Nigerian Research and Education Network
+              </a>
             </h1>
           </div>

main/ngren.theme/trunk/ngren/theme/ngren_theme/example.html

@@ -55 +55 @@
         <div id="header-head">
           <div id="logo-container">
-            <a href="home.html">
-              <img id="logo" src="img/ngren_logo.png" alt="NgREN logo" />
-            </a>
             <h1>
-              <a href="home.html">Nigerian Research and<br/>Education Network
-              <br/><sup><font size="2">RC1011289</font></sup></a>
+              <a class="header-logo" href="home.html">
+                  Nigerian Research and Education Network
+              </a>
             </h1>
           </div>
-                                        <div class="btn-group pull-right btn-small"
-                                             id="user-options">
-                                          <a class="btn btn-small btn-primary"
-                                             href="#">
-                                            <i class="icon-user icon-white"></i>
-                                            <span id="user-options-name">
-                                              Username
-                                            </span>
-                                          </a>
-                                          <a class="btn btn-small btn-primary
-                                                    dropdown-toggle"
-                                             data-toggle="dropdown"
-                                             href="#">
-                                            <span class="caret"></span>
-                                          </a>
-                                          <ul class="dropdown-menu btn-small">
-                                            <li><a href="#">Dashboard</a></li>
-                                            <li><a href="#">Logout</a></li>
-                                          </ul>
-                                        </div><!-- user-options -->
+          <div class="btn-group pull-right btn-small"
+               id="user-options">
+            <a class="btn btn-small btn-primary"
+               href="#">
+              <i class="icon-user icon-white"></i>
+              <span id="user-options-name">
+                Username
+              </span>
+            </a>
+            <a class="btn btn-small btn-primary
+                      dropdown-toggle"
+               data-toggle="dropdown"
+               href="#">
+              <span class="caret"></span>
+            </a>
+            <ul class="dropdown-menu btn-small">
+              <li><a href="#">Dashboard</a></li>
+              <li><a href="#">Logout</a></li>
+            </ul>
+          </div><!-- user-options -->
           <form class="navbar-form pull-right">
             <input type="text" />

main/ngren.theme/trunk/ngren/theme/ngren_theme/full.html

@@ -55 +55 @@
         <div id="header-head">
           <div id="logo-container">
-            <a href="home.html">
-              <img id="logo" src="img/ngren_logo.png" alt="NgREN logo" />
-            </a>
             <h1>
-              <a href="home.html">Nigerian Research and<br/>Education Network
-              <br/><sup><font size="2">RC1011289</font></sup></a>
+              <a class="header-logo" href="home.html">
+                  Nigerian Research and Education Network
+              </a>
             </h1>
           </div>

main/ngren.theme/trunk/ngren/theme/ngren_theme/home.html

@@ -55 +55 @@
         <div id="header-head">
           <div id="logo-container">
-            <a href="home.html">
-              <img id="logo" src="img/ngren_logo.png" alt="NgREN logo" />
-            </a>
             <h1>
-              <a href="home.html">Nigerian Research and<br/>Education Network
-              <br/><sup><font size="2">RC1011289</font></sup></a>
+              <a class="header-logo" href="home.html">
+                  Nigerian Research and Education Network
+              </a>
             </h1>
           </div>

main/ngren.theme/trunk/ngren/theme/ngren_theme/services.html

@@ -55 +55 @@
         <div id="header-head">
           <div id="logo-container">
-            <a href="home.html">
-              <img id="logo" src="img/ngren_logo.png" alt="NgREN logo" />
-            </a>
             <h1>
-              <a href="home.html">Nigerian Research and<br/>Education Network
-              <br/><sup><font size="2">RC1011289</font></sup></a>
+              <a class="header-logo" href="home.html">
+                  Nigerian Research and Education Network
+              </a>
             </h1>
           </div>