Commit 54e238d4 authored by Lukasz Waskiewicz's avatar Lukasz Waskiewicz
Browse files

refs #1453 korekty GUI

parent d266b718
.table-condensed {
font-size: $size12;
font-size: $size12;
}
.table-condensed.recent-query {
font-size: $size14;
font-size: $size14;
}
.resultsContainer {
tbody {
tr.selected, tr.selected:active, tr.selected:hover {
background: lighten($purple, 40%);
}
}
}
.sample-queries {
.panel-body {
font: {
size: $size12;
}
overflow: auto;
}
ul {
margin: 0 0 10px;
padding: 0;
style-list: none;
li {
cursor: pointer;
display: block;
p {
color: $bsBlue;
display: inline-block;
margin: 3px 0;
&:hover, &:focus {
text-decoration: underline;
}
}
}
}
tbody {
tr.selected, tr.selected:active, tr.selected:hover {
background: lighten($purple, 40%);
}
}
}
#resultsDataWrapper{
......
......@@ -5,24 +5,24 @@
.recent-query {
.column-status {
width: 125px;
button{
max-width:120px;
}
}
.column-id {
width: 60px;
}
.column-added {
width: 180px;
}
.column-actions {
width: 150px;
}
}
width: 125px;
button{
max-width:120px;
}
}
.column-id {
width: 60px;
}
.column-queryAddDate {
width: 180px;
}
.column-actions {
width: 150px;
}
}
}
......@@ -30,5 +30,4 @@
.column-id, .column-description {
display: none;
}
}
......@@ -17,7 +17,7 @@
width: 60px;
}
.column-added {
.column-queryAddDate {
width: 180px;
}
......@@ -39,6 +39,9 @@
.column-id, .column-executionTime {
display: none;
}
#queuePaginationWrapper .list-actions{
display: none;
}
}
......@@ -46,6 +49,42 @@
.column-query {
max-width:150px;
}
#streamQuery{
display: none;
}
}
@media (max-width: 570px) {
.column-queryAddDate {
display: none;
}
}
@media (min-width: 768px) {
.sqlWrapper{
display:table;
width:100%;
height: 100%;
box-sizing: border-box;
}
.sqlRow {
display: table-row;
}
.sqlRow .no-float {
display: table-cell;
float: none;
height: 100%;
padding-bottom: 40px;
}
.sqlRow .no-float.mainPanel .panel{
}
.sqlRow .no-float .panel{
height: 100%;
margin-bottom: 0px;
}
}
.resultsContainer {
......
......@@ -61,13 +61,6 @@ SqlInputWidget = {
window.editor.on("changes", SqlInputWidget.editorValueChange);
window.editor.on("changes", function() {
$("#sample-queries").height($("#queryExecute").height());
});
setTimeout(function() {
$("#sample-queries").height($("#queryExecute").height());
}, 0);
},
triggerSubmit : function() {
......
......@@ -9,8 +9,8 @@
<th:block layout:fragment="notificationControlWrapperFragment">
<th:block sec:authorize="hasRole('ROLE_USER')">
<div id="notificationControlWrapper" class="checkbox-inline">
<label for="userNotification" th:text="#{cocos.portal.simulationsPages.queries.userNotify}" class="pull-left no-error">Label</label> <input
id="userNotification" type="checkbox" class="pull-right col-md-1" />
<label for="userNotification" th:text="#{cocos.portal.simulationsPages.queries.userNotify}" class="pull-left no-error">Label</label>
<input id="userNotification" type="checkbox" class="pull-right col-md-1" />
</div>
</th:block>
</th:block>
......
......@@ -80,8 +80,12 @@ WebSocketConnector.addWebSocketConnectionEntry('/user/topic/queryResults/' + sim
<body>
<div layout:fragment="body" >
<div th:replace="simulation/querySubmit.xhtml :: submitForm" />
<div th:replace="simulation/sampleQueries.xhtml :: sampleQueries" />
<div class="sqlWrapper">
<div class="sqlRow">
<div th:replace="simulation/querySubmit.xhtml :: submitForm" />
<div th:replace="simulation/sampleQueries.xhtml :: sampleQueries" />
</div>
</div>
<div th:replace="simulation/queryResults.xhtml :: queryResults" />
</div>
......
......@@ -6,7 +6,7 @@
xmlns:sec="http://www.thymeleaf.org/extras/spring-security">
<body>
<div th:fragment="submitForm" class="col-md-9 col-sm-12">
<div th:fragment="submitForm" class="col-sm-9 col-xs-12 no-float mainPanel">
<div class="panel panel-default ">
<div class="panel-heading">
<span th:text="#{cocos.portal.simulationsPages.queries.query.execute}">Panel title</span>
......
......@@ -6,7 +6,7 @@
xmlns:sec="http://www.thymeleaf.org/extras/spring-security">
<body>
<div th:fragment="sampleQueries" class="col-md-3 col-sm-12">
<div th:fragment="sampleQueries" class="col-sm-3 col-xs-12 no-float">
<div class="panel panel-default sample-queries" id="sampleQueries">
<div class="panel-heading" th:text="#{cocos.portal.simulationsPages.queries.sampleQueries}">Panel title</div>
<div id="sample-queries" class="panel-body">
......
......@@ -198,7 +198,7 @@
</th:block>
<th:block th:if="${column == 'queryAddDate'}">
<th:block layout:replace="utils/sorting.xhtml :: tableColumnWrapper (label='cocos.portal.simulationsPages.queries.queue.columns.date.added', className='column-added')">
<th:block layout:replace="utils/sorting.xhtml :: tableColumnWrapper (label='cocos.portal.simulationsPages.queries.queue.columns.date.added', className='column-queryAddDate')">
<th:block layout:fragment="nestedContent" layout:include="utils/sorting.xhtml:: sortComponent('queryAddDate')" />
</th:block>
</th:block>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment