-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from Adamo2499/dev
Global fixes and improves
- Loading branch information
Showing
38 changed files
with
759 additions
and
419 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
|
|
||
| *.class |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" id="WebApp_ID"> | ||
| <display-name>MusicBaseSpring</display-name> | ||
| <welcome-file-list> | ||
| <welcome-file>index.html</welcome-file> | ||
| <welcome-file>index.htm</welcome-file> | ||
| <welcome-file>index.jsp</welcome-file> | ||
| <welcome-file>default.html</welcome-file> | ||
| <welcome-file>default.htm</welcome-file> | ||
| <welcome-file>default.jsp</welcome-file> | ||
| </welcome-file-list> | ||
| </web-app> |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,146 +1,152 @@ | ||
| @charset "UTF-8"; | ||
| * { | ||
| margin: 0; | ||
| padding: 0; | ||
| } | ||
| .dropdown { | ||
| width: 25%; | ||
| } | ||
|
|
||
| .dropdown-content { | ||
| display: none; | ||
| position: absolute; | ||
| width: 25%; | ||
| overflow: auto; | ||
| box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); | ||
| background-image: linear-gradient(to bottom right, red, darkred); | ||
|
|
||
| } | ||
|
|
||
| .dropdown:hover .dropdown-content { | ||
| display: block; | ||
| } | ||
|
|
||
| .dropdown-content a { | ||
| display: block; | ||
| color: white; | ||
| padding: 5px; | ||
| text-decoration: none; | ||
| } | ||
|
|
||
| .dropdown-content a:hover { | ||
| color: #FFFFFF; | ||
| background-color: red; | ||
| } | ||
|
|
||
| ul { | ||
| list-style-type: none; | ||
| margin: 0; | ||
| padding: 0; | ||
| overflow: hidden; | ||
| /* background-color: #f00; */ | ||
| background-image: linear-gradient(to bottom right, red, darkred); | ||
| } | ||
|
|
||
| li { | ||
| float: left; | ||
| } | ||
|
|
||
| li a { | ||
| display: block; | ||
| color: white; | ||
| text-align: center; | ||
| padding: 14px 16px; | ||
| text-decoration: none; | ||
| } | ||
|
|
||
| header { | ||
| background-image: linear-gradient(to bottom right, darkred, red); | ||
| color: white; | ||
| text-align: center; | ||
| padding-bottom: 30px; | ||
| } | ||
|
|
||
| footer { | ||
| background-image: linear-gradient(to bottom right, darkred, red); | ||
| color: white; | ||
| text-align: center; | ||
| padding-bottom: 30px; | ||
| position:absolute; | ||
| bottom:0; | ||
| width:100%; /* Height of the footer */ | ||
| position: fixed; | ||
| } | ||
|
|
||
| h2 { | ||
| text-align: center; | ||
| } | ||
|
|
||
| table,th,td { | ||
| text-align: center; | ||
| margin: 0 auto; | ||
| border: 1px solid black; | ||
| padding: 3px; | ||
| } | ||
|
|
||
| .form-inline { | ||
| text-align: center; | ||
| margin: 0 auto; | ||
| } | ||
|
|
||
| sup { | ||
| color: red; | ||
| } | ||
|
|
||
| img { | ||
| width: 50%; | ||
| height: 50%; | ||
| } | ||
|
|
||
| .alert { | ||
| text-align: center; | ||
| color: whitesmoke; | ||
| } | ||
|
|
||
| #buttons{ | ||
| margin: 0 auto; | ||
| text-align: center; | ||
| width: 100%; | ||
| } | ||
|
|
||
| button { | ||
| transition-duration: 0.4s; | ||
| border: none; | ||
| color: white; | ||
| padding: 15px 32px; | ||
| text-align: center; | ||
| text-decoration: none; | ||
| font-size: 16px; | ||
| border-radius: 100rem; | ||
| margin: 0 auto; | ||
| } | ||
|
|
||
| input[type = file]{ | ||
| background-color: #f4f4ec; | ||
| border: 1px solid #f8f4f4; | ||
| } | ||
|
|
||
| button[type = submit]{ | ||
| background-color: #a00c04; | ||
| display: inline-flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
| } | ||
|
|
||
| button[type = reset]{ | ||
| background-color: black; | ||
| display: inline-flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
| } | ||
|
|
||
| button:hover{ | ||
| box-shadow: 0 12px 16px 0 rgba(0,0,0,0.24), 0 17px 50px 0 rgba(0,0,0,0.19); | ||
| } | ||
|
|
||
| /* @media only screen and (max-width: 600px) {} */ | ||
| @charset "UTF-8"; | ||
|
|
||
| * { | ||
| margin: 0; | ||
| padding: 0; | ||
| } | ||
|
|
||
| .dropdown { | ||
| width: 25%; | ||
| } | ||
|
|
||
| .dropdown-content { | ||
| display: none; | ||
| position: absolute; | ||
| width: 25%; | ||
| overflow: auto; | ||
| box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2); | ||
| background-image: linear-gradient(to bottom right, red, darkred); | ||
|
|
||
| } | ||
|
|
||
| .dropdown:hover .dropdown-content { | ||
| display: block; | ||
| } | ||
|
|
||
| .dropdown-content a { | ||
| display: block; | ||
| color: white; | ||
| padding: 5px; | ||
| text-decoration: none; | ||
| } | ||
|
|
||
| .dropdown-content a:hover { | ||
| color: #FFFFFF; | ||
| background-color: red; | ||
| } | ||
|
|
||
| ul { | ||
| list-style-type: none; | ||
| margin: 0; | ||
| padding: 0; | ||
| overflow: hidden; | ||
| /* background-color: #f00; */ | ||
| background-image: linear-gradient(to bottom right, red, darkred); | ||
| } | ||
|
|
||
| li { | ||
| float: left; | ||
| } | ||
|
|
||
| li a { | ||
| display: block; | ||
| color: white; | ||
| text-align: center; | ||
| padding: 14px 16px; | ||
| text-decoration: none; | ||
| } | ||
|
|
||
| header { | ||
| background-image: linear-gradient(to bottom right, darkred, red); | ||
| color: white; | ||
| text-align: center; | ||
| padding-bottom: 30px; | ||
| } | ||
|
|
||
| footer { | ||
| background-image: linear-gradient(to bottom right, darkred, red); | ||
| color: white; | ||
| text-align: center; | ||
| padding-bottom: 30px; | ||
| position: absolute; | ||
| bottom: 0; | ||
| width: 100%; | ||
| /* Height of the footer */ | ||
| position: fixed; | ||
| } | ||
|
|
||
| h2 { | ||
| text-align: center; | ||
| } | ||
|
|
||
| table, | ||
| th, | ||
| td { | ||
| text-align: center; | ||
| margin: 0 auto; | ||
| border: 1px solid black; | ||
| padding: 3px; | ||
| } | ||
|
|
||
| .form-inline { | ||
| text-align: center; | ||
| margin: 0 auto; | ||
| } | ||
|
|
||
| sup { | ||
| color: red; | ||
| } | ||
|
|
||
| img { | ||
| width: 50%; | ||
| height: 50%; | ||
| } | ||
|
|
||
| .alert { | ||
| text-align: center; | ||
| color: whitesmoke; | ||
| } | ||
|
|
||
| button { | ||
| transition-duration: 0.4s; | ||
| border: none; | ||
| color: white; | ||
| padding: 15px 32px; | ||
| text-align: center; | ||
| text-decoration: none; | ||
| font-size: 16px; | ||
| border-radius: 100rem; | ||
| margin: 0 auto; | ||
| } | ||
|
|
||
| input[type=file] { | ||
| background-color: #f4f4ec; | ||
| border: 1px solid #f8f4f4; | ||
| } | ||
|
|
||
| button[type=submit] { | ||
| background-color: darkred; | ||
| display: inline-flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
| } | ||
|
|
||
| .return { | ||
| background-color: #a00c04; | ||
| display: inline-flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
| } | ||
|
|
||
| button[type=reset] { | ||
| background-color: black; | ||
| display: inline-flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
| } | ||
|
|
||
| button:hover { | ||
| box-shadow: 0 12px 16px 0 rgba(0, 0, 0, 0.24), 0 17px 50px 0 rgba(0, 0, 0, 0.19); | ||
| } | ||
|
|
||
| /* @media only screen and (max-width: 600px) {} */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| <!DOCTYPE html> | ||
| <html xmlns:th="http://www.thymeleaf.org" lang="pl"> | ||
| <div th:replace="parts/parts.html :: head"></div> | ||
| <br /> | ||
| <body> | ||
| <div th:replace="parts/parts.html :: header"></div> | ||
| <br /> | ||
| <div th:replace="parts/parts.html :: nav"></div> | ||
| <br /> | ||
| <main> | ||
| <h2>Szczegółowe dane albumu</h2> | ||
| <form th:action="@{#}" th:object="${album}" th:method="delete"> | ||
| <table> | ||
| <tr> | ||
| <td>ID albumu:</td> | ||
| <td><input type="number" th:field="*{id}" readonly="readonly" /></td> | ||
| </tr> | ||
| <tr> | ||
| <td>Nazwa albumu:</td> | ||
| <td><input type="text" th:field="*{name}" readonly="readonly"> | ||
| </td> | ||
| </tr> | ||
| <tr> | ||
| <td>Rok wydania</td> | ||
| <td><input type="number" th:field="*{publishingyear}" | ||
| readonly="readonly" /></td> | ||
| </tr> | ||
| </table> | ||
| </form> | ||
| </main> | ||
| <div th:replace="parts/parts.html :: footer"></div> | ||
| <br /> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.