Changeset 5621

Timestamp:

09/04/14 15:03:43 (10 years ago)

Author:

Twan Goosen

Message:

merged styling tweaks

Location:

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0

Files:

• . (modified) (1 prop)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/AboutPage.html (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BasePage.html (modified) (1 diff)
• src/main/webapp/css/vcr.scss (modified) (4 diffs)
• src/main/webapp/images/clarin-logo.png (modified) (previous)

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/AboutPage.html

@@ -24 +24 @@
                 </ul>
             </p>
+            <p id="aboutlogos">
+                <a title="CLARIN ERIC" href="https://www.clarin.eu/"><img src="images/clarin-logo.png" alt="CLARIN ERIC logo"/></a>
+                <a title="IDS" href="https://www.ids-mannheim.de/"><img src="images/ids-logo.png" alt="IDS logo"/></a>
+            </p>
             <h2>Licenses</h2>
             <p>
                 The VCR is made available under the 
                 <a href="http://www.gnu.org/licenses/gpl-3.0.html">GPL 3.0</a>
-                license.
+                license.<br />
+                For information on obtaining source files, go to
+                <a href="http://www.clarin.eu/svn">clarin.eu/svn</a>.
             </p>
             <p>

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BasePage.html

@@ -63 +63 @@
                 </div>
                 <div id="CLARIN_footer_middle">
-                    <a title="CLARIN ERIC" href="https://www.clarin.eu/"><img src="//infra.clarin.eu/content/CLARIN-logo-4C14-60pxh.png" alt="CLARIN ERIC logo"/></a>
-                    <a title="IDS" href="https://www.ids-mannheim.de/"><img src="images/ids-logo.png" alt="IDS logo"/></a>
+                    <a title="CLARIN ERIC" href="https://www.clarin.eu/"><img src="images/clarin-logo.png" alt="CLARIN ERIC logo"/></a>
                 </div>
                 <div id="CLARIN_footer_right">

VirtualCollectionRegistry/branches/VirtualCollectionRegistry-1.0/src/main/webapp/css/vcr.scss

@@ -45 +45 @@
 }
 
+.navbar-collapse {
+    font-size: 120%;
+}
+
+a.navbar-brand {
+    line-height: 20px;
+}
+
 ul#CLARIN_header_right li.authenticated {
     text-shadow: none;
@@ -53 +61 @@
 
 div#CLARIN_footer_middle img {
-    max-height: 60px;
+    max-height: 80px !important;
     padding: 6px 4px;
 }
@@ -67 +75 @@
 div#betabadge {
     position: relative;
-    
+
     span {
         display: block;
@@ -80 +88 @@
     }
 }
+
+#aboutlogos img {
+    max-height: 6em;
+    margin: 1em;
+}