Skip to content

Commit

Permalink
Merge pull request #39 from RRZE-Webteam/dev
Browse files Browse the repository at this point in the history 
Upgrade auf Version 1.6.3
  • Loading branch information
@xwolfde
xwolfde authored Aug 5, 2016
2 parents 8b4edeb + 979c8af commit 09294f9
Show file tree
Hide file tree
Showing 20 changed files with 521 additions and 318 deletions.
2 changes: 1 addition & 1 deletion 401.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<?php _e('Leider ist Ihre Anmeldung fehlgeschlagen.','fau'); ?>
</p>
<div class="row">
<div class="span4 offset2"><img src="<?php echo fau_get_template_uri(); ?>/img/friedrich-alexander.gif" alt="" class="error-404-persons"></div>
<div class="span4 offset2"><img src="<?php echo fau_get_template_uri(); ?>/img/friedrich-alexander.gif" width="227" height="169" alt="" class="error-404-persons"></div>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 403.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<?php _e('Leider dürfen Sie auf diese Seite nicht zugreifen.','fau'); ?>
</p>
<div class="row">
<div class="span4 offset2"><img src="<?php echo fau_get_template_uri(); ?>/img/friedrich-alexander.gif" alt="" class="error-404-persons"></div>
<div class="span4 offset2"><img src="<?php echo fau_get_template_uri(); ?>/img/friedrich-alexander.gif" width="227" height="169" alt="" class="error-404-persons"></div>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 404.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<?php _e('Die von Ihnen aufgerufene Seite existiert nicht oder ihre Adresse hat sich durch Änderungen an der Seitenstruktur geändert.','fau'); ?>
</p>
<div class="row">
<div class="span4 offset2"><img src="<?php echo fau_get_template_uri(); ?>/img/friedrich-alexander.gif" alt="" class="error-404-persons"></div>
<div class="span4 offset2"><img src="<?php echo fau_get_template_uri(); ?>/img/friedrich-alexander.gif" width="227" height="169" alt="" class="error-404-persons"></div>
</div>
</div>
<div class="span6">
Expand Down
2 changes: 1 addition & 1 deletion css/base.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/editor-style.css
View file

Large diffs are not rendered by default.

105 changes: 104 additions & 1 deletion css/sass/_base-atoms.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ p {
line-height: 28px;
padding: 4px 0 22px 0;
}
&.notice-hinweis,
&.hinweis {
margin: 0;
padding: 22px 0;
Expand All @@ -80,8 +81,11 @@ p {
padding-right: 8px;
font-weight: normal;
vertical-align: -4px;
min-width: 24px;
}
}

&.notice-attention,
&.attention {
display: block;
color: $colorNotice;
Expand All @@ -96,8 +100,10 @@ p {
padding-right: 8px;
font-weight: normal;
vertical-align: -4px;
min-width: 24px;
}
}
&.notice-baustelle,
&.baustelle {
display: block;
color: $colorText;
Expand All @@ -108,12 +114,14 @@ p {
&:before {
@extend .fa;
@extend .fa-2x;
@extend .fa-cogs;
@extend .fa-wrench;
padding-right: 8px;
font-weight: normal;
vertical-align: -4px;
min-width: 24px;
}
}
&.notice-question,
&.question {
display: block;
color: $colorText;
Expand All @@ -128,8 +136,10 @@ p {
padding-right: 8px;
font-weight: normal;
vertical-align: -4px;
min-width: 24px;
}
}
&.notice-minus,
&.minus {
display: block;
color: $colorText;
Expand All @@ -144,8 +154,10 @@ p {
padding-right: 8px;
font-weight: normal;
vertical-align: -4px;
min-width: 24px;
}
}
&.notice-plus,
&.plus {
display: block;
color: $colorText;
Expand All @@ -160,9 +172,99 @@ p {
padding-right: 8px;
font-weight: normal;
vertical-align: -4px;
min-width: 24px;
}
}
&.notice-tipp {
display: block;
color: $colorText;
padding: 10px 0;
margin: 20px 0;
font-weight: bold;

&:before {
color: orange;
@extend .fa;
@extend .fa-2x;
@extend .fa-lightbulb-o;
padding-right: 8px;
font-weight: normal;
vertical-align: -4px;
min-width: 24px;
}
}
&.notice-faubox {
display: block;
color: $colorText;
padding: 10px 0;
margin: 20px 0;

&:before {
color: $PalettonDunkler;
@extend .fa;
@extend .fa-2x;
@extend .fa-cloud-download;
padding-right: 8px;
font-weight: normal;
vertical-align: -4px;
min-width: 24px;
}
}
&.notice-video {
display: block;
color: $colorText;
padding: 10px 0;
margin: 20px 0;

&:before {
color: $PalettonDunkler;
@extend .fa;
@extend .fa-2x;
@extend .fa-youtube-play;
padding-right: 8px;
font-weight: normal;
vertical-align: -4px;
min-width: 24px;
}
}
&.notice-audio {
display: block;
color: $colorText;
padding: 10px 0;
margin: 20px 0;

&:before {
color: $PalettonDunkler;
@extend .fa;
@extend .fa-2x;
@extend .fa-music;
padding-right: 8px;
font-weight: normal;
vertical-align: -4px;
min-width: 24px;
}
}
&.notice-download {
display: block;
color: $colorText;
padding: 10px 0;
margin: 20px 0;

&:before {
color: $PalettonDunkler;
@extend .fa;
@extend .fa-2x;
@extend .fa-download;
padding-right: 8px;
font-weight: normal;
vertical-align: -4px;
min-width: 24px;
}
}




#content .span4 .widget &,
#content .sidebar-inline .widget & {
font-size: 13px;
Expand Down Expand Up @@ -378,6 +480,7 @@ hr {




blockquote {
padding: 0;
margin: 0;
Expand Down
33 changes: 33 additions & 0 deletions css/sass/_base-molecules.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,24 @@ ul.person-info {
background-repeat: no-repeat;
background-position: left center;


ul {
li {
list-style-type: disc;
li {
list-style-type: circle;
}
}
}
ol {
li {
list-style-type: decimal;
li {
list-style-type: circle;
}
}
}

}


Expand Down Expand Up @@ -1515,6 +1533,21 @@ ul.tagcloud {
h1, h2, h3, h4, h5, h6 {
color: $colorText;
}
hr {
&::after,
&::before {
bottom: inherit;
background: inherit;
left: inherit;
position: relative;
right: inherit;
top: inherit;
}
border: 1px solid $PalettonHellste;
margin: 30px 20px;
height: inherit;
}


& > .accordion {
.accordion-heading .accordion-toggle {
Expand Down
5 changes: 3 additions & 2 deletions css/sass/_base-organisms.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
&:hover,
&:focus {
background-color: white;
}
color: $colorPrimary;
}

}
}
Expand Down Expand Up @@ -834,7 +835,7 @@

img.error-404-persons {
@include box-shadow(none);
margin: 0 auto -22px auto;
margin: 0 auto;
display: block;
}

Expand Down
7 changes: 5 additions & 2 deletions css/sass/_mediaqueries.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -982,13 +982,16 @@ Media Queries for Theme FAU-Einrichtungen
}


@media (min-height: 480px) {
#wrap { min-height: 480px;}
}

@media (min-height: 900px) {
#wrap { min-height: 670px;}
#wrap { min-height: 700px;}
}

@media (min-height: 1000px) {
#wrap { min-height: 770px;}
#wrap { min-height: 800px;}
}

@media (min-height: 1100px) {
Expand Down
8 changes: 1 addition & 7 deletions css/sass/_plugin-misc.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,7 @@ Anpassungen der gestaltung an verschiedene Plugins
*/


/* Anpassungen für Sharif-Plugin */
.shariff {
li {
@include no-list;
margin-right: 14px;
}
}



/* Social Media Buttons */
Expand Down
2 changes: 1 addition & 1 deletion css/sass/_variables.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Konstante fuer das Design
$farbfamilie: 'nat';
$farbfamilie: 'nat';
// med, phil, nat, rw, tf, zuv


Expand Down
16 changes: 2 additions & 14 deletions functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,10 @@ function fau_register_scripts() {
global $defaultoptions;

wp_register_script( 'fau-scripts', $defaultoptions['src-scriptjs'], array('jquery'), $defaultoptions['js-version'], true );
wp_register_script( 'fau-libs-plugins', $defaultoptions['src-pluginsjs'], array('jquery'), $defaultoptions['js-version'], true );
// Anpassungen für Plugins

wp_register_script( 'fau-libs-jquery-flexslider', get_fau_template_uri() . '/js/libs/jquery.flexslider.js', array('jquery'), $defaultoptions['js-version'], true );
// Flexslider für Startseite und für Galerien.
wp_register_script( 'fau-libs-jquery-hoverintent', get_fau_template_uri() . '/js/libs/jquery.hoverintent.js', array(), $defaultoptions['js-version'], true );
// Fancybox
wp_register_script( 'fau-libs-jquery-fancybox', get_fau_template_uri() . '/js/libs/jquery.fancybox.js', array('jquery'), $defaultoptions['js-version'], true );
// Fuer bessere Lightboxen

wp_register_script( 'fau-libs-jquery-caroufredsel', get_fau_template_uri() . '/js/libs/jquery.caroufredsel.js', array('jquery'), $defaultoptions['js-version'], true );
wp_register_script( 'fau-js-caroufredsel', get_fau_template_uri() . '/js/usecaroufredsel.min.js', array('jquery','fau-libs-jquery-caroufredsel'), $defaultoptions['js-version'], true );
// Slidende Logos
Expand All @@ -188,15 +184,7 @@ function fau_basescripts_styles() {
global $usejslibs;
wp_enqueue_style( 'fau-style', get_stylesheet_uri(), array(), $defaultoptions['js-version'] );
wp_enqueue_script( 'fau-scripts');
wp_enqueue_script( 'fau-libs-plugins' );

wp_enqueue_script('fau-libs-jquery-hoverintent');
// wird für die Navigationen mit <nav> verwendet

wp_enqueue_script('fau-libs-jquery-fancybox');
// wird für Bilder verwendet, die mit Lightbox vergrößert werden,
// dazu muss bei dem Bild eine Klasse .lightbox im Link gesetzt
// werden: <a class="lightbox" ..>
}
add_action( 'wp_enqueue_scripts', 'fau_basescripts_styles' );

Expand Down
2 changes: 1 addition & 1 deletion functions/constants.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Default Constants and values
*/
$defaultoptions = array(
'js-version' => '1.5',
'js-version' => '1.6',
// Theme-Versionslinie
'website_type' => 1,
// website_type:
Expand Down
Loading

0 comments on commit 09294f9

Please sign in to comment.