Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Fix extra scrollbars in dapps #3706

Merged
merged 5 commits into from
Dec 2, 2016
Merged

Fix extra scrollbars in dapps #3706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
adfb8c6
Fix extra scrollbars in dapps
jacogr Dec 2, 2016
46f0cd9
Dapps list padding
jacogr Dec 2, 2016
822743a
spelling
jacogr Dec 2, 2016
4e947b3
lint
jacogr Dec 2, 2016
5b7d471
Height overflow fix
ngotchac Dec 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion js/src/dapps/index.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<style>
html, body, #container {
width: 100%;
height: 100%;
min-height: 100%;
margin: 0;
padding: 0;
background: white;
Expand Down
3 changes: 2 additions & 1 deletion js/src/ui/Page/page.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@
/* You should have received a copy of the GNU General Public License
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/

.layout {
padding: 0.25em;
padding: 0.25em 0.25em 1em 0.25em;
}

.layout>div {
Expand Down
7 changes: 1 addition & 6 deletions js/src/views/Application/application.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,8 @@
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/

.outer,
.container {
min-height: 100vh;
display: flex;
flex-direction: column;
}

.container {
padding-bottom: 1.6em;
min-height: 100vh;
}
4 changes: 1 addition & 3 deletions js/src/views/Application/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ import Status from './Status';
import Store from './store';
import TabBar from './TabBar';

import styles from './application.css';

const inFrame = window.parent !== window && window.parent.frames.length !== 0;

@observer
Expand Down Expand Up @@ -62,7 +60,7 @@ class Application extends Component {
}

return (
<div className={ styles.outer }>
<div>
{ isDapp ? this.renderDapp() : this.renderApp() }
<Connection />
<ParityBar dapp={ isDapp } />
Expand Down