MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge branch 'marijn-chat' into 'master'

Browse Source 
Merge css files

See merge request !3
This commit was merged in pull request #7.
This commit is contained in:
Marijn Jansen
2017-01-10 15:09:57 +01:00
parent a727fd8c5f 9c0d1b19f0
commit 3b88155d4f
5 changed files with 103 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.idea/WebDB.iml generated Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library name="PHP Runtime" type="php">
<CLASSES>
<root url="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard" />
</CLASSES>
<SOURCES>
<root url="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard" />
</SOURCES>
</library>
</orderEntry>
</component>
</module>

8
.idea/modules.xml generated Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/WebDB.iml" filepath="$PROJECT_DIR$/.idea/WebDB.iml" />
</modules>
</component>
</project>

6
.idea/vcs.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

69
website/styles/default.css
View File

@@ -1,69 +0,0 @@
/*-----------------------------------------------------------------------------
Default Stylesheet
last update: 10-01-2017
Website: myhyvesbookplus.tk
-----------------------------------------------------------------------------*/
/* Remove padding and margin */
* {
margin: 0;
padding: 0;
border: 0;
}
/* Move element down (clear), below floating elements */
.clear {
clear: both;
}
/* Float element to the left side of its containing block */
.right {
float: right;
}
/* Float element to the left side of its containing block */
.left {
float: left;
}
/* Font sizes */
h1 {
font-size: 2.2em;
}
h2 {
font-size: 2.0em;
}
h3 {
font-size: 1.8em;
}
h4 {
font-size: 1.6em;
}
h5 {
font-size: 1.4em;
}
p {
font-size: 1.2em;
}
a, a:link, a:visited, a:hover, a:active {
color: inherit;
text-decoration: none;
}
/* Tables */
table {
border-spacing: 0;
border-collapse: collapse;
}
td {
text-align: left;
font-weight: normal;
}

72
website/styles/main.css
View File

@@ -1,7 +1,14 @@
/*-----------------------------------------------------------------------------
Default Stylesheet
last update: 10-01-2017
Website: myhyvesbookplus.tk
-----------------------------------------------------------------------------*/
body { body {
background-color: white; background-color: white;
color: #333; color: #333;
font-family: Arial; font-family: Arial, sans-serif;
} }
::selection { ::selection {
@@ -13,3 +20,66 @@ body {
background: #845663; background: #845663;
color: white; color: white;
} }
/* Remove padding and margin */
* {
margin: 0;
padding: 0;
border: 0;
}
/* Move element down (clear), below floating elements */
.clear {
clear: both;
}
/* Float element to the left side of its containing block */
.right {
float: right;
}
/* Float element to the left side of its containing block */
.left {
float: left;
}
/* Font sizes */
h1 {
font-size: 2.2em;
}
h2 {
font-size: 2.0em;
}
h3 {
font-size: 1.8em;
}
h4 {
font-size: 1.6em;
}
h5 {
font-size: 1.4em;
}
p {
font-size: 1.2em;
}
a, a:link, a:visited, a:hover, a:active {
color: inherit;
text-decoration: none;
}
/* Tables */
table {
border-spacing: 0;
border-collapse: collapse;
}
td {
text-align: left;
font-weight: normal;
}