Skip to content

Commit

Permalink
Merge 433dc50 into f41f38b
Browse files Browse the repository at this point in the history
  • Loading branch information
@shinyichen
shinyichen committed Mar 16, 2021
2 parents f41f38b + 433dc50 commit a078ef2
Show file tree
Hide file tree
Showing 9 changed files with 95 additions and 53 deletions.
6 changes: 3 additions & 3 deletions src/js/page_managers/templates/results-control-row.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
</div>


<div class="col-sm-6" style="padding-right:0">
<div class="col-xs-12 col-sm-6" style="padding-right:0">
<div class="s-results-action-buttons">
<div class="col-md-6 clearfix" style="margin-bottom:10px;">
<div class="col-xs-12 col-md-5 clearfix" style="margin-bottom:10px;">
<div data-widget="Sort" class="s-display-inline-block pull-right"/>
</div>
<div class="col-md-6">
<div class="col-xs-12 col-md-7">
<div data-widget="VisualizationDropdown" class="s-display-inline-block pull-right"/>
<div data-widget="ExportDropdown" class="s-display-inline-block pull-right"/>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/js/widgets/list_of_things/templates/item-template.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</div>

<div class="hidden-sm hidden-md hidden-lg">
<div class="col-xs-3 col-sm-5 col-md-3 s-top-row-col text-right">
<div class="col-xs-2 col-sm-5 col-md-3 s-top-row-col text-right">
{{#if citation_count }}
{{#if normCiteSort}}
<a href="#abs/{{encodedIdentifier}}/citations" title="citation count" class="citations-redirect-link" aria-label="{{citationCountNorm}} normalized citations"><span class="hidden-xs">cited (n):</span> {{citationCountNorm}}</a>
Expand All @@ -44,7 +44,7 @@



<div class="col-xs-4 col-sm-4 pull-right">
<div class="col-xs-5 col-sm-4 pull-right">
<div class="s-results-links">

{{#if links}}
Expand Down
6 changes: 3 additions & 3 deletions src/js/widgets/list_of_things/templates/pagination-partial.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<div class="col-xs-5 per-page-container">
{{#if pageData}}
<div class="form-group">
<label for="per-page-select" class="col-xs-4 control-label" style="line-height: 32px;">Per Page</label>
<div class="col-xs-8 col-sm-5">
<label for="per-page-select" class="col-xs-6 control-label" style="line-height: 32px; text-align: right;">Per Page</label>
<div class="col-xs-6 col-sm-5">
<select name="per-page-select" id="per-page-select" class="form-control">
<option value="25" {{#compare pageData.perPage 25}}selected{{/compare}}>25</option>
<option value="50" {{#compare pageData.perPage 50}}selected{{/compare}}>50</option>
Expand All @@ -26,7 +26,7 @@
</div>
{{/if}}
</div>
<div class="col-xs-6">
<div class="col-xs-7 pagination-container">
<nav aria-label="pagination controls">
<ul class="pager">
<li class="{{#unless pageData.previousPossible}} disabled {{/unless}}"><a href="javascript:void(0)" class="page-control previous-page"><i class="fa fa-chevron-circle-left" aria-hidden="true"></i> prev</a></li>
Expand Down
72 changes: 35 additions & 37 deletions src/js/widgets/results/templates/container-template.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,43 +14,41 @@
{{/unless}}
</div>

<div class="col-xs-11">
<div class="s-show-details-container">
{{#unless loading}} {{#if showHighlights}} {{#compare showHighlights
"open"}}
<button class="btn btn-primary btn-sm show-highlights">
Hide highlights
</button>
{{else}}
<button class="btn btn-primary btn-sm btn-inverse show-highlights">
Show highlights
</button>
{{/compare}} {{/if}} {{#compare showAbstract "open"}}
<button class="btn show-abstract btn-sm btn-primary">
Hide abstracts
</button>
{{else}}
<button class="btn show-abstract btn-sm btn-inverse btn-primary">
Show abstracts
</button>
{{/compare}} {{#if showSidebars}}
<button
class="btn btn-sm btn-inverse btn-primary toggle-sidebars hidden-xs hidden-sm"
>
Hide Sidebars
</button>
{{else}}
<button
class="btn btn-sm btn-primary toggle-sidebars hidden-xs hidden-sm"
>
Show Sidebars
</button>
{{/if}}
<button class="btn-sm btn-link pull-right" id="go-to-bottom">
Go To Bottom
</button>
{{/unless}}
</div>
<div class="col-xs-11 s-show-details-container">
{{#unless loading}} {{#if showHighlights}} {{#compare showHighlights
"open"}}
<button class="btn btn-primary btn-sm show-highlights">
Hide highlights
</button>
{{else}}
<button class="btn btn-primary btn-sm btn-inverse show-highlights">
Show highlights
</button>
{{/compare}} {{/if}} {{#compare showAbstract "open"}}
<button class="btn show-abstract btn-sm btn-primary">
Hide abstracts
</button>
{{else}}
<button class="btn show-abstract btn-sm btn-inverse btn-primary">
Show abstracts
</button>
{{/compare}} {{#if showSidebars}}
<button
class="btn btn-sm btn-inverse btn-primary toggle-sidebars hidden-xs hidden-sm"
>
Hide Sidebars
</button>
{{else}}
<button
class="btn btn-sm btn-primary toggle-sidebars hidden-xs hidden-sm"
>
Show Sidebars
</button>
{{/if}}
<button class="btn-sm btn-link pull-right" id="go-to-bottom">
Go To Bottom
</button>
{{/unless}}
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/js/widgets/sort/components/sort-app.jsx.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ define(['react', 'prop-types'], function(React, PropTypes) {
>
{sort.text} <span className="caret" aria-hidden="true" />
</button>
<ul className="dropdown-menu" role="menu">
<ul className="dropdown-menu pull-right" role="menu">
{options.map((o) => (
<li key={o.id}>
<a
Expand Down
2 changes: 1 addition & 1 deletion src/js/wraps/export_dropdown.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ define([
var btnType = 'btn-primary-faded';
var dropdownTitle = 'Export';
var iconClass = 'icon-export';
var rightAlign = true;
var rightAlign = false;
var selectedOption = true;

return function() {
Expand Down
4 changes: 4 additions & 0 deletions src/styles/sass/ads-sass/page-managers.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@ s-search-bar-motion is applied */
.s-dynamic-page-body {
background-color: $darker-background;
min-height: 500px;
@media screen and (max-width: $screen-md-max) {
padding-left: 0;
padding-right: 0;
}
}

.s-abstract-content {
Expand Down
48 changes: 45 additions & 3 deletions src/styles/sass/ads-sass/results-list.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,14 @@
@extend .icon-text;
}

.s-identifier a {
color: $text-color;
.s-identifier {
overflow: hidden;
text-overflow: ellipsis;
padding-left: 0;
padding-right: 0;
a {
color: $text-color;
}
}

.just-authors {
Expand All @@ -82,10 +88,16 @@
.s-citation-link {
color: $brand-primary;
}

@media screen and (max-width: $screen-sm-max) {
margin-left: 0;
margin-right: 0;
}
}

.s-show-details-container {
margin-top: 20px;
padding-left: 0;
}

.s-results-title {
Expand Down Expand Up @@ -251,12 +263,22 @@ li.article-author {
border-bottom: $border-light-default;
@extend .clearfix;
padding-bottom: 15px;

@media screen and (max-width: $screen-md-min) {
padding-left: 2%;
border-left: 5px solid #fff;
}
}

.s-back-button-container {
height: 86px;
padding-top: 37px;
padding-left: 2em;

@media screen and (max-width: $screen-sm) {
height: auto;
padding: 10px 0 10px 10px;
}
}

// get rid of top padding when the search bar is in scroll mode
Expand Down Expand Up @@ -346,12 +368,32 @@ li.article-author {
}

.per-page-container {
margin: 23px 0 0 6.3%;
margin: 23px 0 0 0;
padding-left: 0px;

@media screen and (max-width: $screen-xs) {
width: 100%;
margin: 10px 0 0 0;
padding: 0 0 0 0;
}
}

#per-page-select {
width: auto;
}

.per-page--active {
font-weight: bold;
background-color: $brand-primary;
color: white;
}

.pagination-container {
padding-right: 0;
padding-left: 0;

@media screen and (max-width: $screen-xs) {
width: 100%;
margin: 0 0 0 0;
}
}
4 changes: 1 addition & 3 deletions src/styles/sass/ads-sass/search-bar.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,7 @@
}

.s-num-found {
position: absolute;
left: 2%;
top: 88px;
padding-left: 2%;
font-size: 16px;
display: none;
}
Expand Down

0 comments on commit a078ef2

Please sign in to comment.