Move commons out of the source tree

webis-de · Dec 17, 2019 · c2d383d · c2d383d
1 parent 040a00f
commit c2d383d
Show file tree

Hide file tree

Showing 27 changed files with 58 additions and 2,170 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,8 @@
 .idea/
 _site/
 .sass-cache/
-.jekyll-metadata
+.jekyll-cache/
+.jekyll-metadata/
 .jekyll-cache
 yarn-error.log
 node_modules/

diff --git a/.gitmodules b/.gitmodules
diff --git a/_config.yml b/_config.yml
@@ -10,8 +10,6 @@
 # in the templates via {{ site.myvariable }}.
 
 title: Webis
-baseurl: ""
-url: "https://webis.de"
 
 # Build settings
 markdown: kramdown

diff --git a/_layouts/browser.html b/_layouts/browser.html
@@ -2,7 +2,7 @@
 layout: default
 ---
 
-<script src="/js/browser.js"></script>
+<script src="{{ '/js/browser.js' | relative_url }}"></script>
 
 <main class="uk-margin-medium" data-slidehub="">
 <!-- SlideHub will hook itself as a child element into [data-slidehub] -->

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -6,16 +6,17 @@
     <meta name="description" content="{{ page.description }}">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="copyright" content="&copy; {{site.time | date: '%Y'}} Webis">
-    <link rel="icon" type="image/png" href="{{ '/img/favicon.png' | relative_url }}">
+    <link rel="icon" type="image/png" href="https://assets.webis.de/img/favicon.png">
 
     <link rel="stylesheet" href="{{ '/css/style.css' | relative_url }}?{{site.time | date: '%s'}}">
     {%- for css in page.additional_css %}
     <link rel="stylesheet" href="{{ css | relative_url }}?{{site.time | date: '%s'}}">
     {%- endfor %}
 </head>
 <body class="uk-offcanvas-content">
-<script src="{{ '/commons/js/thirdparty/uikit/uikit.min.js' | relative_url }}"></script>
-<script src="{{ '/commons/js/thirdparty/uikit/uikit-icons.min.js' | relative_url }}"></script>
+<script src="https://assets.webis.de/js/hyphenate/hyphenate.min.js"></script>
+<script src="https://assets.webis.de/js/thirdparty/uikit/uikit.min.js"></script>
+<script src="https://assets.webis.de/js/thirdparty/uikit/uikit-icons.min.js"></script>
 
 <div id="offcanvas-nav" class="mobile-nav" data-uk-offcanvas="overlay: true; flip: true;">
     <div class="uk-offcanvas-bar">
@@ -58,7 +59,7 @@
         <div class="uk-navbar-left">
             <ul class="uk-navbar-nav">
                 <li{% if page.nav_active == "index" %} class="uk-active"{% endif %}>
-                    <a href="{{ '/' | relative_url }}"><img src="{{ '/img/webis-logo.png' | relative_url }}" alt="Webis Logo" class="uk-logo"> Webis.de</a>
+                    <a href="{{ '/' | relative_url }}"><img src="https://assets.webis.de/img/webis-logo.png" alt="Webis Logo" class="uk-logo"> Webis.de</a>
                 </li>
             </ul>
         </div>
@@ -204,8 +205,8 @@ <h5><a href="http://picapica.org/" class="uk-link-heading">Picapica</a></h5>
 
         <div class="uk-align-right@m uk-margin-top">
             &copy; {{site.time | date: '%Y'}} <a href="/">Webis group</a> <span class="uk-padding-small">&bullet;</span>
-            <a href="/people.html">Contact</a> <span class="uk-padding-small">&bullet;</span>
-            <a href="/legal.html">Impressum / Terms / Privacy</a>
+            <a href="{{ '/people.html' | relative_url }}">Contact</a> <span class="uk-padding-small">&bullet;</span>
+            <a href="{{ '/legal.html' | relative_url }}">Impressum / Terms / Privacy</a>
         </div>
     </div>
 </footer>

diff --git a/_sass/_aitools.scss b/_sass/_aitools.scss
@@ -6,7 +6,7 @@
 #webis-aitable ul {
     display: table-cell;
     list-style-type: none;
-    padding: 0px;
+    padding: 0;
 }
 
 #webis-aitable li {

diff --git a/_sass/_index.scss b/_sass/_index.scss
@@ -12,7 +12,11 @@
 }
 
 .cover-background-fade {
-    @extend .uk-position-cover;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
     background: linear-gradient(to bottom, rgba(0, 0, 0, 0.2) 0%, rgba(0, 0, 0, 0.2) 40%, rgba(0, 0, 0, 0.85) 85%);
 }
 
@@ -33,18 +37,3 @@
         height: 50vh;
     }
 }
-
-//.name {
-//    font-weight: lighter;
-//}
-//
-//.people {
-//    .uk-card-body {
-//        padding: 7px;
-//        text-align: center;
-//    }
-//}
-//
-//.people-university {
-//    text-transform: $nav-header-text-transform;
-//}
diff --git a/_sass/_variables.scss b/_sass/_variables.scss
@@ -1,3 +1,20 @@
-// Webis theme variable overrides
+// UIkit variable redefinitions
+// Must be consistent with the original values from _sass/uikit/variables-theme.scss in webis-de-commons
 
-$navbar-breakpoint: 1010px;
+$breakpoint-small: 640px !default;
+$breakpoint-medium: 960px !default;
+$breakpoint-large: 1200px !default;
+$breakpoint-xlarge: 1600px !default;
+
+$global-emphasis-color: #333 !default;
+$text-lead-color: $global-emphasis-color !default;
+$global-muted-color: #999 !default;
+$text-muted-color: $global-muted-color !default;
+
+$global-small-font-size: 0.875rem !default;
+
+
+// Webis Commons variable redefinitions
+// Must be consistent with the original values from _sass/_variables.scss in webis-de-commons
+
+$global-secondary-background: #323232 !default;
diff --git a/commons b/commons
diff --git a/css/style.scss b/css/style.scss
@@ -2,20 +2,16 @@
 # Front matter to ensure Jekyll is processing the file.
 ---
 
-// Variable overrides
-@import "../_sass/variables";
+@import url("https://assets.webis.de/css/style.css?{{site.time | date: '%s'}}");
 
-// Webis styles
-@import "../commons/_sass/main";
-@import "../commons/_sass/prettyprint";
-@import "../commons/_sass/_data_tables";
+// Layout variables
+@import "../_sass/_variables.scss";
 
-// Custom styles
+// Styles
 @import "../_sass/index";
 @import "../_sass/lecturenotes";
 @import "../_sass/nosql_databases";
 @import "../_sass/retrieval-models";
 @import "../_sass/aitools";
 @import "../_sass/tira";
 @import "../_sass/person_resolution";
-
diff --git a/data.html b/data.html
@@ -2650,10 +2650,10 @@ <h1>Data</h1>
 </div>
 </main>
 
-<script src="/commons/js/thirdparty/jquery/jquery.slim.min.js"></script>
-<script src="/commons/js/table-sorting.js"></script>
-<script src="/commons/js/thirdparty/fontawesome/fontawesome.min.js"></script>
-<script src="/commons/js/thirdparty/fontawesome/solid.min.js"></script>
-<script src="/js/filter.js"></script>
-<script src="/js/filter-data.js"></script>
+<script src="https://assets.webis.de/js/thirdparty/jquery/jquery.slim.min.js"></script>
+<script src="https://assets.webis.de/js/table-sorting.js"></script>
+<script src="https://assets.webis.de/js/thirdparty/fontawesome/fontawesome.min.js"></script>
+<script src="https://assets.webis.de/js/thirdparty/fontawesome/solid.min.js"></script>
+<script src="{{ '/js/filter.js' | relative_url }}"></script>
+<script src="{{ '/js/filter-data.js' | relative_url }}"></script>
 
diff --git a/events.html b/events.html
@@ -541,5 +541,5 @@ <h2><a id="puk-workshop-series"></a>PuK Workshop Series on Configuration and Des
 </div>
 </main>
 
-<script src="/js/filter.js"></script>
-<script src="/js/filter-paragraphs.js"></script>
+<script src="{{ '/js/filter.js' | relative_url }}"></script>
+<script src="{{ '/js/filter-paragraphs.js' | relative_url }}"></script>
diff --git a/facilities.html b/facilities.html
@@ -423,5 +423,5 @@ <h2><a id="website-maintenance"></a>Website Maintenance<a href="#footnote-access
 </div> <!-- container -->
 </main>
 
-<script src="/js/filter.js"></script>
-<script src="/js/filter-list.js"></script>
+<script src="{{ '/js/filter.js' | relative_url }}"></script>
+<script src="{{ '/js/filter-list.js' | relative_url }}"></script>
diff --git a/for-students/completed-theses.html b/for-students/completed-theses.html
@@ -22,5 +22,5 @@ <h1><a href="../for-students.html">For Students</a> <span data-uk-icon="chevron-
 </div>
 </main>
 
-<script src="/js/bibentry.js"></script>
-<script src="/js/bibentry-webis-de.js"></script>
+<script src="{{ '/js/bibentry.js' | relative_url }}"></script>
+<script src="{{ '/js/bibentry-webis-de.js' | relative_url }}"></script>
diff --git a/img/favicon.png b/img/favicon.png
diff --git a/img/webis-logo-gray.png b/img/webis-logo-gray.png
diff --git a/img/webis-logo-gray.svg b/img/webis-logo-gray.svg
diff --git a/img/webis-logo-teal.png b/img/webis-logo-teal.png
diff --git a/img/webis-logo-teal.svg b/img/webis-logo-teal.svg
diff --git a/img/webis-logo-white.png b/img/webis-logo-white.png
diff --git a/img/webis-logo-white.svg b/img/webis-logo-white.svg
diff --git a/img/webis-logo.ai b/img/webis-logo.ai
diff --git a/img/webis-logo.png b/img/webis-logo.png
diff --git a/lecturenotes.html b/lecturenotes.html
@@ -2935,5 +2935,5 @@ <h1>Lecturenotes</h1>
 </div>
 </main>
 
-<script src="/js/filter.js"></script>
-<script src="/js/filter-lecturenotes.js"></script>
+<script src="{{ '/js/filter.js' | relative_url }}"></script>
+<script src="{{ '/js/filter-lecturenotes.js' | relative_url }}"></script>
diff --git a/publications.html b/publications.html
@@ -22,5 +22,5 @@ <h1>Publications</h1>
 </div>
 </main>
 
-<script src="/js/bibentry.js"></script>
-<script src="/js/bibentry-webis-de.js"></script>
+<script src="{{ '/js/bibentry.js' | relative_url }}"></script>
+<script src="{{ '/js/bibentry-webis-de.js' | relative_url }}"></script>
diff --git a/research.html b/research.html
@@ -480,5 +480,5 @@ <h2><a id="software-engineering-and-tool-development"></a>Software Engineering a
 </div>
 </main>
 
-<script src="/js/filter.js"></script>
-<script src="/js/filter-list.js"></script>
+<script src="{{ '/js/filter.js' | relative_url }}"></script>
+<script src="{{ '/js/filter-list.js' | relative_url }}"></script>