1
0
forked from SPC/spc-site

Merge pull request #8 from GregTheMadMonk/layout-fixes

Minor layout fixes
This commit is contained in:
SPC-code 2022-10-04 12:02:09 +03:00 committed by GitHub
commit 38b6147794
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 4787 additions and 7674 deletions

3
.gitignore vendored
View File

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

View File

@ -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")
}
}

File diff suppressed because it is too large Load Diff

View File

@ -3,14 +3,10 @@
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 {
body.is-preload #banner:after {
opacity: 0.85; }
body.is-preload #banner > .inner {
-moz-filter: none;
-webkit-filter: none;
-ms-filter: none;
@ -19,5 +15,6 @@
-webkit-transform: none;
-ms-transform: none;
transform: none;
opacity: 1;
}
opacity: 1; }
/*# sourceMappingURL=noscript.css.map */

View File

@ -584,4 +584,12 @@
};
// 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);

View File

@ -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 {

View File

@ -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;

View File

@ -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;
}
}

View File

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

File diff suppressed because it is too large Load Diff

View File

@ -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 {
opacity: 0 !important;
}
.spotlights > section > .content > .inner {
.spotlights > section > .image:before {
opacity: 0 !important; }
.spotlights > section > .content > .inner {
-moz-transform: none !important;
-webkit-transform: none !important;
-ms-transform: none !important;
transform: none !important;
opacity: 1 !important;
}
opacity: 1 !important; }
/* Wrapper */
.wrapper > .inner {
.wrapper > .inner {
opacity: 1 !important;
-moz-transform: none !important;
-webkit-transform: none !important;
-ms-transform: none !important;
transform: none !important;
}
transform: none !important; }
/* Sidebar */
#sidebar > .inner {
opacity: 1 !important;
}
#sidebar nav > ul > li {
#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;
}
opacity: 1 !important; }
/*# sourceMappingURL=noscript.css.map */

View File

@ -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;

View File

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

0
gradlew vendored Normal file → Executable file
View File

View File

@ -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"

View File

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