diff --git a/internewshid/hid/templates/hid/tabs/dynamic_filters.html b/internewshid/hid/templates/hid/tabs/dynamic_filters.html index 020c11f4f3b5647dc1e2110ee193911bdeca40ae..5df0647095cf61e8878f4f18733fc99118cc3bc8 100644 --- a/internewshid/hid/templates/hid/tabs/dynamic_filters.html +++ b/internewshid/hid/templates/hid/tabs/dynamic_filters.html @@ -6,9 +6,9 @@ {% include filter_template %} {% endwith %} {% endfor %} - <div class="filter-apply filter-clear form-group input-group "> - {% bootstrap_button 'Apply filters' name="button-apply" value="apply" button_class="btn btn-default btn-md" %} - {% bootstrap_button 'Clear filters' name="button-clear" value="clear" button_class="btn btn-default btn-md" %} + <div class="form-group input-group "> + {% bootstrap_button 'Apply filters' name="button-apply" value="apply" button_class="btn btn-default btn-md filter-apply" %} + {% bootstrap_button 'Clear filters' name="button-clear" value="clear" button_class="btn btn-default btn-md filter-clear" %} </div> </div> </form> diff --git a/internewshid/hid/templates/hid/tabs/filters/tags.html b/internewshid/hid/templates/hid/tabs/filters/tags.html index eff67b78486a2f2174e28f8059281513d2973969..d3b63cdbc9df30f6dcb5d73b1c535137bdc157f4 100644 --- a/internewshid/hid/templates/hid/tabs/filters/tags.html +++ b/internewshid/hid/templates/hid/tabs/filters/tags.html @@ -1,7 +1,7 @@ {% load i18n %} <div class="filter-tags form-group input-group"> <label class="col-sm-3 control-label" for="tags-selector">{% trans "Tags" %}</label> - <div class="text-container"> - <input style="width:140px;" type="text" placeholder="All Tags" name="tags"> + <div class="text-container "> + <input class="form-control" type="text" placeholder="All Tags" name="tags"> </div> </div> diff --git a/internewshid/media/less/spinner.less b/internewshid/media/less/spinner.less index deb637931a7aeca2da553e9c8804714bb4ca1b5f..1e527624a3dee9e024eb0a9b7ad0e7772518ed93 100644 --- a/internewshid/media/less/spinner.less +++ b/internewshid/media/less/spinner.less @@ -1,5 +1,8 @@ //loading spinner +.spinner:before{ + position: relative; +} .spinner { bottom: 0; height: 25px; diff --git a/internewshid/media/less/view-edit.less b/internewshid/media/less/view-edit.less index 15886eaaa8cc448a19789937b62aeed7d9da2b3b..2bb0b7c8636adadbedf51175b0f3bf77785782c6 100644 --- a/internewshid/media/less/view-edit.less +++ b/internewshid/media/less/view-edit.less @@ -15,8 +15,8 @@ display: flex; flex-direction: row; border-right: solid 1px @gray-lighter; - padding-right: 2%; - margin-right: 2%; + padding-right: 1%; + margin-right: 1%; align-items: baseline; @@ -24,7 +24,7 @@ font-size: @font-size-small; font-weight: bold; text-transform: uppercase; - margin-right: 8%; + margin-right: 5%; } // input & selects .form-control{ @@ -45,25 +45,41 @@ border-right: none; } } - .filter-apply{ - button{ + button{ + line-height: 1.8; + padding: .4rem 1.2rem; + border-radius: 6px; + white-space: nowrap; + margin-right: 1rem; + font-size: 88%; + transition: border 0.25s ease; + + &.filter-apply{ + border: solid 1px @brand-primary; background-color: @brand-primary; color: #fff; - line-height: 1.8; - padding: .4rem 1rem; - border-radius: @border-radius-large; - border: solid 1px @brand-primary; - white-space: nowrap; - + &:hover, + &:focus + { + border: solid 1px @brand-primary; + background-color: darken(@brand-primary, 10%); + } + } + + &.filter-clear{ + color: @gray-base; + border-color: transparent; + background-color: transparent; + &:hover, + &:focus + { + border: solid 1px @brand-primary; + color: @brand-primary; + } } } } -.filter-clear { - button { - margin-right: 10px; - } -} .filter-location{ label{ @@ -152,17 +168,28 @@ thead{ tbody { font-size: @font-size-small; } +.table-hover { + > tbody > tr { + background-color: #fff; + box-shadow: inset 0 0 2px rgba(178, 178, 178, 0.7); + &:hover{ + box-shadow: inset 0 0 2px @brand-primary; + } + } +} + + .table-striped > tbody > tr.selected.odd, .table-striped > tbody > tr.selected.even{ background-color: #e3edf8; - // border: solid 1px @brand-secondary; + box-shadow: inset 0 0 2px @brand-secondary; transition: background-color 0.25s ease; } .table-striped > tbody > tr.selected.odd:hover, .table-striped > tbody > tr.selected.even:hover{ - background-color: darken(#e3edf8, 10%); + box-shadow: inset 0 0 2px @brand-primary; } @@ -240,8 +267,11 @@ td.created, td.timestamp { } .messages-box { - margin: 0 -30px; - position: relative; + margin: 0 -30px; + position: fixed; + width: 100%; + z-index: 5; + top: 0; } @media(max-width:@screen-sm){