BES-34

Merging new colors

bestnotes/static/all.css

@@ -0,0 +1,8 @@
+body {
+    background-color: #222;
+}
+
+.btn-primary {
+    background-color: #414773;
+    border-color: #414773;
+}

bestnotes/static/login.css

@@ -11,7 +11,7 @@
 .login-form-2{
     border-radius: 5%;
     padding: 5%;
-    background: #0062cc;
+    background: #414773;
     box-shadow: 0 5px 8px 0 rgba(0, 0, 0, 0.2), 0 9px 26px 0 rgba(0, 0, 0, 0.19);
 }
 .input-group-text{
@@ -42,6 +42,6 @@
 
 .login-form-2 .btnSubmit{
     font-weight: 600;
-    color: #0062cc;
+    color: #414773;
     background-color: #fff;
 }

bestnotes/static/navbar.css

@@ -1,3 +1,8 @@
+
+.navbar{
+    background-color: #414773;
+}
+
 .nolink{
     text-decoration: none;
     color:white;

bestnotes/templates/base.html

@@ -7,9 +7,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
     <!-- Bootstrap CSS -->
-    
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
     <link rel="stylesheet" type="text/css" href="{% static 'navbar.css' %}">
+    <link rel="stylesheet" type="text/css" href="{% static 'all.css' %}">
 
     <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
     {% block css %}

bestnotes/templates/navbar.html

@@ -1,4 +1,4 @@
-<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
+<nav class="navbar navbar-expand-lg navbar-dark">
     <a class="navbar-brand" href="{% url 'homepage' %}">
         <i class="fa fa-sticky-note logo"></i>
         <strong>Best Notes</strong>

bestnotes/templates/note.html

@@ -6,12 +6,12 @@
 {% block content %}
 {% include 'navbar.html' %}
 <div class="container d-flex justify-content-center">
-    <div class="row mt-4"><h1>Tytuł: {{ note.name }}</h1></div>
+    <div class="row mt-4"><h1 class="text-white">Tytuł: {{ note.name }}</h1></div>
 </div>
 
 <div class="container">
     <div class="d-flex justify-content-center mt-5">
-        <h3> {{ note.text }}</h3>
+        <h3 class="text-white"> {{ note.text }}</h3>
     </div>
 </div>
 

bestnotes/templates/notes.html

@@ -12,7 +12,7 @@
 <div class="container">
     <div class="row">
         <div class="col-sm-6">
-            <h2>Dostępne notatki</h2>
+            <h2 class="text-white text-center">Dostępne notatki</h2>
             <ul class="list-group cProductsList mt-3"> 
                 {% for note in notes%}
                     {% if user.id != note.user.user.id %}
@@ -22,7 +22,7 @@
             </ul>
         </div>
         <div class="col-sm-6">
-            <h2>Twoje notatki</h2>
+            <h2 class="text-white text-center">Twoje notatki</h2>
             <ul class="list-group cProductsList mt-3"> 
                 {% for note in notes%}
                 {% if user.id == note.user.user.id %}

bestnotes/templates/subject.html

@@ -6,12 +6,12 @@
 {% block content %}
 {% include 'navbar.html' %}
 <div class="container d-flex justify-content-center">
-    <div class="row mt-4"><h1>{{id}}</h1></div>
+    <div class="row mt-4 text-white"><h1>{{id}}</h1></div>
 </div>
 
 <div class="container">
     <div class="d-flex justify-content-center mt-5">
-        <h3>Dodaj nowe zagadnienie</h3>
+        <h3 class="text-white">Dodaj nowe zagadnienie</h3>
     </div>
 <div class="d-flex justify-content-center mt-3">
     <form role="form">
@@ -20,7 +20,7 @@
     <button type="button" class="btn btn btn-primary ml-1">Dodaj</button>
 </div>
 <div class="d-flex justify-content-center mt-5">
-        <h3>Lista zagadnień</h3>
+        <h3 class="text-white">Lista zagadnień</h3>
 </div>
 <a class="row justify-content-center">Liczba dostępnych zagadnień: 3/15</a>
 <ul class="list-group cProductsList mt-3"> 

bestnotes/templates/subjects.html

@@ -12,7 +12,7 @@
 
 <div class="container">
         <div class="d-flex justify-content-center mt-5">
-            <h3>Dodaj nowy przedmiot</h3>
+            <h3 class="text-white">Dodaj nowy przedmiot</h3>
         </div>
     <div class="d-flex justify-content-center mt-3">
         <form role="form">
@@ -21,9 +21,9 @@
         <button type="button" class="btn btn btn-primary ml-1">Dodaj</button>
     </div>
     <div class="d-flex justify-content-center mt-5">
-            <h3>Lista przedmiotów</h3>
+            <h3 class="text-white">Lista przedmiotów</h3>
     </div>
-    <a class="row justify-content-center">Liczba dostępnych przedmiotów: 3/5</a>
+    <a class="row justify-content-center text-white">Liczba dostępnych przedmiotów: 3/5</a>
     <ul class="list-group cProductsList mt-3"> 
             <li class="list-group-item d-sm-flex justify-content-between"><p class="p-0 m-0 flex-grow-1">Programowanie</p> 
                 <button class="btn-primary mr-1" ><a class="nolink" href="/bestnotes/notes/1">Zarządzaj</a></button>