Fakultas Ilmu Komputer UI

Commit 92e44a34 authored by M. Reza Qorib's avatar M. Reza Qorib
Browse files

Merge branch 'Fixes/Pagination' of https://gitlab.com/PPL2017csui/PPLA1 into Fixes/Pagination

# Conflicts:
#	core/lib/permissions.py
parents 6751b841 143beff8
...@@ -75,8 +75,8 @@ padding-right:15%; ...@@ -75,8 +75,8 @@ padding-right:15%;
} }
.formLogin{ .formLogin{
margin: 30px auto 0; /*margin: auto;*/
width: 430px; /*width: 430px;*/
} }
.registerModal{ .registerModal{
......
...@@ -28,15 +28,15 @@ export default class Login extends React.Component { ...@@ -28,15 +28,15 @@ export default class Login extends React.Component {
</Header> </Header>
</div> </div>
<Grid stackable columns={2} relaxed> <Grid stackable={true} columns={2} padded style={{ display: 'flex', justifyContent: 'center' }}>
<Grid.Column> <Grid.Column width="seven">
<Segment basic> <Segment basic>
<LoginForm type="sso-ui" header="SSO Login" imgSrc="UI.png" imgSize="tiny" /> <LoginForm type="sso-ui" header="SSO Login" imgSrc="UI.png" imgSize="tiny" />
{this.props.children} {this.props.children}
</Segment> </Segment>
</Grid.Column> </Grid.Column>
<Grid.Column> <Grid.Column width="seven">
<Segment basic> <Segment basic>
<LoginForm type="company" header="Company Login" imgSrc="logo.png" imgSize="small" /> <LoginForm type="company" header="Company Login" imgSrc="logo.png" imgSize="small" />
{this.props.children} {this.props.children}
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<html> <html>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Yuk Cari Tempat Kape :)</title> <title>Yuk Cari Tempat Kape :)</title>
<link rel="stylesheet" href="{% static 'css/custom.css' %}"/> <link rel="stylesheet" href="{% static 'css/custom.css' %}"/>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.2/semantic.min.css"/> <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.2/semantic.min.css"/>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment