Merge pull request #8 from GregTheMadMonk/layout-fixes

Minor layout fixes

.gitignore

@@ -5,3 +5,6 @@ build/
 
 !gradle/wrapper/gradle-wrapper.jar
 /deploy.ps1
+
+.sass-cache
+*.css.map

.space.kts

@@ -8,6 +8,13 @@ job("Deploy") {
         env["SPC_USER"] = Secrets("spc-webmaster-user")
         env["SPC_ID"] = Secrets("spc-webmaster-id")
         kotlinScript { api ->
+            api.space().projects.automation.deployments.start(
+            	project = api.projectIdentifier(),
+            	targetIdentifier = TargetIdentifier.Key("spc-site"),
+            	version = "current",
+            	// automatically update deployment status based on a status of a job
+            	syncWithAutomationJob = true
+        	)
             api.gradle("uploadDistribution")
         }
     }

data/home/assets/css/noscript.css

@@ -3,21 +3,18 @@
 	html5up.net | @ajlkn
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 */
-
 /* Banner */
+body.is-preload #banner:after {
+  opacity: 0.85; }
+body.is-preload #banner > .inner {
+  -moz-filter: none;
+  -webkit-filter: none;
+  -ms-filter: none;
+  filter: none;
+  -moz-transform: none;
+  -webkit-transform: none;
+  -ms-transform: none;
+  transform: none;
+  opacity: 1; }
 
-	body.is-preload #banner:after {
+/*# sourceMappingURL=noscript.css.map */
-		opacity: 0.85;
-	}
-
-	body.is-preload #banner > .inner {
-		-moz-filter: none;
-		-webkit-filter: none;
-		-ms-filter: none;
-		filter: none;
-		-moz-transform: none;
-		-webkit-transform: none;
-		-ms-transform: none;
-		transform: none;
-		opacity: 1;
-	}

data/home/assets/js/util.js

@@ -584,4 +584,12 @@
 
 	};
 
-})(jQuery);
+	// Remove `border-bottom` from all `<a>` elements that also contain an `<img>`
+	document.querySelectorAll("a > img, a > span > img").forEach(
+		imgEl => {
+			while (imgEl.tagName != "A") imgEl = imgEl.parentElement;
+			imgEl.style.borderBottom = "none";
+		}
+	);
+
+})(jQuery);

data/home/assets/sass/base/_typography.scss

@@ -126,6 +126,10 @@
 		font-style: italic;
 		margin: 0 0 _size(element-margin) 0;
 		padding: (_size(element-margin) / 4) 0 (_size(element-margin) / 4) _size(element-margin);
+
+		ul:last-child {
+			margin-bottom: .25em;
+		}
 	}
 
 	code {
@@ -170,4 +174,4 @@
 
 	.align-right {
 		text-align: right;
-	}
+	}

data/home/assets/sass/components/_list.scss

@@ -9,7 +9,7 @@
 	ol {
 		list-style: decimal;
 		margin: 0 0 _size(element-margin) 0;
-		padding-left: 1.25em;
+		list-style-position: inside;
 
 		li {
 			padding-left: 0.25em;
@@ -19,7 +19,7 @@
 	ul {
 		list-style: disc;
 		margin: 0 0 _size(element-margin) 0;
-		padding-left: 1em;
+		list-style-position: inside;
 
 		li {
 			padding-left: 0.5em;
@@ -53,4 +53,4 @@
 		dd {
 			margin-left: _size(element-margin);
 		}
-	}
+	}

data/home/assets/sass/custom/_home_creationinfo.scss

@@ -0,0 +1,15 @@
+// A custom style for main page block with SPC creation info
+	#main div.inner.home_creationinfo {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding-top: 2.25em;
+
+		a > span {
+			display: block;
+		}
+
+		p {
+			margin: 0 0 0 1em;
+		}
+	}

data/home/assets/sass/main.scss

@@ -32,6 +32,7 @@
 			margin: 0 auto;
 			max-width: _size(inner);
 			width: calc(100% - 6em);
+			overflow: auto;
 
 			@include breakpoint('<=small') {
 				@include padding(3em, 0);
@@ -72,4 +73,7 @@
 	@import 'layout/contact';
 	@import 'layout/footer';
 	@import 'layout/wrapper';
-	@import 'layout/menu';
+	@import 'layout/menu';
+
+// Custom modifications.
+	@import 'custom/home_creationinfo';

data/magprog/assets/css/noscript.css

@@ -3,41 +3,32 @@
 	html5up.net | @ajlkn
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 */
-
 /* Spotlights */
-
+.spotlights > section > .image:before {
-	.spotlights > section > .image:before {
+  opacity: 0 !important; }
-		opacity: 0 !important;
+.spotlights > section > .content > .inner {
-	}
+  -moz-transform: none !important;
-
+  -webkit-transform: none !important;
-	.spotlights > section > .content > .inner {
+  -ms-transform: none !important;
-		-moz-transform: none !important;
+  transform: none !important;
-		-webkit-transform: none !important;
+  opacity: 1 !important; }
-		-ms-transform: none !important;
-		transform: none !important;
-		opacity: 1 !important;
-	}
 
 /* Wrapper */
-
+.wrapper > .inner {
-	.wrapper > .inner {
+  opacity: 1 !important;
-		opacity: 1 !important;
+  -moz-transform: none !important;
-		-moz-transform: none !important;
+  -webkit-transform: none !important;
-		-webkit-transform: none !important;
+  -ms-transform: none !important;
-		-ms-transform: none !important;
+  transform: none !important; }
-		transform: none !important;
-	}
 
 /* Sidebar */
+#sidebar > .inner {
+  opacity: 1 !important; }
+#sidebar nav > ul > li {
+  -moz-transform: none !important;
+  -webkit-transform: none !important;
+  -ms-transform: none !important;
+  transform: none !important;
+  opacity: 1 !important; }
 
-	#sidebar > .inner {
+/*# sourceMappingURL=noscript.css.map */
-		opacity: 1 !important;
-	}
-
-	#sidebar nav > ul > li {
-		-moz-transform: none !important;
-		-webkit-transform: none !important;
-		-ms-transform: none !important;
-		transform: none !important;
-		opacity: 1 !important;
-	}

data/magprog/assets/sass/components/_list.scss

@@ -9,7 +9,7 @@
 	ol {
 		list-style: decimal;
 		margin: 0 0 _size(element-margin) 0;
-		padding-left: 1.25em;
+		list-style-position: inside;
 
 		li {
 			padding-left: 0.25em;
@@ -19,7 +19,7 @@
 	ul {
 		list-style: disc;
 		margin: 0 0 _size(element-margin) 0;
-		padding-left: 1em;
+		list-style-position: inside;
 
 		li {
 			padding-left: 0.5em;
@@ -53,4 +53,4 @@
 		dd {
 			margin-left: _size(element-margin);
 		}
-	}
+	}

data/magprog/assets/sass/components/_wrapper.scss

@@ -13,6 +13,7 @@
 			@include padding(5em, 5em);
 			max-width: 100%;
 			width: _size(inner-width);
+			overflow: auto;
 
 			@include breakpoint('<=xlarge') {
 				@include padding(4em, 4em);
@@ -136,4 +137,4 @@
 				}
 			}
 		}
-	}
+	}

src/main/kotlin/ru/mipt/spc/spcHome.kt

@@ -97,9 +97,9 @@ context(WebPage) private fun HTML.spcHome() {
             div {
                 id = "main"
                 section {
-                    div("inner") {
+                    div("inner home_creationinfo") {
                         a(href = "https://mipt.ru/education/departments/fpmi/") {
-                            span("image left") {
+                            span("image") {
                                 img {
                                     src = "images/FPMI.jpg"
                                     alt = "FPMI"
@@ -276,4 +276,4 @@ internal fun SiteBuilder.spcHome(dataPath: Path, prefix: Name = Name.EMPTY) {
         }
     }
 
-}
+}

src/main/kotlin/ru/mipt/spc/spcMisc.kt

@@ -137,7 +137,7 @@ context(WebPage) internal fun FlowContent.spcFooter() {
 //                }
             }
             ul("copyright") {
-                li { +"""SPC""" }
+                li { +"""SPC. All rights reserved.""" }
                 li {
                     +"""Design:"""
                     a {
@@ -175,4 +175,4 @@ context(WebPage) internal fun FlowContent.wrapper(contentBody: FlowContent.() ->
         // Footer
         spcFooter()
     }
-}
+}