Changeset 5643

Timestamp:

09/17/14 07:30:23 (10 years ago)

Author:

Twan Goosen

Message:

Footer styling
Refs #631

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main

Files:

• java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BasePage.html (modified) (2 diffs)
• webapp/css/CLARIN.scss (modified) (2 diffs)
• webapp/css/vcr.scss (modified) (1 diff)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BasePage.html

@@ -62 +62 @@
             <div class="container">
                 <div id="CLARIN_footer_left">
-                    <a title="about" wicket:id="aboutlink"><span>VERSION ${pom.version} </span><span class="glyphicon glyphicon-info-sign"></span></a>
+                    <a title="about" wicket:id="aboutlink">
+                        <span class="glyphicon glyphicon-info-sign"></span>
+                        <span>VERSION ${pom.version} </span>
+                    </a>
                 </div>
                 <div id="CLARIN_footer_middle">
@@ -68 +71 @@
                 </div>
                 <div id="CLARIN_footer_right">
-                    <a title="contact" class="glyphicon glyphicon-envelope" href="mailto:vcr@clarin.eu"><span> CONTACT</span></a>
+                    <a title="contact" href="mailto:vcr@clarin.eu">
+                        <span class="glyphicon glyphicon-envelope"></span>
+                        <span> CONTACT</span>
+                    </a>
                 </div>
             </div>

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/webapp/css/CLARIN.scss

@@ -426 +426 @@
     align-content: space-around;
 
+    div#CLARIN_footer_left, div#CLARIN_footer_right {
+        a span.glyphicon {
+            margin-right: .2em;
+        }
+    }
+    
     div#CLARIN_footer_left {
-      order: 1;
+        order: 1;
       //float: left;
       //display: inline-block;
-      display: flex !important;
-      text-align: left;
-      vertical-align: middle;
-      margin: auto;
-      align-content: space-around;
+        display: flex !important;
+        text-align: left;
+        vertical-align: middle;
+        margin: auto;
+        width: 33%;
+        align-content: space-around;
+        padding-left: 1em;
       //width: 25%;
       //max-height: 100%;
@@ -440 +448 @@
 
     div#CLARIN_footer_middle {
-      order: 2;
+        order: 2;
       //float: left;
       //display: inline-block;
-      display: flex !important;
-      text-align: center;
-      margin: auto;
-      align-content: space-around;
+        display: flex !important;
+        text-align: center;
+        margin: auto;
+        width: 33%;
+        align-content: space-around;
       //width: 50%;
       //max-height: 100%;
 
-      img {
-        display: inline-block;
-        max-width: 100%;
-        max-height: 100%;
-        overflow: hidden;
+      a {
+          display: block;
+          width: 100%;
+      
+        img {
+          margin: 0 auto;
+          display: block;
+          max-width: 100%;
+          max-height: 100%;
+          overflow: hidden;
+        }
       }
     }
 
     div#CLARIN_footer_right {
-      order: 3;
+        order: 3;
       //float: left;
-      text-align: right;
-      vertical-align: middle;
-      display: flex !important;
-      margin: auto;
-      align-content: space-around;
+        text-align: right;
+        vertical-align: middle;
+        display: flex !important;
+        /* margin: auto; */
+        width: 33%;
+        align-content: space-around;
+        padding-right: 1em;
       //width: 25%;
       //max-height: 100%;
+      
+      a {
+          width: 100%;
+      }
     }
   }

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/webapp/css/vcr.scss

@@ -14 +14 @@
 
 body {
-    font-size: 120%;
+    font-size: 130%;
 }