API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Aug 18th, 2019
142
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 17.11 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/index.ucc b/index.ucc
  2. index a3017ed..0a6e814 100644
  3. --- a/index.ucc
  4. +++ b/index.ucc
  5. @@ -5,7 +5,7 @@
  6.  <globals>
  7.     <page>home</page>
  8.     <title>UCC :: University Computer Club</title>
  9. -   <banner>Welcome to the University Computer Club!</banner>
  10. +   <!-- <banner>Welcome to the University Computer Club!</banner> -->
  11.      <ready-for-kondo/>
  12.  </globals>
  13.  
  14. @@ -23,8 +23,8 @@
  15.         </noscript>
  16.         <script type="text/javascript">insertEvents("eventList");</script>
  17.     </ul>
  18. -  
  19. -   <div style="padding-left: 0.5em; padding-top: 0.2em;"><a href="http://ucc.asn.au/ucc-events.ics"><img src="/images/ical.png" alt="iCalendar Download" height="15" width="80" /></a></div>
  20. +
  21. +   <div style="padding-left: 0.5em; padding-top: 0.2em;"><a href="http://ucc.asn.au/ucc-events.ics"><img src="/images/ical.png" alt="iCalendar Download" height="15" width="80" /></a></div>
  22.     </section>
  23.     <section>
  24.         <heading><a href="https://twitter.com/statuses/user_timeline/15330305.rss"><img src="images/rss.png" style="float:right;border:0;" alt="RSS feed" /></a><a href="https://twitter.com/ucc_status">Systems Status Update</a></heading>
  25. @@ -40,6 +40,14 @@
  26.  
  27.  <data>
  28.  
  29. +<pre style="font-size: 0.30em;text-align: center; color: var(--secondary1)">
  30. +██╗    ██╗███████╗██╗      ██████╗ ██████╗ ███╗   ███╗███████╗    ████████╗ ██████╗     ████████╗██╗  ██╗███████╗    ██╗   ██╗███╗   ██╗██╗██╗   ██╗███████╗██████╗ ███████╗██╗████████╗██╗   ██╗     ██████╗ ██████╗ ███╗   ███╗██████╗ ██╗   ██╗████████╗███████╗██████╗      ██████╗██╗     ██╗   ██╗██████╗
  31. +██║    ██║██╔════╝██║     ██╔════╝██╔═══██╗████╗ ████║██╔════╝    ╚══██╔══╝██╔═══██╗    ╚══██╔══╝██║  ██║██╔════╝    ██║   ██║████╗  ██║██║██║   ██║██╔════╝██╔══██╗██╔════╝██║╚══██╔══╝╚██╗ ██╔╝    ██╔════╝██╔═══██╗████╗ ████║██╔══██╗██║   ██║╚══██╔══╝██╔════╝██╔══██╗    ██╔════╝██║     ██║   ██║██╔══██╗
  32. +██║ █╗ ██║█████╗  ██║     ██║     ██║   ██║██╔████╔██║█████╗         ██║   ██║   ██║       ██║   ███████║█████╗      ██║   ██║██╔██╗ ██║██║██║   ██║█████╗  ██████╔╝███████╗██║   ██║    ╚████╔╝     ██║     ██║   ██║██╔████╔██║██████╔╝██║   ██║   ██║   █████╗  ██████╔╝    ██║     ██║     ██║   ██║██████╔╝
  33. +██║███╗██║██╔══╝  ██║     ██║     ██║   ██║██║╚██╔╝██║██╔══╝         ██║   ██║   ██║       ██║   ██╔══██║██╔══╝      ██║   ██║██║╚██╗██║██║╚██╗ ██╔╝██╔══╝  ██╔══██╗╚════██║██║   ██║     ╚██╔╝      ██║     ██║   ██║██║╚██╔╝██║██╔═══╝ ██║   ██║   ██║   ██╔══╝  ██╔══██╗    ██║     ██║     ██║   ██║██╔══██╗
  34. +╚███╔███╔╝███████╗███████╗╚██████╗╚██████╔╝██║ ╚═╝ ██║███████╗       ██║   ╚██████╔╝       ██║   ██║  ██║███████╗    ╚██████╔╝██║ ╚████║██║ ╚████╔╝ ███████╗██║  ██║███████║██║   ██║      ██║       ╚██████╗╚██████╔╝██║ ╚═╝ ██║██║     ╚██████╔╝   ██║   ███████╗██║  ██║    ╚██████╗███████╗╚██████╔╝██████╔╝
  35. + ╚══╝╚══╝ ╚══════╝╚══════╝ ╚═════╝ ╚═════╝ ╚═╝     ╚═╝╚══════╝       ╚═╝    ╚═════╝        ╚═╝   ╚═╝  ╚═╝╚══════╝     ╚═════╝ ╚═╝  ╚═══╝╚═╝  ╚═══╝  ╚══════╝╚═╝  ╚═╝╚══════╝╚═╝   ╚═╝      ╚═╝        ╚═════╝ ╚═════╝ ╚═╝     ╚═╝╚═╝      ╚═════╝    ╚═╝   ╚══════╝╚═╝  ╚═╝     ╚═════╝╚══════╝ ╚═════╝ ╚═════╝
  36. +</pre>
  37.  
  38.  <highlight>
  39.     <!--<p><strong>tl;dr?</strong> See a <a href="/branding/logo/webgl/"> HTML5 version of this page </a>. </p> -->
  40. @@ -54,7 +62,7 @@
  41.  <p>
  42.   The University Computer Club is located in Perth, Western Australia on the
  43.   Crawley campus of the <a href="http://www.uwa.edu.au/">University of
  44. - Western Australia</a>. Many students call the UCC home and spend numerous
  45. + Western Australia</a>. Many students call the UCC home and spend numerous
  46.   hours hanging out, working on personal projects,
  47.   gaming, coding and trying to finish assignments in the clubroom.
  48.  </p>
  49. @@ -85,7 +93,7 @@
  50.   <ali href="/infobase/">Information Base</ali>
  51.   <p>
  52.    Most of our information can be found here; including
  53. -  <a href="/infobase/minutes/">committee minutes</a>,
  54. +  <a href="/infobase/minutes/">committee minutes</a>,
  55.    <a href="/infobase/freshguide/">fresher's guides</a>,
  56.    <a href="/infobase/policies/constitution.pdf">our constitution</a>, and
  57.   </p>
  58. @@ -139,7 +147,7 @@
  59.  </p>
  60.  
  61.  <p>
  62. - The University Computer Club Inc. is registered as a charity with the Australian Charities and Not-for-profits Commission ABN 98843368069.
  63. + The University Computer Club Inc. is registered as a charity with the Australian Charities and Not-for-profits Commission ABN 98843368069.
  64.  </p>
  65.  
  66.  </data>
  67. diff --git a/kondo/images/diamond-logo.svg b/kondo/images/diamond-logo.svg
  68. index 4a4969f..c5a64d0 100644
  69. --- a/kondo/images/diamond-logo.svg
  70. +++ b/kondo/images/diamond-logo.svg
  71. @@ -3,7 +3,7 @@
  72.  <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
  73.  <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
  74.      width="200px" height="200px" viewBox="0 0 200 200" enable-background="new 0 0 200 200" xml:space="preserve">
  75. -<rect x="31.191" y="31.193" transform="matrix(0.7071 0.7071 -0.7071 0.7071 99.9079 -41.382)" fill="#B84B06" width="137.429" height="137.428"/>
  76. +<rect x="31.191" y="31.193" transform="matrix(0.7071 0.7071 -0.7071 0.7071 99.9079 -41.382)" fill="#03b6e0" width="137.429" height="137.428"/>
  77.  <g>
  78.     <g>
  79.         <path fill="#FFFFFF" d="M72.931,102.272l11.968,11.966c6.653,6.651,6.653,17.44,0,24.09c-6.652,6.656-17.439,6.656-24.093,0
  80. diff --git a/kondo/styles/page-frame.css b/kondo/styles/page-frame.css
  81. index 9111cf0..70295ec 100644
  82. --- a/kondo/styles/page-frame.css
  83. +++ b/kondo/styles/page-frame.css
  84. @@ -1,84 +1,74 @@
  85.  /* Styles relating to the headers and footers. */
  86. -@font-face
  87. -{
  88. +@font-face {
  89.      font-family: terminal-font;
  90.      src: url(/kondo/fonts/Glass_TTY_VT220.ttf);
  91.  }
  92.  @font-face {
  93. -  font-family: 'document-heading-font';
  94. -  font-style: normal;
  95. -  font-weight: 400;
  96. -  font-display: swap;
  97. -  src: url(/kondo/fonts/MerriweatherSans-Regular.ttf);
  98. +    font-family: 'document-heading-font';
  99. +    font-style: normal;
  100. +    font-weight: 400;
  101. +    font-display: swap;
  102. +    src: url(/kondo/fonts/MerriweatherSans-Regular.ttf);
  103.  }
  104.  @font-face {
  105. -  font-family: 'document-text-font';
  106. -  font-style: normal;
  107. -  font-weight: 400;
  108. -  font-display: swap;
  109. -  src: url(/kondo/fonts/Merriweather-Regular.ttf);
  110. +    font-family: 'document-text-font';
  111. +    font-style: normal;
  112. +    font-weight: 400;
  113. +    font-display: swap;
  114. +    src: url(/kondo/fonts/Merriweather-Regular.ttf);
  115.  }
  116.  @font-face {
  117. -  font-family: 'document-text-font';
  118. -  font-style: normal;
  119. -  font-weight: 700;
  120. -  font-display: swap;
  121. -  src: url(/kondo/fonts/Merriweather-Bold.ttf);
  122. -}
  123. -body
  124. -{
  125. +    font-family: 'document-text-font';
  126. +    font-style: normal;
  127. +    font-weight: 700;
  128. +    font-display: swap;
  129. +    src: url(/kondo/fonts/Merriweather-Bold.ttf);
  130. +}
  131. +body {
  132.      margin: 0;
  133.      padding: 0;
  134.      min-height: 100vh;
  135.      display: flex;
  136.      flex-direction: column;
  137.  }
  138. -main
  139. -{
  140. +main {
  141.      flex: 1 auto;
  142.  }
  143. -#header-area, #header-canvas
  144. -{
  145. +#header-area,
  146. +#header-canvas {
  147.      height: 120px;
  148.  }
  149. -#header-area
  150. -{
  151. -    background-color: #dbd2c3;
  152. +#header-area {
  153. +    background-color: var(--background2);
  154.  }
  155. -#header-canvas
  156. -{
  157. +#header-canvas {
  158.      position: absolute;
  159.      left: 0;
  160.      top: 0;
  161.      width: 100%;
  162.      display: block;
  163.  }
  164. -.footer-container
  165. -{
  166. +.footer-container {
  167.      background-color: #dbd2c3;
  168.      width: 90%;
  169.      min-height: 40px;
  170.      border-top-right-radius: 40px;
  171.  }
  172. -nav.divider-container
  173. -{
  174. +nav.divider-container {
  175.      display: flex;
  176.      flex-direction: row;
  177.  }
  178. -div.divider-light
  179. -{
  180. +div.divider-light {
  181.      height: 15px;
  182. -    background-color: #d47d0c;
  183. +    background-color: var(--primary2);
  184.      flex: 1 auto;
  185.  }
  186. -div.divider-dark
  187. -{
  188. +div.divider-dark {
  189.      height: 15px;
  190. -    background-color: #b84b06;
  191. +    background-color: var(--primary1);
  192.      flex: 5 auto;
  193.  }
  194. -#header-logo
  195. -{
  196. +#header-logo {
  197.      background-image: url(/kondo/images/diamond-logo.svg);
  198.      width: 200px;
  199.      height: 200px;
  200. @@ -86,12 +76,10 @@ div.divider-dark
  201.      right: 50px;
  202.      top: 70px;
  203.  }
  204. -ul.navigation-list
  205. -{
  206. +ul.navigation-list {
  207.      list-style-type: none;
  208.  }
  209. -ul.menu-list
  210. -{
  211. +ul.menu-list {
  212.      display: flex;
  213.      justify-content: space-around;
  214.      align-items: center;
  215. @@ -101,65 +89,64 @@ ul.menu-list
  216.      position: absolute;
  217.      left: 90px;
  218.      right: 90px;
  219. -    top: 0;
  220. +    top: 20px;
  221.      height: 60px;
  222. -    font-family: "terminal-font", sans-serif;
  223. +    font-family: 'terminal-font', sans-serif;
  224.      font-size: 30px;
  225.      line-height: 30px;
  226.      text-transform: uppercase;
  227.  }
  228. -ul.menu-list li
  229. -{
  230. +ul.menu-list li {
  231.      color: #159649;
  232.      display: inline-block;
  233.      padding: 0 10px;
  234.  }
  235. -ul.menu-list a
  236. -{
  237. +ul.menu-list li::after {
  238. +    content: '^';
  239. +    position: relative;
  240. +    top: 1em;
  241. +    left: -50%;
  242. +    color: #159649;
  243. +    display: inline-block;
  244. +}
  245. +ul.menu-list a {
  246.      color: #19bc5b;
  247.      text-decoration: none;
  248.  }
  249. -ul.menu-list a:hover
  250. -{
  251. +ul.menu-list a:hover {
  252.      color: #19bc5b;
  253.      transition: 200ms text-shadow;
  254.      text-shadow: 0px 0px 6px rgba(25, 188, 91, 0.8);
  255.  }
  256. -#menu-area div.selected
  257. -{
  258. +#menu-area div.selected {
  259.      opacity: 0.5;
  260.  }
  261. -.affiliate-logo
  262. -{
  263. +.affiliate-logo {
  264.      opacity: 0.5;
  265.  }
  266. -nav.footer-container
  267. -{
  268. +nav.footer-container {
  269.      margin-top: 4em;
  270.      display: flex;
  271.      align-content: flex-start;
  272.      padding: 20px;
  273.      padding-bottom: 10px;
  274.  }
  275. -nav.footer-container > a, nav.footer-container > div
  276. -{
  277. +nav.footer-container > a,
  278. +nav.footer-container > div {
  279.      padding-right: 20px;
  280.  }
  281. -div.footer-text
  282. -{
  283. +div.footer-text {
  284.      color: black;
  285.      opacity: 0.5;
  286.      max-width: 40em;
  287.  }
  288. -div.footer-text a
  289. -{
  290. +div.footer-text a {
  291.      color: black;
  292.  }
  293.  
  294.  @media only screen and (max-width: 1100px) {
  295.      /* Switch to the tab logo to avoid collisions with content: */
  296. -    #header-logo
  297. -    {
  298. +    #header-logo {
  299.          background-image: url(/kondo/images/tab-logo.svg);
  300.          width: 200px;
  301.          height: 60px;
  302. @@ -171,39 +158,33 @@ div.footer-text a
  303.  
  304.  @media only screen and (max-width: 1000px) {
  305.      /* Increase the header height and make the menu double line: */
  306. -    #header-area, #header-canvas
  307. -    {
  308. +    #header-area,
  309. +    #header-canvas {
  310.          height: 140px;
  311.      }
  312. -    ul.menu-list
  313. -    {
  314. +    ul.menu-list {
  315.          justify-content: flex-start;
  316.          flex-wrap: wrap;
  317.          height: 80px;
  318.      }
  319. -    #header-logo
  320. -    {
  321. +    #header-logo {
  322.          top: 95px;
  323.      }
  324.  }
  325.  
  326.  @media only screen and (max-width: 700px) {
  327.      /* Switch to phone mode: */
  328. -    #header-canvas
  329. -    {
  330. +    #header-canvas {
  331.          display: none;
  332.      }
  333. -    #header-area
  334. -    {
  335. +    #header-area {
  336.          background-color: #4b4b4d;
  337.          height: 160px;
  338.      }
  339. -    #header-logo
  340. -    {
  341. +    #header-logo {
  342.          top: 115px;
  343.      }
  344. -    ul.menu-list
  345. -    {
  346. +    ul.menu-list {
  347.          display: flex;
  348.          align-items: flex-start;
  349.          align-content: flex-start;
  350. @@ -214,12 +195,10 @@ div.footer-text a
  351.          top: auto;
  352.          height: auto;
  353.      }
  354. -    .affiliate-logo
  355. -    {
  356. +    .affiliate-logo {
  357.          height: 75px;
  358.      }
  359. -    nav.footer-container
  360. -    {
  361. +    nav.footer-container {
  362.          flex-wrap: wrap;
  363.      }
  364.  }
  365. diff --git a/kondo/styles/page-typography.css b/kondo/styles/page-typography.css
  366. index 8120057..88d0c38 100644
  367. --- a/kondo/styles/page-typography.css
  368. +++ b/kondo/styles/page-typography.css
  369. @@ -1,106 +1,122 @@
  370.  /* Styles relating to the typography (but not layout) of the main body. */
  371. -body
  372. -{
  373. -    font-family: 'document-text-font', serif;
  374.  
  375. +:root {
  376. +    --primary1: #03b6e0;
  377. +    --primary2: #bed5d2;
  378. +    --secondary1: rgb(85, 199, 70);
  379. +    --secondary2: #0f0;
  380. +    --secondary3: rgb(41, 104, 41);
  381. +    --background: #fbf8e7;
  382. +    --background2: #2c2c2c;
  383. +}
  384. +
  385. +body {
  386. +    font-family: Baritol;
  387. +    background-color: var(--background);
  388.      line-height: 1.6;
  389.      font-size: 16px;
  390. -    color: #1C1C1C;
  391. +    color: #1c1c1c;
  392.  }
  393. -h1, h2, h3, h4, h5, h6
  394. -{
  395. +h1,
  396. +h2,
  397. +h3,
  398. +h4,
  399. +h5,
  400. +h6 {
  401.      font-family: 'document-heading-font', sans-serif;
  402. -    color: #b84b06;
  403. +    color: var(--primary);
  404.      margin: 1em 0;
  405.      line-height: 1.4;
  406.  }
  407. -h1
  408. -{
  409. +h1 {
  410.      margin-bottom: 1.5em;
  411.  }
  412. -h2, h3, h4
  413. -{
  414. +h2,
  415. +h3,
  416. +h4 {
  417.      margin-top: 2em;
  418.  }
  419. -a
  420. -{
  421. -    color: #b84b06;
  422. +a {
  423. +    color: var(--primary1);
  424.  }
  425. -a:visited
  426. -{
  427. -    color: #d47d0c;
  428. +a:visited {
  429. +    color: var(--primary2);
  430.  }
  431. -p
  432. -{
  433. +p {
  434.      margin: 1em 0;
  435.  }
  436. -div.sections-highlight
  437. -{
  438. +div.sections-highlight {
  439.      display: inline-block;
  440. +    font-family: monospace;
  441.      border-radius: 20px;
  442. -    background-color: #dbd2c3;
  443. +    background-color: var(--background2);
  444.      padding: 0.5em 1.5em;
  445. -    color: black;
  446. +    color: var(--secondary1);
  447.      margin: 1em 0;
  448.  }
  449. -hr
  450. -{
  451. +div.sections-highlight a {
  452. +    color: var(--secondary2);
  453. +}
  454. +div.sections-highlight a:visited {
  455. +    color: var(--secondary3);
  456. +}
  457. +hr {
  458.      border: 5px solid #e0e0e0;
  459.      margin: 1.5em 0;
  460.  }
  461. -table
  462. -{
  463. +table {
  464.      border-collapse: collapse;
  465.      margin-top: 1.5em;
  466.      margin-bottom: 1.5em;
  467.      max-width: 60em;
  468.  }
  469. -table td, table th
  470. -{
  471. -   border-top: 1px solid rgba(0, 0, 0, 0.3);
  472. -   padding: 5px;
  473. +table td,
  474. +table th {
  475. +    border-top: 1px solid rgba(0, 0, 0, 0.3);
  476. +    padding: 5px;
  477.      border-bottom: 1px solid rgba(0, 0, 0, 0.3);
  478.  }
  479. -table th
  480. -{
  481. +table th {
  482.      text-align: left;
  483.  }
  484. -table td:not(:first-child), table th:not(:first-child)
  485. -{
  486. -   padding-left: 1.5em;
  487. +table td:not(:first-child),
  488. +table th:not(:first-child) {
  489. +    padding-left: 1.5em;
  490.  }
  491. -.highlight
  492. -{
  493. +.highlight {
  494.      display: inline-block;
  495.      border-radius: 5px;
  496.      padding: 5px 10px;
  497.      background-color: #4b4b4d;
  498.      font-size: 20px;
  499.      line-height: 1.2;
  500. -    color: #F9B700;
  501. +    color: #0095f9;
  502.  }
  503. -.highlight code, .highlight pre
  504. -{
  505. +.highlight code,
  506. +.highlight pre {
  507.      margin: 0;
  508. -    font-family: "terminal-font", sans-serif;
  509. +    font-family: 'terminal-font', sans-serif;
  510.  }
  511.  
  512.  @media only screen and (max-width: 700px) {
  513.      /* Bring the margins in for small displays: */
  514. -    h1, h2, h3, h4, h5, h6
  515. -    {
  516. +    h1,
  517. +    h2,
  518. +    h3,
  519. +    h4,
  520. +    h5,
  521. +    h6 {
  522.          margin: 0.5em 0;
  523.      }
  524. -    h1
  525. -    {
  526. +    h1 {
  527.          margin-bottom: 1em;
  528.      }
  529. -    h2, h3, h4
  530. -    {
  531. +    h2,
  532. +    h3,
  533. +    h4 {
  534.          margin-top: 1em;
  535.      }
  536. -    div.sections-highlight
  537. -    {
  538. +    div.sections-highlight {
  539.          padding: 0.5em 1em;
  540.      }
  541. -}
  542. \ No newline at end of file
  543. +}
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!