Skip to content

Commit

Permalink
Merge pull request #2043 from thostetler/fix-horizontal-scroll-issue
Browse files Browse the repository at this point in the history
Quick fixes for horizontal scroll bar
  • Loading branch information
ehenneken authored Jun 18, 2020
2 parents c474b88 + 767a9fc commit a1425f1
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions src/js/modules/orcid/widget/templates/container-template.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

<div class="row s-results-control-row-container">
<div class="s-results-control-row-container">


<div class="col-sm-10 col-sm-offset-1" style="padding:0 9%" >
Expand Down Expand Up @@ -49,7 +49,7 @@ <h2>

</div>
</div>
<div class="row s-darker-background">
<div class="row s-darker-background" style="margin-right:0;">
<div class="col-sm-10 s-main-content-container" style="margin-top:20px;padding-top: 20px; float:none">
<div class="row">
<ul class="col-sm-12 results-list s-results-list list-unstyled s-display-block" aria-label="list of results">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="row s-message-control-row" id="message-control-row">
<div class="s-message-control-row" id="message-control-row">
<div data-widget="AlertsWidget"/>
</div>
<div class="row s-darker-background">
<div class="row s-darker-background" style="margin-right:0;"">
<div class="col-sm-12">
<div data-widget="Authentication"/>

Expand Down
2 changes: 1 addition & 1 deletion src/js/page_managers/templates/results-page-layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="row">
<div class="col-xs-12 s-dynamic-page-body" id="dynamic-page-body">
<div class="max-width-wrapper">
<div class="row">
<div>
<div
class="hidden-xs col-sm-3 col-md-2 s-left-column s-results-column"
id="results-left-column"
Expand Down
6 changes: 3 additions & 3 deletions src/js/wraps/abstract_page_manager/abstract-page-layout.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<div id="abstract-page-layout" class="s-abstract-page-layout">

<div class="row s-stable-search-bar-height">
<div class="s-stable-search-bar-height">
<div class="s-search-bar-full-width-container">
<div class="col-xs-0 col-sm-12 col-md-2 s-back-button-container"></div>
<div class="col-xs-12 col-sm-9 col-md-7 s-search-bar-row" id="search-bar-row" data-widget="SearchWidget"></div>
</div>
</div>
<div class="row nav-button-container s-nav-button-container">
<div class="nav-button-container s-nav-button-container">
<button class="btn btn-primary-faded toggle-menu s-toggle-menu "> <i class="fa fa-bars" aria-hidden="true"></i> Show Menu </button>
</div>
<div class="row s-dynamic-page-body" id="dynamic-page-body">
<div class="s-dynamic-page-body" id="dynamic-page-body">
<div class="s-abstract-content">

<div class="col-sm-2 nav-container s-nav-container" id="left-column"> </div>
Expand Down
6 changes: 3 additions & 3 deletions src/js/wraps/home_page_manager/home-page-layout.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<div class="row">
<div>
<div class="col-sm-12">
<div data-widget="UserNavbarWidget" />
</div>
</div>

<div class="nav-button-container s-nav-button-container row">
<div class="nav-button-container s-nav-button-container">
<button class="btn btn-primary-faded toggle-menu s-toggle-menu ">
<i class="fa fa-bars" aria-hidden="true"></i> Show Menu
</button>
</div>

<div class="row s-darker-background">
<div class="row s-darker-background" style="margin-right:0;">
<div class="col-sm-2 nav-container s-nav-container"></div>
<div class="col-sm-10 body-min-height"></div>
</div>
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<div class="row">
<div>
<div class="col-sm-12">
<div data-widget="UserNavbarWidget" />
</div>
</div>

<div class="row nav-button-container s-nav-button-container">
<div class="nav-button-container s-nav-button-container">
<button class="btn btn-primary-faded toggle-menu s-toggle-menu ">
<i class="fa fa-bars" aria-hidden="true"></i> Show Menu
</button>
</div>

<div class="row s-darker-background">
<div class="row s-darker-background" style="margin-right:0;"">
<div class="col-sm-2 nav-container s-nav-container"></div>
<div class="col-sm-10 body-min-height">
<div data-widget="IndividualLibraryWidget" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="row s-darker-background">
<div class="row s-darker-background" style="margin-right:0;"">
<div class="col-sm-12">
<div class="s-public-lib-descriptor">
<h3>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<div class="row">
<div>
<div class="col-sm-12">
<div data-widget="UserNavbarWidget" />
</div>
</div>
<div class="nav-button-container s-nav-button-container row">
<div class="nav-button-container s-nav-button-container">
<button class="btn btn-primary-faded toggle-menu s-toggle-menu ">
<i class="fa fa-bars" aria-hidden="true"></i> Show Menu
</button>
</div>

<div class="row s-darker-background">
<div class="row s-darker-background" style="margin-right:0;"">
<div class="col-sm-2 nav-container s-nav-container"></div>

<div class="col-sm-10">
Expand Down

0 comments on commit a1425f1

Please sign in to comment.