Skip to content
This repository has been archived by the owner on Feb 23, 2018. It is now read-only.

Commit

Permalink
irods-contrib#45 fix width issue with browser rendering
Browse files Browse the repository at this point in the history
  • Loading branch information
@michael-conway
michael-conway committed Nov 30, 2017
1 parent b5c4177 commit 66444cd
Show file tree
Hide file tree
Showing 6 changed files with 80 additions and 76 deletions.
73 changes: 36 additions & 37 deletions src/emc-metalnx-shared/src/main/resources/static/css/styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ body {

.panel-primary .panel-heading {
border-color: #2c95dd;
background-color: #2c95dd;
background-color: #2c95dd;
}

.panel-success {
Expand All @@ -112,16 +112,16 @@ body {
.panel-warning .panel-heading {
border-color: #FECC66;
background-color: #FECC66;
color: #ffffff;
color: #ffffff;
}

.panel-error {
.panel-error {
border-color: #CC6666;
}

.panel-error .panel-heading {
background-color: #CC6666;
color: #ffffff;
color: #ffffff;
}

.gray-bg {
Expand All @@ -139,11 +139,11 @@ body {

.templates i {
/* color: #ffffff; */
font-size: inherit;
font-size: inherit;
}

table {
table-layout: fixed;
table-layout: fixed;
}

table td{
Expand Down Expand Up @@ -340,7 +340,7 @@ h3.collection-details
-o-transition: left 0.15s ease-out;
transition: left 0.15s ease-out;
}


/************************************* Server Details *********************************************/
.list #resourcesByServerList ul a {
Expand Down Expand Up @@ -428,7 +428,7 @@ h3.collection-details
table-layout: auto;
}

#resourcesByServerList .resourcesTableWrapper table tbody tr td{
#resourcesByServerList .resourcesTableWrapper table tbody tr td{
border-top: 1px dotted #ccc;
line-height: 2.5em;
}
Expand All @@ -439,7 +439,7 @@ h3.collection-details
width: 1%;
padding-right: 20px;
}
#resourcesByServerList .resourcesTableWrapper table > tbody > tr span,
#resourcesByServerList .resourcesTableWrapper table > tbody > tr span,
#resourcesByServerList .resourcesTableWrapper table > thead > tr > th span{
padding: 5px 5px 5px 20px;
}
Expand Down Expand Up @@ -471,7 +471,7 @@ h3.collection-details

#resourceMapPanel {
max-width: 100%;
max-height: 50em;
max-height: 50em;
overflow: auto;
padding: 0;
margin-top: 1%;
Expand Down Expand Up @@ -703,8 +703,8 @@ div.dataTables_wrapper .toolbar .input-group{
}

#templateFieldsList .requiredHeaderSpan{
font-size:10px;
font-weight: normal;
font-size:10px;
font-weight: normal;
margin-left: 5px;
}

Expand Down Expand Up @@ -737,7 +737,7 @@ div.dataTables_wrapper .toolbar .input-group{

#actions .btn-group a:FIRST-CHILD{
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-bottom-right-radius: 0;
}

#actions .btn-group ul li.divider {
Expand Down Expand Up @@ -1152,7 +1152,7 @@ ul{

a.page-hint {
font-size:1.3em;
margin-top:30px;
margin-top:30px;
}

.property{
Expand Down Expand Up @@ -1336,7 +1336,7 @@ alert-dialog {
margin-bottom: 10px;
}

.alert-dismissable .close,
.alert-dismissable .close,
.alert-dismissible .close
{
position: relative;
Expand Down Expand Up @@ -1370,7 +1370,7 @@ alert-dialog {

.scrollable-modal-body {
max-height: 300px;
overflow: auto;
overflow: auto;
}
.modal .modal-header{
background-color: #428bca;
Expand Down Expand Up @@ -1433,8 +1433,7 @@ alert-dialog {
}

#wrapper {
width: 1026px;
margin: 0 auto;
width: 100%;
}

#page-wrapper, #page-wrapper-tickets {
Expand Down Expand Up @@ -1489,8 +1488,8 @@ i.fa-user.menu-icon{
top:-1;
}

ul.navbar-top-links > li.dropdown > .dropdown-toggle:hover,
ul.navbar-top-links > li.dropdown > .dropdown-toggle:focus,
ul.navbar-top-links > li.dropdown > .dropdown-toggle:hover,
ul.navbar-top-links > li.dropdown > .dropdown-toggle:focus,
ul.navbar-top-links > li.open > a.dropdown-toggle{
background-color: #2c95dd;
box-shadow: inset 0 3px 10px rgba(0,0,0,.125);
Expand Down Expand Up @@ -1623,7 +1622,7 @@ ul.navbar-top-links > li.open > a.dropdown-toggle{
bottom: -6px;
}

.navbar-default .navbar-toggle:hover,
.navbar-default .navbar-toggle:hover,
.navbar-default .navbar-toggle:focus {
background-color: #2786c6;
}
Expand All @@ -1643,7 +1642,7 @@ button.btn-primary > i,
a.btn-primary > i {
margin-right: 3px;
}

.user-panel {
padding: 5%;
padding-left: 5%;
Expand All @@ -1658,7 +1657,7 @@ a.btn-primary > i {
}

.img-circle {
border-radius: 65%;
border-radius: 65%;
}

.user-panel p {
Expand Down Expand Up @@ -1735,10 +1734,10 @@ a.btn-primary > i {
background-color: #f2f6f9;;
}

.modal .nav-tabs > li.active > a,
.modal .nav-tabs > li.active > a:hover,
.modal .nav-tabs > li.active > a:focus,
.modal .nav > li > a:hover,
.modal .nav-tabs > li.active > a,
.modal .nav-tabs > li.active > a:hover,
.modal .nav-tabs > li.active > a:focus,
.modal .nav > li > a:hover,
.modal .nav > li > a:focus{
background-color: #f2f6f9;
border: 1px solid #f2f6f9;
Expand All @@ -1747,7 +1746,7 @@ a.btn-primary > i {
border-bottom: 1px hidden #DDD;
}
.modal-footer .targetPathInfoDiv{
margin-bottom: 10px;
margin-bottom: 10px;
}
.modal-footer .targetPathInfoSpan{
font-weight: bold;
Expand All @@ -1766,9 +1765,9 @@ a.btn-primary > i {
}

footer {
text-align: center;
font-size:12px;
width: 100%;
text-align: center;
font-size:12px;
width: 100%;
color: #777;
margin-top: -20px;
}
Expand Down Expand Up @@ -1901,8 +1900,8 @@ footer {
width: 100%;
table-layout: auto;
}
#serverListPanel .dashboardServersList > tbody > tr > td,
#isilonServerListPanel .table tbody > tr > td,
#serverListPanel .dashboardServersList > tbody > tr > td,
#isilonServerListPanel .table tbody > tr > td,
#nonResourceServerListPanel .table tbody > tr > td{
padding: 8px;
border-top: 1px dotted #C8DFF7;
Expand Down Expand Up @@ -2055,7 +2054,7 @@ form.registerForm .bootstrap-tagsinput {
}

@media ( min-width : 769px) and (max-width: 1000px) {

#treeViewTable {
float: left;
}
Expand Down Expand Up @@ -2161,7 +2160,7 @@ form.registerForm .bootstrap-tagsinput {
{
font-size:40px;
}

.sidebar ul li a {
border-top-style: none;
text-align: center;
Expand All @@ -2182,7 +2181,7 @@ form.registerForm .bootstrap-tagsinput {
text-align: center;
font-family: Verdana, Geneva, sans-serif;
}

.navbar-top-links .dropdown-messages, .navbar-top-links .dropdown-tasks,
.navbar-top-links .dropdown-alerts {
margin-left: auto;
Expand Down Expand Up @@ -2318,4 +2317,4 @@ form.registerForm .bootstrap-tagsinput {
}
#existingIpIcon{
left: 360px;
}
}
32 changes: 16 additions & 16 deletions src/emc-metalnx-shared/src/main/resources/views/bookmarks/userBookmarks.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h1 class="page-header pull-left">
<span th:text="#{bookmarks.page.title}"></span>
</h1>
<span th:text="#{bookmarks.page.subtitle}" class="subtitle"></span>
<a id="bookmarks-page-title" href="#" class="page-hint pull-right"><i class="fa fa-question-circle"></i></a>
<a id="bookmarks-page-title" href="#" class="page-hint pull-left"><i class="fa fa-question-circle"></i></a>
</div>
<div class="col-sm-12 btn-shared">
<a th:href="@{ ${urlMap.URL_GROUPS_BOOKMARKS} }" class="btn btn-default btn-sm" style="margin-right: 5px;">
Expand All @@ -48,8 +48,8 @@ <h1 class="page-header pull-left">
&nbsp; <span th:text="#{collections.management.shared.links.list.by.user}"></span>
</a>
</div>
<div class="col-sm-12 table-responsive">

<div class="col-sm-12 table-responsive">
<table class="table table-hover" id="userBookmarksTable">
<thead>
<tr>
Expand All @@ -61,14 +61,14 @@ <h1 class="page-header pull-left">
</thead>
</table>
</div>

<!-- <div class="col-sm-12 table-responsive" th:unless="${foundUserBookmarks}">
<div class="text-center" role="alert">
<span th:text="#{shareditems.empty.table}"></span>
</div>
</div>
</div> -->
</div>

<script th:inline="javascript">
/*<![CDATA[*/
$(document).ready(function(){
Expand All @@ -79,7 +79,7 @@ <h1 class="page-header pull-left">
trigger: 'hover click',
placement: 'left',
});
});
});
var datatable;
datatable = $('#userBookmarksTable').DataTable( {
"serverSide": true,
Expand Down Expand Up @@ -113,20 +113,20 @@ <h1 class="page-header pull-left">
"targets": 0
},
{
"data": "path",
"width": "40%",
"data": "path",
"width": "40%",
"targets": 1
},
{
"data": "createTsFormatted",
"width": "15%",
"data": "createTsFormatted",
"width": "15%",
"targets": 2
},
{
"render": function (data, type, full, meta){
return full.isCollection?[[#{collections.management.table.kind.collection}]]:[[#{collections.management.table.kind.dataobject}]];
},
"width": "15%",
"width": "15%",
"targets": 3
},
]
Expand All @@ -136,16 +136,16 @@ <h1 class="page-header pull-left">
var url = "/emc-metalnx-web/collections/redirectFromUserBookmarksToCollections/";
ajaxEncapsulation(url, "POST", {path: path}, showCollections, null, null, null);
}

function showCollections() {
window.location = "/emc-metalnx-web/collections/";

}
/*]]>*/
</script>

</div> <!-- /. Page Content -->

</body>

</html>
</html>
2 changes: 1 addition & 1 deletion src/emc-metalnx-shared/src/main/resources/views/favorites/favorites.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<h1 class="page-header pull-left">
<span th:text="#{favorites.page.title}"></span>
</h1>
<a id="favorite-page-title" href="#" class="page-hint pull-right"><i class="fa fa-question-circle"></i></a>
<a id="favorite-page-title" href="#" class="page-hint pull-left"><i class="fa fa-question-circle"></i></a>
</div>

<div class="col-sm-12 hideElement" id="unfavFailMsg">
Expand Down
Loading

0 comments on commit 66444cd

Please sign in to comment.