[Fmsystem-commits] [17456] design update

[roger . kolseth]

Revision: 17456
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17456
Author:   rogkol
Date:     2017-12-19 13:13:26 -0500 (Tue, 19 Dec 2017)
Log Message:
-----------
design update

Modified Paths:
--------------
    trunk/phpgwapi/templates/aalesund/css/sample.css
    trunk/phpgwapi/templates/aalesund/footer.tpl
    trunk/phpgwapi/templates/aalesund/head.tpl
    trunk/phpgwapi/templates/aalesund/js/sample.js

Modified: trunk/phpgwapi/templates/aalesund/css/sample.css
===================================================================
--- trunk/phpgwapi/templates/aalesund/css/sample.css    2017-12-19 18:12:50 UTC 
(rev 17455)
+++ trunk/phpgwapi/templates/aalesund/css/sample.css    2017-12-19 18:13:26 UTC 
(rev 17456)
@@ -11,13 +11,19 @@
   -moz-background-size: cover;
   -o-background-size: cover;
   background-size: cover;
-  padding-top: 10rem;
-  padding-bottom: 10rem; 
+  padding-top: 5%;
+  padding-bottom: 5%; 
   border-radius: 0;
   margin-bottom: 0;
 }
 
address@hidden screen and (max-width: 560px) {
+    .jumbotron {
+        display: none;
+    }
+}
 
+
 .main-icons{
     font-size: 80px;;
 }
@@ -50,11 +56,11 @@
 }
 
 .navbar-nav a{
-    padding: 2.5em;
+    padding: 1.8em;
 }
 
 .navbar-brand{
-    padding: 2em;
+    padding: 1.2em;
 }
 
 .nav-link{
@@ -93,10 +99,16 @@
 .advance-search{
     display: none;
     padding-top: 35px;
+    margin-top: 45px;
 }
 
+#update-search-result{
+    margin-top: 1.5em;
+    background-color: #428bca;
+}
+
 .advance-search-padding{
-    padding-bottom: 6%;
+    padding-bottom: 4%;
 }
 
 .search-button{
@@ -105,6 +117,17 @@
     border-bottom: 2px solid #428bca;
 }
 
+.adv-search-button:hover{
+    cursor: pointer;
+}
+
+.adv-search-button{
+    margin-top: .5em;
+    display: inline-block;
+    float: right;
+}
+
+
 .advance-search ul{
     list-style-type: none;
     padding: 0;
@@ -136,8 +159,13 @@
     width: 70%;
     margin-left: auto;
     margin-right: auto;
-    margin-bottom: 50px;
 }
+
address@hidden screen and (max-width: 800px) {
+    .search-container {
+        width: 100%;
+    }
+}
   
 .details-wrapper{
     margin-top: 3rem;

Modified: trunk/phpgwapi/templates/aalesund/footer.tpl
===================================================================
--- trunk/phpgwapi/templates/aalesund/footer.tpl        2017-12-19 18:12:50 UTC 
(rev 17455)
+++ trunk/phpgwapi/templates/aalesund/footer.tpl        2017-12-19 18:13:26 UTC 
(rev 17456)
@@ -1,6 +1,3 @@
 
-<script type="text/javascript" src="{samplejs}"></script>
-<script type="text/javascript" src="{bootstrapjs}"></script>
-<script type="text/javascript" src="{bootstrapmainjs}"></script>
 </body>
 </html>

Modified: trunk/phpgwapi/templates/aalesund/head.tpl
===================================================================
--- trunk/phpgwapi/templates/aalesund/head.tpl  2017-12-19 18:12:50 UTC (rev 
17455)
+++ trunk/phpgwapi/templates/aalesund/head.tpl  2017-12-19 18:13:26 UTC (rev 
17456)
@@ -15,11 +15,11 @@
         <link href="{stylesheet_uri}" type="text/css" rel="StyleSheet">
         <!-- END stylesheet -->
         <!-- BEGIN javascript -->
-        <script type="text/javascript" src="{javascript_uri}"></script>
+     
         <!-- END javascript -->
         <link rel="stylesheet" type="text/css" 
href="//fonts.googleapis.com/css?family=Raleway" />
-        {css}
 
+
         <script type="text/javascript">
             <!--
                 var strBaseURL = '{str_base_url}';
@@ -27,7 +27,9 @@
         </script>
         
         {javascript}
-        
+        <script type="text/javascript" src="{samplejs}"></script>
+        <script type="text/javascript" src="{bootstrapjs}"></script>
+        <script type="text/javascript" src="{bootstrapmainjs}"></script>
 
         <script type="text/javascript">
         <!--

Modified: trunk/phpgwapi/templates/aalesund/js/sample.js
===================================================================
--- trunk/phpgwapi/templates/aalesund/js/sample.js      2017-12-19 18:12:50 UTC 
(rev 17455)
+++ trunk/phpgwapi/templates/aalesund/js/sample.js      2017-12-19 18:13:26 UTC 
(rev 17456)
@@ -5,18 +5,21 @@
  */
 
 
-$('#adv-search-toggler').click(function () {
-    $('.advance-search').toggle("slide", {direction: "up"}, 800);
-    $("i", this).toggleClass("ion-chevron-down ion-chevron-up");
-    
-    if($("i", this).hasClass("ion-chevron-up")){
-        $('html, body').animate({
-            scrollTop: $(".advance-search").offset().top
-        }, 800);
+$(function toogleAdvSearch() {
 
-    } else if($("i", this).hasClass("ion-chevron-down")){
-        $('html, body').animate({scrollTop: '0px'}, 800);  
-    }
+    var check = 0;
+    $('#adv-search-toggler').click(function () {
+        $('.advance-search').toggle("slide", {direction: "up"}, 800);
+
+        if (check === 0) {
+            check = 1; 
+            $('html, body').animate({scrollTop: 
$("#adv-search-toggler").offset().top }, 800);
+        } else {
+            check = 0;
+            $('html, body').animate({scrollTop: '0px'}, 800);
+        }
+    });
 });
 
 
+