Revert "Fix app size to make scrollbars visible"

This reverts commit a7b89441bd.

Reason for revert: Got a better idea for app layout, will send follow-up change.

Change-Id: I7b7c86288fb070114e76dd68701e05c539089eab
This commit is contained in:
Viktar Donich
2016-10-24 20:53:30 +00:00
parent a7b89441bd
commit cc6b8300d1
4 changed files with 83 additions and 95 deletions

View File

@@ -138,7 +138,6 @@ limitations under the License.
box-shadow: 0 1px 3px rgba(0, 0, 0, .3); box-shadow: 0 1px 3px rgba(0, 0, 0, .3);
display: block; display: block;
margin: .25em 0 1em; margin: .25em 0 1em;
overflow: auto;
} }
@media screen and (max-width: 50em) { @media screen and (max-width: 50em) {
.row[selected] { .row[selected] {

View File

@@ -31,26 +31,17 @@ limitations under the License.
<style> <style>
:host { :host {
background-color: var(--view-background-color); background-color: var(--view-background-color);
display: flex; display: block;
flex-direction: column;
height: 100%;
} }
.titleHeader, header,
.patchRangeHeader { .subHeader {
align-items: center; align-items: center;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.titleHeader { header {
padding: .75em var(--default-horizontal-margin); padding: .75em var(--default-horizontal-margin);
} }
.patchRangeHeader {
margin: 0 var(--default-horizontal-margin) .75em;
}
#diff {
flex: 1;
overflow: auto;
}
.navLink:not([href]) { .navLink:not([href]) {
color: #999; color: #999;
} }
@@ -115,6 +106,9 @@ limitations under the License.
padding: 0 var(--default-horizontal-margin) 1em; padding: 0 var(--default-horizontal-margin) 1em;
color: #666; color: #666;
} }
.subHeader {
margin: 0 var(--default-horizontal-margin) .75em;
}
.prefsButton { .prefsButton {
text-align: right; text-align: right;
} }
@@ -141,19 +135,16 @@ limitations under the License.
} }
</style> </style>
<header> <header>
<div class="titleHeader">
<h3> <h3>
<a href$="[[_computeChangePath(_changeNum, _patchRange.*, _change.revisions)]]"> <a href$="[[_computeChangePath(_changeNum, _patchRange.*, _change.revisions)]]">
[[_changeNum]]</a><span>:</span> [[_changeNum]]</a><span>:</span>
<span>[[_change.subject]]</span> <span>[[_change.subject]]</span>
<span class="dash"></span> <span class="dash"></span>
<input <input id="reviewed"
id="reviewed"
class="reviewed" class="reviewed"
type="checkbox" type="checkbox"
on-change="_handleReviewedChange" on-change="_handleReviewedChange"
hidden$="[[!_loggedIn]]" hidden$="[[!_loggedIn]]" hidden>
hidden>
<div class="jumpToFileContainer"> <div class="jumpToFileContainer">
<gr-button link class="dropdown-trigger" id="trigger" on-tap="_showDropdownTapHandler"> <gr-button link class="dropdown-trigger" id="trigger" on-tap="_showDropdownTapHandler">
<span>[[_computeFileDisplayName(_path)]]</span> <span>[[_computeFileDisplayName(_path)]]</span>
@@ -193,9 +184,10 @@ limitations under the License.
<a class="navLink" <a class="navLink"
href$="[[_computeNavLinkURL(_path, _fileList, 1, 1)]]">Next</a> href$="[[_computeNavLinkURL(_path, _fileList, 1, 1)]]">Next</a>
</div> </div>
</div> </header>
<div class="loading" hidden$="[[!_loading]]">Loading...</div> <div class="loading" hidden$="[[!_loading]]">Loading...</div>
<div class="patchRangeHeader" hidden hidden$="[[_loading]]"> <div hidden$="[[_loading]]" hidden>
<div class="subHeader">
<gr-patch-range-select <gr-patch-range-select
path="[[_path]]" path="[[_path]]"
change-num="[[_changeNum]]" change-num="[[_changeNum]]"
@@ -216,12 +208,12 @@ limitations under the License.
<span hidden$="[[_computePrefsButtonHidden(_prefs, _loggedIn)]]"> <span hidden$="[[_computePrefsButtonHidden(_prefs, _loggedIn)]]">
<span <span
hidden$="[[_computeModeSelectHidden(_isImageDiff)]]">/</span> hidden$="[[_computeModeSelectHidden(_isImageDiff)]]">/</span>
<gr-button <gr-button link
link
class="prefsButton" class="prefsButton"
on-tap="_handlePrefsTap">Preferences</gr-button> on-tap="_handlePrefsTap">Preferences</gr-button>
</span> </span>
</div> </div>
</div>
<gr-overlay id="prefsOverlay" with-backdrop> <gr-overlay id="prefsOverlay" with-backdrop>
<gr-diff-preferences <gr-diff-preferences
id="diffPreferences" id="diffPreferences"
@@ -230,12 +222,8 @@ limitations under the License.
on-save="_handlePrefsSave" on-save="_handlePrefsSave"
on-cancel="_handlePrefsCancel"></gr-diff-preferences> on-cancel="_handlePrefsCancel"></gr-diff-preferences>
</gr-overlay> </gr-overlay>
</div>
</header>
<gr-diff <gr-diff
id="diff" id="diff"
hidden
hidden$="[[_loading]]"
project="[[_change.project]]" project="[[_change.project]]"
commit="[[_change.current_revision]]" commit="[[_change.current_revision]]"
is-image-diff="{{_isImageDiff}}" is-image-diff="{{_isImageDiff}}"
@@ -248,6 +236,7 @@ limitations under the License.
view-mode="[[_diffMode]]" view-mode="[[_diffMode]]"
on-line-selected="_onLineSelected"> on-line-selected="_onLineSelected">
</gr-diff> </gr-diff>
</div>
<gr-rest-api-interface id="restAPI"></gr-rest-api-interface> <gr-rest-api-interface id="restAPI"></gr-rest-api-interface>
<gr-storage id="storage"></gr-storage> <gr-storage id="storage"></gr-storage>
<gr-diff-cursor id="cursor"></gr-diff-cursor> <gr-diff-cursor id="cursor"></gr-diff-cursor>

View File

@@ -44,6 +44,7 @@ limitations under the License.
border-top: 1px solid #eee; border-top: 1px solid #eee;
display: flex; display: flex;
font: 12px var(--monospace-font-family); font: 12px var(--monospace-font-family);
overflow-x: auto;
will-change: transform; will-change: transform;
} }
table { table {

View File

@@ -41,8 +41,8 @@ limitations under the License.
<style> <style>
:host { :host {
display: flex; display: flex;
min-height: 100vh;
flex-direction: column; flex-direction: column;
height: 100vh;
} }
gr-main-header, gr-main-header,
footer { footer {
@@ -58,7 +58,6 @@ limitations under the License.
main { main {
flex: 1; flex: 1;
position: relative; position: relative;
overflow: scroll;
} }
.errorView { .errorView {
align-items: center; align-items: center;