From ccdab5257b19ca0f0eb15d7581d1bcdd7b997460 Mon Sep 17 00:00:00 2001 From: Ezequiel Bergamaschi Date: Sun, 9 Mar 2014 23:41:39 -0300 Subject: [PATCH] css and animation fadeIn --- .../src/main/webapp/css/mindmapList.less | 19 +++++++++++++------ wise-webapp/src/main/webapp/js/mindmapList.js | 6 +++--- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/wise-webapp/src/main/webapp/css/mindmapList.less b/wise-webapp/src/main/webapp/css/mindmapList.less index cbcc41d8..e18b719a 100644 --- a/wise-webapp/src/main/webapp/css/mindmapList.less +++ b/wise-webapp/src/main/webapp/css/mindmapList.less @@ -17,6 +17,11 @@ .nav-pills li { position: relative; width: 90%; + height: 35px; +} +.nav-pills li a { + height: inherit; + font-size: 13px; } .nav-pills { width: 108%; @@ -107,19 +112,21 @@ input#selectAll { width: 100%; } +.dataTables_info { + font-size: 12px; + line-height: 1.428571429; + color: #555; + font-weight: 700; + +} .dataTables_length { display: block; height: 34px; - padding: 6px 12px; - font-size: 14px; + font-size: 12px; line-height: 1.428571429; color: #555; background-color: #fff; background-image: none; - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075); - -webkit-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; - transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; float: right; } diff --git a/wise-webapp/src/main/webapp/js/mindmapList.js b/wise-webapp/src/main/webapp/js/mindmapList.js index bdb27ccc..de5c580a 100644 --- a/wise-webapp/src/main/webapp/js/mindmapList.js +++ b/wise-webapp/src/main/webapp/js/mindmapList.js @@ -185,14 +185,14 @@ function updateStatusToolbar() { $("#mindmapListTable tbody input:checked").parent().parent().addClass('row-selected'); $("#mindmapListTable tbody input:not(:checked)").parent().parent().removeClass('row-selected'); - $('.buttonsToolbar').find('.act-single').hide().end().find('.act-multiple').hide(); + $('.buttonsToolbar').find('.act-single').fadeOut('slow').end().find('.act-multiple').fadeOut('slow'); var tableElem = $('#mindmapListTable'); var selectedRows = tableElem.dataTableExt.getSelectedRows(); if (selectedRows.length > 0) { if (selectedRows.length == 1) { - $('.buttonsToolbar').find('.act-single').show().end().find('.act-multiple').show(); + $('.buttonsToolbar').find('.act-single').fadeIn('slow').end().find('.act-multiple').fadeIn('slow'); // Can be executed by the owner ? var rowData = tableElem.dataTable().fnGetData(selectedRows[0]); @@ -202,7 +202,7 @@ function updateStatusToolbar() { $(".buttonsToolbar").find('#publishBtn').hide().end().find('#shareBtn').hide().end().find('#renameBtn').hide(); } } else { - $(".buttonsToolbar .act-multiple").show(); + $(".buttonsToolbar .act-multiple").fadeIn('slow'); } } }