Robert Marshall 9 лет назад
Родитель
Сommit
def084edc4

+ 1 - 19
View/Gallery/index.view

@@ -1,24 +1,6 @@
 @Title{Gallery}@
 @CSS{
-	.album{
-		width:33.33%;
-		/*float:left;*/
-		display:inline-block;
-		vertical-align:top;
-	}
-	
-	.album>div{
-		margin:5px;
-		padding:5px;
-		background:#e0e0e0;
-	}
-	
-	.album span{
-		display:block;
-		text-align:center;
-		color:#424242;
-		overflow:hidden;
-	}
+	<?= file_get_contents("css/gallery.css") ?>
 }@
 @CSSMed{
 	@media(orientation:portrait){

+ 2 - 53
View/Gallery/manage.view

@@ -1,61 +1,10 @@
 @Title{Gallery}@
 @CSS{
+	<?=file_get_contents("css/gallery.css")?>
+
 	#main-header .header{
 		box-shadow:none !important;
 	}
-
-	#tabs{
-		background:#f44336;
-		margin:-20px;
-		margin-bottom:10px;
-		position:fixed;
-		width:100%;
-		box-shadow: 0px 0px 5px 0px rgba(50, 50, 50, 0.8);
-		overflow-x:auto;
-		white-space:nowrap;
-	}
-
-	#tabs a{
-		display:inline-block;
-		color:#ffcdd2;
-		padding:15px 30px;
-		text-decoration:none;
-		text-transform: uppercase;
-	}
-	
-	#tabs a.active{
-		color:#fff;
-		border-bottom:3px solid #fff;
-	}
-	
-	.image{
-		width:25%;
-		display:inline-block;
-		vertical-align:top;
-		text-align:center;
-	}
-	
-	.image.selected>div{
-		background:#e57373;
-	}
-	
-	.image.selected>div:hover{
-		background:#ef5350;
-	}
-	
-	.image input[type=checkbox]{
-		display:none;
-	}
-	
-	.image>div:hover{
-		background:#bdbdbd;
-	}
-	
-	.image>div{
-		margin:5px;
-		padding:5px;
-		background:#e0e0e0;
-	}
 }@
 @CSSMed{
 	@media(orientation:portrait){

+ 1 - 0
View/Home/index.view

@@ -1,6 +1,7 @@
 @Title{Home}@
 @CSS{
 	<?= file_get_contents("css/blog.css") ?>
+	<?= file_get_contents("css/gallery.css") ?>
 	
 	h3 a {
 		color:inherit;

+ 1 - 1
base/Utils.php

@@ -78,7 +78,7 @@ class Utils{
 	}
 	
 	public static function MakeUniqueURL($table,$field,$string){
-		$PDO=DBObject::GetPDO();
+		$PDO=BaseRepository::GetPDO();
 		$baseUrl=Utils::MakeStringUrlSafe($string);
 		$prep=$PDO->prepare("SELECT COUNT(*) FROM blog_posts WHERE post_url=?");
 		$prep->execute(array($baseUrl));

+ 1 - 2
css/blog.css

@@ -1,8 +1,7 @@
 .code {
-  border: 3px solid #eeeeee;
+  border: 4px solid #eeeeee;
   background: #e0e0e0;
   border-radius: 4px;
-  padding: 4px;
   margin: 0;
   overflow: auto;
 }

+ 62 - 0
css/gallery.css

@@ -0,0 +1,62 @@
+#tabs {
+  background: #f44336;
+  margin: -20px;
+  margin-bottom: 10px;
+  position: fixed;
+  width: 100%;
+  box-shadow: 0px 0px 5px 0px rgba(50, 50, 50, 0.8);
+  overflow-x: auto;
+  white-space: nowrap;
+}
+#tabs a {
+  display: inline-block;
+  color: #ffcdd2;
+  padding: 15px 30px;
+  text-decoration: none;
+  text-transform: uppercase;
+}
+#tabs a.active {
+  color: #fff;
+  border-bottom: 3px solid #fff;
+}
+.album {
+  width: 33.33%;
+  /*float:left;*/
+
+  display: inline-block;
+  vertical-align: top;
+}
+.album div {
+  margin: 5px;
+  padding: 5px;
+  background: #e0e0e0;
+}
+.album span {
+  display: block;
+  text-align: center;
+  color: #424242;
+  overflow: hidden;
+}
+.image {
+  width: 25%;
+  display: inline-block;
+  vertical-align: top;
+  text-align: center;
+}
+.image.selected > div {
+  background: #e57373;
+}
+.image.selected > div:hover {
+  background: #ef5350;
+}
+.image input[type=checkbox] {
+  display: none;
+}
+.image > div {
+  margin: 5px;
+  padding: 5px;
+  background: #e0e0e0;
+}
+.image > div:hover {
+  background: #bdbdbd;
+}

+ 0 - 0
css/material_colours.css


+ 1 - 1
css/style.css

@@ -153,7 +153,7 @@ p:first-child {
 #buttons > table tr > td:last-child {
   text-align: right;
 }
-#buttons > table tr > td:not(:first-child) {
+#buttons > table tr > td > *:not(:first-child) {
   margin-top: 20px;
 }
 #buttons button {

+ 1 - 2
less/blog.less

@@ -1,10 +1,9 @@
 @import "colours.less";
 
 .code{
-	border:3px solid @control;
+	border:4px solid @control;
 	background: @control2;
 	border-radius:4px;
-	padding:4px;
 	margin:0;
 	overflow:auto;
 

+ 19 - 274
less/colours.less

@@ -1,278 +1,23 @@
-@Red-50:#ffebee;
-@Red-100:#ffcdd2;
-@Red-200:#ef9a9a;
-@Red-300:#e57373;
-@Red-400:#ef5350;
-@Red-500:#f44336;
-@Red-600:#e53935;
-@Red-700:#d32f2f;
-@Red-800:#c62828;
-@Red-900:#b71c1c;
-@Red-A100:#ff8a80;
-@Red-A200:#ff5252;
-@Red-A400:#ff1744;
-@Red-A700:#d50000;
-
-@Pink-50:#fce4ec;
-@Pink-100:#f8bbd0;
-@Pink-200:#f48fb1;
-@Pink-300:#f06292;
-@Pink-400:#ec407a;
-@Pink-500:#e91e63;
-@Pink-600:#d81b60;
-@Pink-700:#c2185b;
-@Pink-800:#ad1457;
-@Pink-900:#880e4f;
-@Pink-A100:#ff80ab;
-@Pink-A200:#ff4081;
-@Pink-A400:#f50057;
-@Pink-A700:#c51162;
-
-@Purple-50:#f3e5f5;
-@Purple-100:#e1bee7;
-@Purple-200:#ce93d8;
-@Purple-300:#ba68c8;
-@Purple-400:#ab47bc;
-@Purple-500:#9c27b0;
-@Purple-600:#8e24aa;
-@Purple-700:#7b1fa2;
-@Purple-800:#6a1b9a;
-@Purple-900:#4a148c;
-@Purple-A100:#ea80fc;
-@Purple-A200:#e040fb;
-@Purple-A400:#d500f9;
-@Purple-A700:#aa00ff;
-
-@DeepPurple-50:#ede7f6;
-@DeepPurple-50100:#d1c4e9;
-@DeepPurple-50200:#b39ddb;
-@DeepPurple-50300:#9575cd;
-@DeepPurple-50400:#7e57c2;
-@DeepPurple-50500:#673ab7;
-@DeepPurple-50600:#5e35b1;
-@DeepPurple-50700:#512da8;
-@DeepPurple-50800:#4527a0;
-@DeepPurple-50900:#311b92;
-@DeepPurple-50A100:#b388ff;
-@DeepPurple-50A200:#7c4dff;
-@DeepPurple-50A400:#651fff;
-@DeepPurple-50A700:#6200ea;
-
-@Indigo-50:#e8eaf6;
-@Indigo-100:#c5cae9;
-@Indigo-200:#9fa8da;
-@Indigo-300:#7986cb;
-@Indigo-400:#5c6bc0;
-@Indigo-500:#3f51b5;
-@Indigo-600:#3949ab;
-@Indigo-700:#303f9f;
-@Indigo-800:#283593;
-@Indigo-900:#1a237e;
-@Indigo-A100:#8c9eff;
-@Indigo-A200:#536dfe;
-@Indigo-A400:#3d5afe;
-@Indigo-A700:#304ffe;
-
-@Blue-50:#e3f2fd;
-@Blue-100:#bbdefb;
-@Blue-200:#90caf9;
-@Blue-300:#64b5f6;
-@Blue-400:#42a5f5;
-@Blue-500:#2196f3;
-@Blue-600:#1e88e5;
-@Blue-700:#1976d2;
-@Blue-800:#1565c0;
-@Blue-900:#0d47a1;
-@Blue-A100:#82b1ff;
-@Blue-A200:#448aff;
-@Blue-A400:#2979ff;
-@Blue-A700:#2962ff;
-
-@LightBlue-50:#e1f5fe;
-@LightBlue-100:#b3e5fc;
-@LightBlue-200:#81d4fa;
-@LightBlue-300:#4fc3f7;
-@LightBlue-400:#29b6f6;
-@LightBlue-500:#03a9f4;
-@LightBlue-600:#039be5;
-@LightBlue-700:#0288d1;
-@LightBlue-800:#0277bd;
-@LightBlue-900:#01579b;
-@LightBlue-A100:#80d8ff;
-@LightBlue-A200:#40c4ff;
-@LightBlue-A400:#00b0ff;
-@LightBlue-A700:#0091ea;
-
-@Cyan-50:#e0f7fa;
-@Cyan-100:#b2ebf2;
-@Cyan-200:#80deea;
-@Cyan-300:#4dd0e1;
-@Cyan-400:#26c6da;
-@Cyan-500:#00bcd4;
-@Cyan-600:#00acc1;
-@Cyan-700:#0097a7;
-@Cyan-800:#00838f;
-@Cyan-900:#006064;
-@Cyan-A100:#84ffff;
-@Cyan-A200:#18ffff;
-@Cyan-A400:#00e5ff;
-@Cyan-A700:#00b8d4;
-
-@Teal-50:#e0f2f1;
-@Teal-100:#b2dfdb;
-@Teal-200:#80cbc4;
-@Teal-300:#4db6ac;
-@Teal-400:#26a69a;
-@Teal-500:#009688;
-@Teal-600:#00897b;
-@Teal-700:#00796b;
-@Teal-800:#00695c;
-@Teal-900:#004d40;
-@Teal-A100:#a7ffeb;
-@Teal-A200:#64ffda;
-@Teal-A400:#1de9b6;
-@Teal-A700:#00bfa5;
-
-@Green-50:#e8f5e9;
-@Green-100:#c8e6c9;
-@Green-200:#a5d6a7;
-@Green-300:#81c784;
-@Green-400:#66bb6a;
-@Green-500:#4caf50;
-@Green-600:#43a047;
-@Green-700:#388e3c;
-@Green-800:#2e7d32;
-@Green-900:#1b5e20;
-@Green-A100:#b9f6ca;
-@Green-A200:#69f0ae;
-@Green-A400:#00e676;
-@Green-A700:#00c853;
-
-@LightGreen-50:#f1f8e9;
-@LightGreen-100:#dcedc8;
-@LightGreen-200:#c5e1a5;
-@LightGreen-300:#aed581;
-@LightGreen-400:#9ccc65;
-@LightGreen-500:#8bc34a;
-@LightGreen-600:#7cb342;
-@LightGreen-700:#689f38;
-@LightGreen-800:#558b2f;
-@LightGreen-900:#33691e;
-@LightGreen-A100:#ccff90;
-@LightGreen-A200:#b2ff59;
-@LightGreen-A400:#76ff03;
-@LightGreen-A700:#64dd17;
-
-@Lime-50:#f9fbe7;
-@Lime-100:#f0f4c3;
-@Lime-200:#e6ee9c;
-@Lime-300:#dce775;
-@Lime-400:#d4e157;
-@Lime-500:#cddc39;
-@Lime-600:#c0ca33;
-@Lime-700:#afb42b;
-@Lime-800:#9e9d24;
-@Lime-900:#827717;
-@Lime-A100:#f4ff81;
-@Lime-A200:#eeff41;
-@Lime-A400:#c6ff00;
-@Lime-A700:#aeea00;
-
-@Yellow-50:#fffde7;
-@Yellow-100:#fff9c4;
-@Yellow-200:#fff59d;
-@Yellow-300:#fff176;
-@Yellow-400:#ffee58;
-@Yellow-500:#ffeb3b;
-@Yellow-600:#fdd835;
-@Yellow-700:#fbc02d;
-@Yellow-800:#f9a825;
-@Yellow-900:#f57f17;
-@Yellow-A100:#ffff8d;
-@Yellow-A200:#ffff00;
-@Yellow-A400:#ffea00;
-@Yellow-A700:#ffd600;
-
-@Amber-50:#fff8e1;
-@Amber-100:#ffecb3;
-@Amber-200:#ffe082;
-@Amber-300:#ffd54f;
-@Amber-400:#ffca28;
-@Amber-500:#ffc107;
-@Amber-600:#ffb300;
-@Amber-700:#ffa000;
-@Amber-800:#ff8f00;
-@Amber-900:#ff6f00;
-@Amber-A100:#ffe57f;
-@Amber-A200:#ffd740;
-@Amber-A400:#ffc400;
-@Amber-A700:#ffab00;
-
-@Orange-50:#fff3e0;
-@Orange-100:#ffe0b2;
-@Orange-200:#ffcc80;
-@Orange-300:#ffb74d;
-@Orange-400:#ffa726;
-@Orange-500:#ff9800;
-@Orange-600:#fb8c00;
-@Orange-700:#f57c00;
-@Orange-800:#ef6c00;
-@Orange-900:#e65100;
-@Orange-A100:#ffd180;
-@Orange-A200:#ffab40;
-@Orange-A400:#ff9100;
-@Orange-A700:#ff6d00;
-
-@DeepOrange-50:#fbe9e7;
-@DeepOrange-100:#ffccbc;
-@DeepOrange-200:#ffab91;
-@DeepOrange-300:#ff8a65;
-@DeepOrange-400:#ff7043;
-@DeepOrange-500:#ff5722;
-@DeepOrange-600:#f4511e;
-@DeepOrange-700:#e64a19;
-@DeepOrange-800:#d84315;
-@DeepOrange-900:#bf360c;
-@DeepOrange-A100:#ff9e80;
-@DeepOrange-A200:#ff6e40;
-@DeepOrange-A400:#ff3d00;
-@DeepOrange-A700:#dd2c00;
-
-@Brown-50:#efebe9;
-@Brown-100:#d7ccc8;
-@Brown-200:#bcaaa4;
-@Brown-300:#a1887f;
-@Brown-400:#8d6e63;
-@Brown-500:#795548;
-@Brown-600:#6d4c41;
-@Brown-700:#5d4037;
-@Brown-800:#4e342e;
-@Brown-900:#3e2723;
-
-@Grey-50:#fafafa;
-@Grey-100:#f5f5f5;
-@Grey-200:#eeeeee;
-@Grey-300:#e0e0e0;
-@Grey-400:#bdbdbd;
-@Grey-500:#9e9e9e;
-@Grey-600:#757575;
-@Grey-700:#616161;
-@Grey-800:#424242;
-@Grey-900:#212121;
-
-@BlueGrey-50:#eceff1;
-@BlueGrey-100:#cfd8dc;
-@BlueGrey-200:#b0bec5;
-@BlueGrey-300:#90a4ae;
-@BlueGrey-400:#78909c;
-@BlueGrey-500:#607d8b;
-@BlueGrey-600:#546e7a;
-@BlueGrey-700:#455a64;
-@BlueGrey-800:#37474f;
-@BlueGrey-900:#263238;
+@import "material_colours.less";
 
 @background:@Grey-50;
-@primary:@Red-500;
-@accent:@Teal-A400;
+
+@primary-100:@Red-100;
+@primary-200:@Red-200;
+@primary-300:@Red-300;
+@primary-400:@Red-400;
+@primary-500:@Red-500;
+@primary-600:@Red-600;
+@primary-700:@Red-700;
+@primary-800:@Red-800;
+@primary-900:@Red-900;
+
+@accent-100:@Teal-A100;
+@accent-200:@Teal-A200;
+@accent-400:@Teal-A400;
+@accent-700:@Teal-A700;
+
+@primary:@primary-500;
+@accent:@accent-400;
 @control:@Grey-200;
 @control2:@Grey-300;

+ 76 - 0
less/gallery.less

@@ -0,0 +1,76 @@
+@import "colours.less";
+
+#tabs{
+	background:@primary;
+	margin:-20px;
+	margin-bottom:10px;
+	position:fixed;
+	width:100%;
+	box-shadow: 0px 0px 5px 0px rgba(50, 50, 50, 0.8);
+	overflow-x:auto;
+	white-space:nowrap;
+	
+	a{
+	   display:inline-block;
+	   color:@Red-100;
+	   padding:15px 30px;
+	   text-decoration:none;
+	   text-transform: uppercase;
+
+		&.active{
+			color:#fff;
+			border-bottom:3px solid #fff;
+		}
+	}
+}
+
+.album{
+	width:33.33%;
+	/*float:left;*/
+	display:inline-block;
+	vertical-align:top;
+	
+	div{
+		margin:5px;
+		padding:5px;
+		background:@control2;
+	}
+	
+	span{
+		display:block;
+		text-align:center;
+		color:@Grey-800;
+		overflow:hidden;
+	}
+}
+
+.image{
+	width:25%;
+	display:inline-block;
+	vertical-align:top;
+	text-align:center;
+
+	&.selected {
+		>div{
+			background:@primary-300;
+
+			&:hover{
+				background:@primary-400;
+			}
+		}
+	}
+	
+	input[type=checkbox]{
+		display:none;
+	}
+	
+	>div{
+		margin:5px;
+		padding:5px;
+		background:@control2;
+		
+		&:hover{
+			background:@Grey-400;
+		}
+	}
+}

+ 272 - 0
less/material_colours.less

@@ -0,0 +1,272 @@
+@Red-50:#ffebee;
+@Red-100:#ffcdd2;
+@Red-200:#ef9a9a;
+@Red-300:#e57373;
+@Red-400:#ef5350;
+@Red-500:#f44336;
+@Red-600:#e53935;
+@Red-700:#d32f2f;
+@Red-800:#c62828;
+@Red-900:#b71c1c;
+@Red-A100:#ff8a80;
+@Red-A200:#ff5252;
+@Red-A400:#ff1744;
+@Red-A700:#d50000;
+
+@Pink-50:#fce4ec;
+@Pink-100:#f8bbd0;
+@Pink-200:#f48fb1;
+@Pink-300:#f06292;
+@Pink-400:#ec407a;
+@Pink-500:#e91e63;
+@Pink-600:#d81b60;
+@Pink-700:#c2185b;
+@Pink-800:#ad1457;
+@Pink-900:#880e4f;
+@Pink-A100:#ff80ab;
+@Pink-A200:#ff4081;
+@Pink-A400:#f50057;
+@Pink-A700:#c51162;
+
+@Purple-50:#f3e5f5;
+@Purple-100:#e1bee7;
+@Purple-200:#ce93d8;
+@Purple-300:#ba68c8;
+@Purple-400:#ab47bc;
+@Purple-500:#9c27b0;
+@Purple-600:#8e24aa;
+@Purple-700:#7b1fa2;
+@Purple-800:#6a1b9a;
+@Purple-900:#4a148c;
+@Purple-A100:#ea80fc;
+@Purple-A200:#e040fb;
+@Purple-A400:#d500f9;
+@Purple-A700:#aa00ff;
+
+@DeepPurple-50:#ede7f6;
+@DeepPurple-50100:#d1c4e9;
+@DeepPurple-50200:#b39ddb;
+@DeepPurple-50300:#9575cd;
+@DeepPurple-50400:#7e57c2;
+@DeepPurple-50500:#673ab7;
+@DeepPurple-50600:#5e35b1;
+@DeepPurple-50700:#512da8;
+@DeepPurple-50800:#4527a0;
+@DeepPurple-50900:#311b92;
+@DeepPurple-50A100:#b388ff;
+@DeepPurple-50A200:#7c4dff;
+@DeepPurple-50A400:#651fff;
+@DeepPurple-50A700:#6200ea;
+
+@Indigo-50:#e8eaf6;
+@Indigo-100:#c5cae9;
+@Indigo-200:#9fa8da;
+@Indigo-300:#7986cb;
+@Indigo-400:#5c6bc0;
+@Indigo-500:#3f51b5;
+@Indigo-600:#3949ab;
+@Indigo-700:#303f9f;
+@Indigo-800:#283593;
+@Indigo-900:#1a237e;
+@Indigo-A100:#8c9eff;
+@Indigo-A200:#536dfe;
+@Indigo-A400:#3d5afe;
+@Indigo-A700:#304ffe;
+
+@Blue-50:#e3f2fd;
+@Blue-100:#bbdefb;
+@Blue-200:#90caf9;
+@Blue-300:#64b5f6;
+@Blue-400:#42a5f5;
+@Blue-500:#2196f3;
+@Blue-600:#1e88e5;
+@Blue-700:#1976d2;
+@Blue-800:#1565c0;
+@Blue-900:#0d47a1;
+@Blue-A100:#82b1ff;
+@Blue-A200:#448aff;
+@Blue-A400:#2979ff;
+@Blue-A700:#2962ff;
+
+@LightBlue-50:#e1f5fe;
+@LightBlue-100:#b3e5fc;
+@LightBlue-200:#81d4fa;
+@LightBlue-300:#4fc3f7;
+@LightBlue-400:#29b6f6;
+@LightBlue-500:#03a9f4;
+@LightBlue-600:#039be5;
+@LightBlue-700:#0288d1;
+@LightBlue-800:#0277bd;
+@LightBlue-900:#01579b;
+@LightBlue-A100:#80d8ff;
+@LightBlue-A200:#40c4ff;
+@LightBlue-A400:#00b0ff;
+@LightBlue-A700:#0091ea;
+
+@Cyan-50:#e0f7fa;
+@Cyan-100:#b2ebf2;
+@Cyan-200:#80deea;
+@Cyan-300:#4dd0e1;
+@Cyan-400:#26c6da;
+@Cyan-500:#00bcd4;
+@Cyan-600:#00acc1;
+@Cyan-700:#0097a7;
+@Cyan-800:#00838f;
+@Cyan-900:#006064;
+@Cyan-A100:#84ffff;
+@Cyan-A200:#18ffff;
+@Cyan-A400:#00e5ff;
+@Cyan-A700:#00b8d4;
+
+@Teal-50:#e0f2f1;
+@Teal-100:#b2dfdb;
+@Teal-200:#80cbc4;
+@Teal-300:#4db6ac;
+@Teal-400:#26a69a;
+@Teal-500:#009688;
+@Teal-600:#00897b;
+@Teal-700:#00796b;
+@Teal-800:#00695c;
+@Teal-900:#004d40;
+@Teal-A100:#a7ffeb;
+@Teal-A200:#64ffda;
+@Teal-A400:#1de9b6;
+@Teal-A700:#00bfa5;
+
+@Green-50:#e8f5e9;
+@Green-100:#c8e6c9;
+@Green-200:#a5d6a7;
+@Green-300:#81c784;
+@Green-400:#66bb6a;
+@Green-500:#4caf50;
+@Green-600:#43a047;
+@Green-700:#388e3c;
+@Green-800:#2e7d32;
+@Green-900:#1b5e20;
+@Green-A100:#b9f6ca;
+@Green-A200:#69f0ae;
+@Green-A400:#00e676;
+@Green-A700:#00c853;
+
+@LightGreen-50:#f1f8e9;
+@LightGreen-100:#dcedc8;
+@LightGreen-200:#c5e1a5;
+@LightGreen-300:#aed581;
+@LightGreen-400:#9ccc65;
+@LightGreen-500:#8bc34a;
+@LightGreen-600:#7cb342;
+@LightGreen-700:#689f38;
+@LightGreen-800:#558b2f;
+@LightGreen-900:#33691e;
+@LightGreen-A100:#ccff90;
+@LightGreen-A200:#b2ff59;
+@LightGreen-A400:#76ff03;
+@LightGreen-A700:#64dd17;
+
+@Lime-50:#f9fbe7;
+@Lime-100:#f0f4c3;
+@Lime-200:#e6ee9c;
+@Lime-300:#dce775;
+@Lime-400:#d4e157;
+@Lime-500:#cddc39;
+@Lime-600:#c0ca33;
+@Lime-700:#afb42b;
+@Lime-800:#9e9d24;
+@Lime-900:#827717;
+@Lime-A100:#f4ff81;
+@Lime-A200:#eeff41;
+@Lime-A400:#c6ff00;
+@Lime-A700:#aeea00;
+
+@Yellow-50:#fffde7;
+@Yellow-100:#fff9c4;
+@Yellow-200:#fff59d;
+@Yellow-300:#fff176;
+@Yellow-400:#ffee58;
+@Yellow-500:#ffeb3b;
+@Yellow-600:#fdd835;
+@Yellow-700:#fbc02d;
+@Yellow-800:#f9a825;
+@Yellow-900:#f57f17;
+@Yellow-A100:#ffff8d;
+@Yellow-A200:#ffff00;
+@Yellow-A400:#ffea00;
+@Yellow-A700:#ffd600;
+
+@Amber-50:#fff8e1;
+@Amber-100:#ffecb3;
+@Amber-200:#ffe082;
+@Amber-300:#ffd54f;
+@Amber-400:#ffca28;
+@Amber-500:#ffc107;
+@Amber-600:#ffb300;
+@Amber-700:#ffa000;
+@Amber-800:#ff8f00;
+@Amber-900:#ff6f00;
+@Amber-A100:#ffe57f;
+@Amber-A200:#ffd740;
+@Amber-A400:#ffc400;
+@Amber-A700:#ffab00;
+
+@Orange-50:#fff3e0;
+@Orange-100:#ffe0b2;
+@Orange-200:#ffcc80;
+@Orange-300:#ffb74d;
+@Orange-400:#ffa726;
+@Orange-500:#ff9800;
+@Orange-600:#fb8c00;
+@Orange-700:#f57c00;
+@Orange-800:#ef6c00;
+@Orange-900:#e65100;
+@Orange-A100:#ffd180;
+@Orange-A200:#ffab40;
+@Orange-A400:#ff9100;
+@Orange-A700:#ff6d00;
+
+@DeepOrange-50:#fbe9e7;
+@DeepOrange-100:#ffccbc;
+@DeepOrange-200:#ffab91;
+@DeepOrange-300:#ff8a65;
+@DeepOrange-400:#ff7043;
+@DeepOrange-500:#ff5722;
+@DeepOrange-600:#f4511e;
+@DeepOrange-700:#e64a19;
+@DeepOrange-800:#d84315;
+@DeepOrange-900:#bf360c;
+@DeepOrange-A100:#ff9e80;
+@DeepOrange-A200:#ff6e40;
+@DeepOrange-A400:#ff3d00;
+@DeepOrange-A700:#dd2c00;
+
+@Brown-50:#efebe9;
+@Brown-100:#d7ccc8;
+@Brown-200:#bcaaa4;
+@Brown-300:#a1887f;
+@Brown-400:#8d6e63;
+@Brown-500:#795548;
+@Brown-600:#6d4c41;
+@Brown-700:#5d4037;
+@Brown-800:#4e342e;
+@Brown-900:#3e2723;
+
+@Grey-50:#fafafa;
+@Grey-100:#f5f5f5;
+@Grey-200:#eeeeee;
+@Grey-300:#e0e0e0;
+@Grey-400:#bdbdbd;
+@Grey-500:#9e9e9e;
+@Grey-600:#757575;
+@Grey-700:#616161;
+@Grey-800:#424242;
+@Grey-900:#212121;
+
+@BlueGrey-50:#eceff1;
+@BlueGrey-100:#cfd8dc;
+@BlueGrey-200:#b0bec5;
+@BlueGrey-300:#90a4ae;
+@BlueGrey-400:#78909c;
+@BlueGrey-500:#607d8b;
+@BlueGrey-600:#546e7a;
+@BlueGrey-700:#455a64;
+@BlueGrey-800:#37474f;
+@BlueGrey-900:#263238;

+ 1 - 1
less/style.less

@@ -181,7 +181,7 @@ p:first-child{
 				text-align: right;
 			}
 			
-			&:not(:first-child){
+			>*:not(:first-child){
 				margin-top:20px;
 			}
 		}

+ 1 - 1
template.php

@@ -34,7 +34,7 @@ function FormatURI(URI $uri, $base=""){
 		</style>
 		<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
 		<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js"></script>
-		<script src="javascript.js"></script>
+		<script src="/javascript.js"></script>
 		<script type="text/javascript">
 			{@JavaScript}
 		</script>