Skip to content

Commit

Permalink
Merge pull request #116 from RRZE-Webteam/dev
Browse files Browse the repository at this point in the history
Version 1.11
  • Loading branch information
xwolfde authored Jun 21, 2019
2 parents 2c67c84 + be11518 commit f516bf9
Show file tree
Hide file tree
Showing 140 changed files with 7,536 additions and 33,263 deletions.
11 changes: 2 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@ GNU General Public License (GPL) Version 2
License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
* Font Roboto, https://www.fontsquirrel.com/license/roboto
Apache License, Version 2.0, January 2004
* fancyBox v2.1.5 fancyapps.com
* jQuery carouFredSel 6.2.1, https://dev7studios.com/
* Slick Slider v1.9
* hoverIntent v1.8.0
* Bootstrap 3.3.7, http://getbootstrap.com/


Expand Down Expand Up @@ -61,9 +58,5 @@ dagegen im Unterverzeichnis ```/css``` abfelegt.
Eingabequelle: ```/css/sass/```
Ausgabeort: ```/css```

Mit Compiler-Option soll im prdokutiven Betrieb die erzeigte CSS-Datei kompimiert
sein. Außerdem sind Source-Map Dateien nicht benötigt. Die dafür notwendige
Compiler-Argumente sind daher ```--style compressed --sourcemap=none```



Mit der Compiler-Option ```--style compressed``` soll im produktiven Betrieb die
erzeugte CSS-Datei komprimiert sein. Source-Map Dateien werden nicht benötigt.
134 changes: 67 additions & 67 deletions archive-person.php
Original file line number Diff line number Diff line change
@@ -1,67 +1,67 @@
<?php
/**
* The main template file.
*
* @package WordPress
* @subpackage FAU
* @since FAU 1.0
*/

get_header();

$posttype = get_post_type();
get_template_part('template-parts/hero', 'index');
$active_sidebar = false;
?>

<div id="content">
<div class="container">

<div class="row">
<?php if ( is_active_sidebar( 'search-sidebar' ) ) {
// add sidebar and nest content in sub-row
$active_sidebar = 1; ?>
<div class="search-sidebar">
<?php dynamic_sidebar( 'search-sidebar' ); ?>
</div>
<div class="search-resultnested">
<div class="row">

<?php } ?>
<div class="col-xs-12">
<main>
<h1 class="screen-reader-text"><?php echo __('Index','fau'); ?></h1>
<?php

while ( have_posts() ) {
the_post();
echo FAU_Person_Shortcodes::fau_person(array("id"=> $post->ID, 'format' => 'kompakt', 'showlink' => 1));
} ?>

<nav class="navigation">
<div class="nav-previous"><?php previous_posts_link(__('<span class="meta-nav">&laquo;</span> Vorherige Einträge', 'fau')); ?></div>
<div class="nav-next"><?php next_posts_link(__('Weitere Einträge <span class="meta-nav">&raquo;</span>', 'fau'), '' ); ?></div>
</nav>

</main>
</div>
<?php if ( is_active_sidebar( 'search-sidebar' ) ) { ?>
</div>
</div>
<?php } ?>

</div>

<?php if(get_post_type() == 'post') {
get_template_part('template-parts/sidebar', 'news');
} ?>
</div>
</div>

</div>


<?php
get_template_part('template-parts/footer', 'social');
get_footer();

<?php
/**
* The main template file.
*
* @package WordPress
* @subpackage FAU
* @since FAU 1.0
*/

get_header();

$posttype = get_post_type();
get_template_part('template-parts/hero', 'index');
$active_sidebar = false;
?>

<div id="content">
<div class="container">

<div class="row">
<?php if ( is_active_sidebar( 'search-sidebar' ) ) {
// add sidebar and nest content in sub-row
$active_sidebar = 1; ?>
<div class="search-sidebar">
<?php dynamic_sidebar( 'search-sidebar' ); ?>
</div>
<div class="search-resultnested">
<div class="row">

<?php } ?>
<div class="col-xs-12">
<main id="droppoint">
<h1 class="screen-reader-text"><?php echo __('Index','fau'); ?></h1>
<?php

while ( have_posts() ) {
the_post();
echo FAU_Person_Shortcodes::fau_person(array("id"=> $post->ID, 'format' => 'kompakt', 'showlink' => 1));
} ?>

<nav class="navigation">
<div class="nav-previous"><?php previous_posts_link(__('<span class="meta-nav">&laquo;</span> Vorherige Einträge', 'fau')); ?></div>
<div class="nav-next"><?php next_posts_link(__('Weitere Einträge <span class="meta-nav">&raquo;</span>', 'fau'), '' ); ?></div>
</nav>

</main>
</div>
<?php if ( is_active_sidebar( 'search-sidebar' ) ) { ?>
</div>
</div>
<?php } ?>

</div>

<?php if(get_post_type() == 'post') {
get_template_part('template-parts/sidebar', 'news');
} ?>
</div>
</div>

</div>


<?php
get_template_part('template-parts/footer', 'social');
get_footer();
4 changes: 2 additions & 2 deletions css/admin.css

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions css/base.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions css/editor-style.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions css/gutenberg.css

Large diffs are not rendered by default.

66 changes: 37 additions & 29 deletions css/sass/_printer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}



abbr[title]:after {
content: " (" attr(title) ")";
}
Expand Down Expand Up @@ -52,39 +52,40 @@
display: table-header-group;
}
}
th,
td,
li,
.social,
p {

a[href]::after {
content: " (" attr(href) ")";
color: $colorPrintMain;
background-color: inherit;
font-style: italic;
size: 80%;
}
a[href^="#"]:after {
display: none;
}
main {
th,
td,
li,
.social,
p {

a {
text-transform: inherit;
word-wrap: break-word;
color: $colorPrintMainLinks;
}
.meta-footer,
.person-info,
.event-time,
article {
a[href]::after {
content: " (" attr(href) ")";
color: $colorPrintMain;
background-color: inherit;
font-style: italic;
size: 80%;
}
a[href^="#"]:after {
content: "";
display: none;
}
}

a {
text-transform: inherit;
word-wrap: break-word;
color: $colorPrintMainLinks;
}
.meta-footer,
.person-info,
.event-time,
article {
a[href^="#"]:after {
content: "";
}
}

}
}

/**
* Making intergated videos disappear, and removing the iframes' whitespace to zero.
*/
Expand Down Expand Up @@ -146,6 +147,9 @@
display: none;
}
}


#wpadminbar,
.widget_archive,
.widget widget_nav_menu,
.widget_categories,
Expand Down Expand Up @@ -201,6 +205,10 @@
.footer-logo {
margin-top: 10px;
}

.socialmedia {
display: none;
}
}
footer:before {
content: 'Hinweis: Interaktive Teile der Webseite sind im Druck nicht sichbar. Bitte schonen Sie die Umwelt und vermeiden unnötige Ausdrücke.';
Expand Down
34 changes: 0 additions & 34 deletions css/sass/_reset.scss
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,6 @@ input {
line-height: normal;
}

button::-moz-focus-inner,
input::-moz-focus-inner {
padding: 0;
border: 0;
}

button,
html input[type="button"],
input[type="reset"],
Expand All @@ -100,8 +94,6 @@ input[type="checkbox"] {
}

input[type="search"] {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
-webkit-appearance: textfield;
}
Expand Down Expand Up @@ -164,18 +156,10 @@ h5,
h6 {
margin: 20px 0 20px 0;
font-family: inherit;
font-weight: normal;
line-height: 20px;
text-rendering: optimizelegibility;
}


ul,
ol {
padding: 0;
}


dl {
margin-bottom: 20px;
}
Expand Down Expand Up @@ -309,7 +293,6 @@ input[type="color"] {
color: #555555;
vertical-align: middle;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}

Expand Down Expand Up @@ -340,10 +323,8 @@ input[type="color"] {
background-color: #ffffff;
border: 1px solid #cccccc;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-moz-transition: border linear 0.2s, box-shadow linear 0.2s;
-o-transition: border linear 0.2s, box-shadow linear 0.2s;
transition: border linear 0.2s, box-shadow linear 0.2s;
}
Expand Down Expand Up @@ -397,20 +378,6 @@ input[type="checkbox"]:focus {
outline-offset: -2px;
}

input:-moz-placeholder,
textarea:-moz-placeholder {
color: #999999;
}

input:-ms-input-placeholder,
textarea:-ms-input-placeholder {
color: #999999;
}

input::-webkit-input-placeholder,
textarea::-webkit-input-placeholder {
color: #999999;
}

input,
textarea {
Expand Down Expand Up @@ -446,7 +413,6 @@ textarea:focus:invalid:focus,
select:focus:invalid:focus {
border-color: #e9322d;
-webkit-box-shadow: 0 0 6px #f8b9b7;
-moz-box-shadow: 0 0 6px #f8b9b7;
box-shadow: 0 0 6px #f8b9b7;
}

Loading

0 comments on commit f516bf9

Please sign in to comment.