1
0
Fork 0

Fixed pagination, buttons, a table in documents view and scss-lint warning

This commit is contained in:
Michael Hackstein 2014-03-19 15:30:35 +01:00
parent 3ca5dd163c
commit bcceb5cb5a
11 changed files with 198 additions and 155 deletions

View File

@ -70,13 +70,6 @@
border-spacing:0 5px;
}
#logPaginationDiv a {
border-radius: 0 !important;
}
#logPaginationDiv {
padding-bottom: 5px !important;
}
#logContent .arango-tab {
border-bottom: 0 !important;

View File

@ -38,7 +38,7 @@
return li;
}
function newUL() {
var ul = $('<ul class="arangoPagination"/>'), i;
var ul = $('<ul class="arango-pagination"/>'), i;
ul.append(newLI(options.prev, options.page - 1));
for (i = begin; i <= end; i += 1) { ul.append(newLI(i, i)); }
return ul.append(newLI(options.next, options.page + 1));

View File

@ -289,8 +289,8 @@
</table>
<div id="documentsToolbarFL">
<div id="documentsToolbarF" class="pagination pagination-small pagination-centered">
</div>
<div id="documentsToolbarF" class="pagination-line">
</div>
</div>
<!-- Delete Modal -->

View File

@ -77,7 +77,7 @@
</div>
<div id="logPaginationDiv" class="pagination pagination-small pagination-centered"></div>
</div>
<div id="logPaginationDiv" class="pagination-line">
</div>
</div>
</script>

View File

@ -638,10 +638,10 @@
};
target.pagination(options);
$('#documentsToolbarF').prepend(
'<ul class="prePagi"><li><a id="documents_first" class="paginationButton">'+
'<ul class="pre-pagi"><li><a id="documents_first" class="pagination-button">'+
'<span class="glyphicon glyphicon-step-backward"></span></a></li></ul>');
$('#documentsToolbarF').append(
'<ul class="lasPagi"><li><a id="documents_last" class="paginationButton">'+
'<ul class="las-pagi"><li><a id="documents_last" class="pagination-button">'+
'<span class="glyphicon glyphicon-step-forward"></span></a></li></ul>');
var total = $('#totalDocuments');
if (total.length > 0) {

View File

@ -164,11 +164,11 @@
target.html("");
target.pagination(options);
$('#logPaginationDiv').prepend(
'<ul class="prePagi"><li><a id="logTableID_first" class="paginationButton">'+
'<ul class="pre-pagi"><li><a id="logTableID_first" class="pagination-button">'+
'<span class="glyphicon glyphicon-step-backward"></span></a></li></ul>'
);
$('#logPaginationDiv').append(
'<ul class="lasPagi"><li><a id="logTableID_last" class="paginationButton">'+
'<ul class="las-pagi"><li><a id="logTableID_last" class="pagination-button">'+
'<span class="glyphicon glyphicon-step-forward"></span></a></li></ul>'
);
},

View File

@ -324,8 +324,8 @@ button.gv-zoom-btn {
}
}
a.paginationButton,
ul.arangoPagination a {
a.pagination-button,
ul.arango-pagination a {
@include border-radius(2px);
}

View File

@ -1,4 +1,4 @@
$c-positive: #8aa051;
$c-positive: #8aa051;
$c-positive-hover: #788f3d;
$c-negative: #da4f49;
@ -44,6 +44,7 @@ $c-very-transp: rgba(0, 0, 0, .05);
$c-content-transp: rgba(0, 0, 0, .0675);
$c-scenario-border-transp: rgba(0, 0, 0, .19);
$c-scenario-bg-transp: rgba(0, 0, 0, .075);
$c-arangodb-locked: rgba(0, 0, 0, .5);
$c-content-row-active: #bdcc92;
@ -86,3 +87,6 @@ $c-tab-inactive: #f1f0ee;
$c-tab-active: #fff;
$c-tab-bottom-border: #ddd;
$c-tab-border: #888;
$c-pag-disabled-fg: #666;
$c-pag-disabled-bg: #777;

View File

@ -25,23 +25,23 @@
min-width: auto !important;
th {
padding-top: 5px;
padding-bottom: 5px;
padding-left: 5px;
padding-top: 5px;
}
.icon_arangodb_locked {
color: $c-arangodb-locked;
cursor: default;
font-size: 20px;
margin-left: 10px;
color: rgba(0,0,0,0.5);
cursor: default;
}
.icon_arangodb_roundminus {
@extend %clickable;
@extend %icon-negative;
font-size: 20px;
color: #BE342E;
margin-left: 10px;
cursor: pointer;
}
}
@ -66,21 +66,24 @@
}
}
.docsFirstCol, .docsSecCol, .docsThirdCol {
%docs-col-no-border {
border: 0 !important;
}
.docsFirstCol {
@extend %docs-col-no-border;
width: 70%;
}
.docsSecCol {
@extend %docs-col-no-border;
min-width: 400px !important;
width: 20%;
}
.docsThirdCol {
float: right;
@extend %docs-col-no-border;
@extend %pull-right;
}
.add-filter-item {

View File

@ -5,68 +5,106 @@
opacity: .5 !important;
}
.pagination-mini ul > li.disabled:last-child > a,
.pagination-small ul > li.disabled:last-child > a,
.pagination-mini ul > li.disabled:last-child > span,
.pagination-small ul > li.disabled:last-child > span,
.pagination-mini ul > li.disabled:first-child > a,
.pagination-small ul > li.disabled:first-child > a,
.pagination-mini ul > li.disabled:first-child > span,
.pagination-small ul > li.disabled:first-child > span {
pointer-events: none;
cursor: default;
background-color: #777;
color:#666666;
.pagination-line {
margin: 20px 0;
padding-bottom: 5px;
text-align: center;
%pg-active {
background-color: $c-neutral;
color: $c-white;
}
%pg-inner {
@extend %pull-left;
background-color: $c-white;
border: 1px solid $c-header-btn-bg;
border-left-width: 0;
font-size: 11.9px;
line-height: 20px;
padding: 2px 10px;
text-decoration: none;
}
ul {
@include border-radius(4px);
@include box-shadow(0 1px 2px $c-very-transp);
display: inline-block;
margin-bottom: 0;
margin-left: 0;
}
li {
@extend %clear-float;
display: inline-block;
margin-left: 11px;
a {
@extend %clickable;
@extend %pg-inner;
border-width: 0;
&:hover {
@extend %pg-active;
}
}
span {
color: $c-black;
font-size: 14px;
position: relative;
top: 2px;
}
&:last-child,
&:first-child {
a,
span {
@include box-shadow(0);
background: $c-neutral;
border: 0;
color: $c-black;
height: 20px;
position: relative;
width: 14px;
}
}
&.active {
a,
span {
@extend %pg-active;
}
}
&.disabled {
&:last-child,
&:first-child {
a,
span {
background-color: $c-pag-disabled-bg;
color: $c-pag-disabled-fg;
cursor: default;
pointer-events: none;
}
}
}
}
}
.pagination ul > li > a:hover, .pagination ul > .active > a, .pagination ul > .active > span {
background-color: #8f8d8c;
color:#FFFFFF;
.arango-pagination {
li {
&:first-child {
margin-right: 20px;
}
&:last-child {
margin-left: 30px;
}
}
}
.pagination-mini ul > li:last-child > a, .pagination-small ul > li:last-child > a, .pagination-mini ul > li:last-child > span, .pagination-small ul > li:last-child > span,
.pagination-mini ul > li:first-child > a, .pagination-small ul > li:first-child > a, .pagination-mini ul > li:first-child > span, .pagination-small ul > li:first-child > span {
box-shadow: none;
background: #8f8d8c;
border: none;
color:#FFFFFF;
position:relative;
width:14px;
height:20px;
}
.arangoPagination li:first-child a {
margin-right: 20px !important;
}
.arangoPagination li:last-child a {
margin-left: 30px !important;
}
.pagination ul > li > a, .pagination ul > li > span {
cursor:pointer;
border-width:0 0 0 0px;
}
#documentsToolbarF .prePagi {
.pre-pagi {
margin-right: -5px !important;
}
#documentsToolbarF a,
#logPaginationDiv a {
margin-left: 11px;
}
#documentsToolbarF {
padding-bottom: 5px;
margin-top: 20px;
}
#documentsToolbarF span, #logPaginationDiv span {
position: relative;
top: 2px;
font-size: 14px;
color: black;
}

View File

@ -36,13 +36,13 @@ textarea,
font-style: italic;
font-weight: 700;
src: local("Open Sans Bold Italic"), local("OpenSans-BoldItalic"), url("../fonts/opensans/OpenSansBoldItalic.woff") format("woff"); }
ul.link-dropdown-menu, ul.user-dropdown-menu, ul.gv-dropdown-menu, div.navlogo, ul.navlist li, div.footer-left, a.headerButton, a.button-gui, div.tile, div.bigtile, div.tile a span.add-Icon, div.bigtile a span.add-Icon, div.centralContent, .contentDiv li, div.dropdownInner ul, .fixedDropdown .notificationItemContent, .fixedDropdown .notificationItem i, .innerDropdownInnerUL, .dashboardModal {
ul.link-dropdown-menu, ul.user-dropdown-menu, ul.gv-dropdown-menu, div.navlogo, ul.navlist li, div.footer-left, a.headerButton, a.button-gui, div.tile, div.bigtile, div.tile a span.add-Icon, div.bigtile a span.add-Icon, div.centralContent, .contentDiv li, div.dropdownInner ul, .fixedDropdown .notificationItemContent, .fixedDropdown .notificationItem i, .innerDropdownInnerUL, .dashboardModal, .pagination-line li a {
float: left; }
div.navmenu, div.footer-right, ul.headerButtonList li, div.tile div.iconSet span, div.bigtile div.iconSet span, div.headerBar > div.headerButtonBar, .fixedDropdown button, .query-button, .arango-tab li, .show-save-state {
div.navmenu, div.footer-right, ul.headerButtonList li, div.tile div.iconSet span, div.bigtile div.iconSet span, div.headerBar > div.headerButtonBar, .fixedDropdown button, .query-button, .arango-tab li, .show-save-state, .docsThirdCol {
float: right; }
div.tileList:after, div.resizecontainer:after, div.headerBar > div.headerButtonBar:after, #distributionChartDiv:after, .lineChartDiv:after, .arango-tab:after {
div.tileList:after, div.resizecontainer:after, div.headerBar > div.headerButtonBar:after, #distributionChartDiv:after, .lineChartDiv:after, .arango-tab:after, .pagination-line li:after {
clear: both;
content: '.';
display: block;
@ -50,7 +50,7 @@ div.tileList:after, div.resizecontainer:after, div.headerBar > div.headerButtonB
height: 0;
visibility: hidden; }
.addButton, .deleteButton, a.headerButton, a.button-gui, div.toolbox > div.gv_action_button, .clusterDownBtn button, div.tile a span.icon, div.bigtile a span.icon, div.tile a svg, div.bigtile a svg, div.tile div.iconSet span, div.bigtile div.iconSet span, div.bigtile, .contentDiv .icon, div.headerDropdown.headerDropdown input[type=checkbox].css-checkbox + label.css-label, .search-submit-icon, .fixedDropdown .notificationItem i, .fullNotification:hover, .contentTables tr.contentRowInactive a, .arango-tab a, .arango-tab li {
.addButton, .deleteButton, a.headerButton, a.button-gui, div.toolbox > div.gv_action_button, .clusterDownBtn button, div.tile a span.icon, div.bigtile a span.icon, div.tile a svg, div.bigtile a svg, div.tile div.iconSet span, div.bigtile div.iconSet span, div.bigtile, .contentDiv .icon, div.headerDropdown.headerDropdown input[type=checkbox].css-checkbox + label.css-label, .search-submit-icon, .fixedDropdown .notificationItem i, .fullNotification:hover, .contentTables tr.contentRowInactive a, .arango-tab a, .arango-tab li, .pagination-line li a, .edit-index-table .icon_arangodb_roundminus {
cursor: pointer; }
nav.navbar, footer.footer {
@ -67,9 +67,9 @@ nav.navbar, footer.footer {
.button-danger:hover {
background-color: #be342e; }
.deleteButton, .contentTables td span {
.deleteButton, .contentTables td span, .edit-index-table .icon_arangodb_roundminus {
color: #da4f49; }
.deleteButton:hover, .contentTables td span:hover {
.deleteButton:hover, .contentTables td span:hover, .edit-index-table .icon_arangodb_roundminus:hover {
color: #be342e; }
.button-success {
@ -470,8 +470,8 @@ button.gv-zoom-btn {
button.gv-zoom-btn.pan-bottom {
background-image: url("../img/gv_arrow_bottom.png"); }
a.paginationButton,
ul.arangoPagination a {
a.pagination-button,
ul.arango-pagination a {
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
border-radius: 2px; }
@ -1549,59 +1549,69 @@ div img.searchSubmitIcon {
cursor: default !important;
opacity: .5 !important; }
.pagination-mini ul > li.disabled:last-child > a,
.pagination-small ul > li.disabled:last-child > a,
.pagination-mini ul > li.disabled:last-child > span,
.pagination-small ul > li.disabled:last-child > span,
.pagination-mini ul > li.disabled:first-child > a,
.pagination-small ul > li.disabled:first-child > a,
.pagination-mini ul > li.disabled:first-child > span,
.pagination-small ul > li.disabled:first-child > span {
pointer-events: none;
cursor: default;
background-color: #777;
color: #666666; }
.pagination ul > li > a:hover, .pagination ul > .active > a, .pagination ul > .active > span {
background-color: #8f8d8c;
color: #FFFFFF; }
.pagination-mini ul > li:last-child > a, .pagination-small ul > li:last-child > a, .pagination-mini ul > li:last-child > span, .pagination-small ul > li:last-child > span,
.pagination-mini ul > li:first-child > a, .pagination-small ul > li:first-child > a, .pagination-mini ul > li:first-child > span, .pagination-small ul > li:first-child > span {
box-shadow: none;
background: #8f8d8c;
border: none;
color: #FFFFFF;
position: relative;
width: 14px;
height: 20px; }
.arangoPagination li:first-child a {
margin-right: 20px !important; }
.arangoPagination li:last-child a {
margin-left: 30px !important; }
.pagination ul > li > a, .pagination ul > li > span {
cursor: pointer;
border-width: 0 0 0 0px; }
#documentsToolbarF .prePagi {
margin-right: -5px !important; }
#documentsToolbarF a,
#logPaginationDiv a {
margin-left: 11px; }
#documentsToolbarF {
.pagination-line {
margin: 20px 0;
padding-bottom: 5px;
margin-top: 20px; }
text-align: center; }
.pagination-line li a:hover, .pagination-line li.active a,
.pagination-line li.active span {
background-color: #8f8d8c;
color: white; }
.pagination-line li a {
background-color: white;
border: 1px solid #dddddd;
border-left-width: 0;
font-size: 11.9px;
line-height: 20px;
padding: 2px 10px;
text-decoration: none; }
.pagination-line ul {
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
display: inline-block;
margin-bottom: 0;
margin-left: 0; }
.pagination-line li {
display: inline-block;
margin-left: 11px; }
.pagination-line li a {
border-width: 0; }
.pagination-line li span {
color: black;
font-size: 14px;
position: relative;
top: 2px; }
.pagination-line li:last-child a,
.pagination-line li:last-child span, .pagination-line li:first-child a,
.pagination-line li:first-child span {
-webkit-box-shadow: 0;
-moz-box-shadow: 0;
box-shadow: 0;
background: #8f8d8c;
border: 0;
color: black;
height: 20px;
position: relative;
width: 14px; }
.pagination-line li.disabled:last-child a,
.pagination-line li.disabled:last-child span, .pagination-line li.disabled:first-child a,
.pagination-line li.disabled:first-child span {
background-color: #777777;
color: #666666;
cursor: default;
pointer-events: none; }
#documentsToolbarF span, #logPaginationDiv span {
position: relative;
top: 2px;
font-size: 14px;
color: black; }
.arango-pagination li:first-child {
margin-right: 20px; }
.arango-pagination li:last-child {
margin-left: 30px; }
.pre-pagi {
margin-right: -5px !important; }
table.dataTable thead th {
font-weight: 400 !important;
@ -1656,19 +1666,17 @@ table.dataTable thead th {
margin-top: 5px;
min-width: auto !important; }
.edit-index-table th {
padding-top: 5px;
padding-bottom: 5px;
padding-left: 5px; }
padding-left: 5px;
padding-top: 5px; }
.edit-index-table .icon_arangodb_locked {
font-size: 20px;
margin-left: 10px;
color: rgba(0, 0, 0, 0.5);
cursor: default; }
cursor: default;
font-size: 20px;
margin-left: 10px; }
.edit-index-table .icon_arangodb_roundminus {
font-size: 20px;
color: #BE342E;
margin-left: 10px;
cursor: pointer; }
margin-left: 10px; }
.contentIn > div {
padding: 10px; }
@ -1692,9 +1700,6 @@ table.dataTable thead th {
min-width: 400px !important;
width: 20%; }
.docsThirdCol {
float: right; }
.add-filter-item {
margin-left: 5px; }
.add-filter-item i {