Skip to content

B
BeHub-web
Commit 484e612a authored by Dominik Rosiek's avatar Dominik Rosiek
Browse files
Options

Merge branch 'master' of gitlab.telemabk.pl:dominik/BeHub-web

parents 354003eb 78dcbcff
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 10 deletions
BeHub/Hub/static/css/login.css
View file @ 484e612a
...@@ -15,4 +15,13 @@ ...@@ -15,4 +15,13 @@
-moz-border-radius: 50%; -moz-border-radius: 50%;
-webkit-border-radius: 50%; -webkit-border-radius: 50%;
border-radius: 50%; border-radius: 50%;
} }
\ No newline at end of file .profile2-img{
width: 50px;
height: 50px;
margin: 0 auto 10px;
display: block;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
border-radius: 50%;
}
BeHub/Hub/static/css/style.css
View file @ 484e612a
...@@ -6,7 +6,6 @@ overflow-x: hidden; ...@@ -6,7 +6,6 @@ overflow-x: hidden;
body { body {
height: 100%; height: 100%;
color : white;
background-color :white; background-color :white;
/* The html and body elements cannot have any padding or margin. */ /* The html and body elements cannot have any padding or margin. */
} }
......
BeHub/Hub/static/img/background_main_page.png deleted 100644 → 0
View file @ 354003eb
This diff is collapsed.
BeHub/Hub/templates/page/content/login.html
View file @ 484e612a
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="col-sm-6 col-md-4 col-md-offset-4"> <div class="col-sm-6 col-md-4 col-md-offset-4">
<div class="account-wall"> <div class="account-wall">
<img class="profile-img" src="{{STATIC_URL}}img/login.jpg" <img class="profile-img" src="{{STATIC_URL}}img/sneacons.png"
alt=""> alt="">
<form action="/login/" method="post" class="form-signin"> <form action="/login/" method="post" class="form-signin">
{% csrf_token %} {% csrf_token %}
......
BeHub/Hub/templates/page/content/main_page.html
View file @ 484e612a
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
{% block content %} {% block content %}
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-6 col-sm-12"> <div class="col-md-6 col-sm-12 col-md-offset-3">
<h1>Chcesz ukrasc beacona?</h1> <img src="{{STATIC_URL}}img/sneacons.png">
<p>Smialo <h1>xD</h1> Logowanie z prawej <h1>xD</h1></p>
</div> </div>
</div> </div>
<!-- /.row --> <!-- /.row -->
......
BeHub/Hub/templates/page/default/base.html
View file @ 484e612a
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<link rel="stylesheet" type="text/css" href="{% static 'css/footer.css' %}" /> <link rel="stylesheet" type="text/css" href="{% static 'css/footer.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'css/the-big-picture.css' %}" /> <link rel="stylesheet" type="text/css" href="{% static 'css/the-big-picture.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'css/beacons.css' %}" /> <link rel="stylesheet" type="text/css" href="{% static 'css/beacons.css' %}" />
<title>Free Beacons</title> <title>Sneacons</title>
</head> </head>
<body class="full"> <body class="full">
......
BeHub/Hub/templates/page/default/main_bar.html
View file @ 484e612a
...@@ -2,14 +2,18 @@ ...@@ -2,14 +2,18 @@
<div class="container-fluid"> <div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display --> <!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
</button> </button>
<a class="navbar-brand" href="/">Free Beacons</a>
<a class="navbar-brand" href="/">Sneacons</a>
<img class="profile2-img" src="{{STATIC_URL}}img/sneacons.png">
</div> </div>
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li><a href="/login">Login</a></li> <li><a href="/login">Login</a></li>
<li><a href="/register">Register</a></li> <li><a href="/register">Register</a></li>
......
BeHub/Hub/templates/user_panel/default/base.html
View file @ 484e612a
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<!-- Include all compiled plugins (below), or include individual files as needed --> <!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="{% static 'js/bootstrap.min.js' %}"></script> <script src="{% static 'js/bootstrap.min.js' %}"></script>
<title>Activy</title> <title>Sneacons</title>
</head> </head>
<body> <body>
......
BeHub/Hub/templates/user_panel/default/user_bar.html
View file @ 484e612a
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
</button> </button>
<a class="navbar-brand" href="/">FreeBeacon</a> <a class="navbar-brand" href="/">Sneacons</a>
<img class="profile2-img" src="{{STATIC_URL}}img/sneacons.png">
</div> </div>
......
Markdown is supported
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