Merge pull request #722 from RRZE-Webteam/beta

Beta

.gitignore

@@ -6,4 +6,5 @@ img/logos/Browse.plb
 node_modules
 .idea*
 .sass-cache*
-/package-lock.json
+/package-lock.json
+tmp

attachment.php

@@ -22,9 +22,6 @@
 				    <?php 
 
 				    echo wp_get_attachment_image( $post->ID, 'full' );
-				    echo '<p class="auszug">';
-				    the_excerpt();
-				    echo "</p>\n";
 				    the_content();
 
 				    $imgdata = fau_get_image_attributs($post->ID);
@@ -33,26 +30,26 @@
 
 				    if ( is_user_logged_in() ) {
 					echo '<p class="attention">'.__('Die folgenden Informationen werden nur für angemeldete Benutzer des CMS angezeigt:','fau').'</p>';
-					echo "<h3>Attribute</h3>";
+					echo "<h2>Attribute</h2>";
 
 					echo fau_array2table($imgdata);
 
 
 					if (isset($meta) && isset($meta['_wp_attachment_metadata']) && is_array($meta['_wp_attachment_metadata'])) { 
 					    $data = unserialize($meta['_wp_attachment_metadata'][0]);
 					    if (isset($data['image_meta'])) {    
-						echo "<h3>Metadaten</h3>";
+						echo "<h2>Metadaten</h2>";
 						echo fau_array2table($data['image_meta']);
 					    }
-					    echo "<h3>Verfügbare Auflösungen</h3>\n";
+					    echo "<h2>Verfügbare Auflösungen</h2>\n";
 					    echo fau_array2table($data['sizes']);
 					}
 
 				     echo '<p class="hinweis">'.__('Die folgenden Informationen werden öffentlich angezeigt:','fau').'</p>';
 				    }
 				    ?>
 
-					<h3>Daten zum Bild</h3>
+					<h2>Daten zum Bild</h2>
 
 					<table>
 					    <tr>

comments.php

@@ -1,12 +1,16 @@
 <?php 
 global $options;
 
+?>
+<h2 id="comments-title"><?php _e("Kommentare", 'fau'); ?></h2>
+
+<?php
 if ( post_password_required() ) : ?>
     <p><?php _e("Dieser Eintrag ist mit einem Passwort geschützt. Bitte geben Sie das Passwort ein, um ihn freizuschalten.", 'fau'); ?></p>
     <?php return;
 endif; 
 if ( have_comments() ) : ?>
-    <h2 id="comments-title"><?php _e("Kommentare", 'fau'); ?></h2>
+
 
     <?php if (isset($options['advanced_comments_disclaimer'])) {
 	echo '<p class="attention">'.$options['advanced_comments_disclaimer'] .'</p>'."\n";

css/sass/_reset.scss

@@ -121,7 +121,6 @@ h5,
 h6 {
 	margin: 20px 0 20px 0;
 	font-family: inherit;
-	text-rendering: optimizelegibility;
 }
 
 

css/sass/_variables.scss

@@ -111,7 +111,7 @@ $colorPrintMainLinks: $colorText;
 	$PalettonHellste: #dde5f0;
 	$PalettonHeller: #8fb1ef;
 	$PalettonDunkler: #24598f;
-	$PalettonDunkelste: #1f4c7a;
+	$PalettonDunkelste: #1f4b7a;
 	$siegelurl: './img/siegel-zuv-schnitt.png';
 
 }
@@ -141,9 +141,11 @@ $colorOverlayDark: rgba(0, 0, 0, 0.15);
 // Vorschlag von https://github.com/SebastianHonert/FAU-Einrichtungen/commit/762a7ab636090006af98d4fc502e8e12359c711e#diff-0cecaa3634e3ebf71c0b473a183dff42
 // Mit passenden Variablennamen versehen.
 
-$colorButton: desaturate(lighten($colorPrimary, 5%), 40%); // $PalettonDunkelste;
-$colorButtonBackground: $colorLightest;
-$colorButtonBackgroundHover: darken($colorButtonBackground, 5%);
+
+$colorButtonBackground: $colorPrimary;
+$colorButton: #fff;
+$colorButtonBackgroundHover: $PalettonDunkler;
+
 
 $colorSearchPlaceholder: #111;
 $colorSearchInput: #000;

css/sass/elements/_devider.scss

@@ -33,7 +33,7 @@ hr {
 
 	&.line {
 	    height: 1px;
-	    @include linear-gradient-three(transparent 0%,$colorStandardHellgrau 50%,transparent 100%);  
+	    @include linear-gradient-three(transparent,$colorStandardHellgrau 50%,transparent);  
 	}
 	&.line.big {
 	     margin-bottom: 60px

css/sass/elements/_general-classes.scss

@@ -23,14 +23,6 @@
 	clear: both;
 }
 
-.hide-text {
-	font: 0/0 a;
-	color: transparent;
-	text-shadow: none;
-	background-color: transparent;
-	border: 0;
-}
-
 .input-block-level {
 	display: block;
 	width: 100%;
@@ -205,4 +197,51 @@ div.aligncenter {
 
 .bgcol-grau {
     background-color: $colorStandardHellgrau;
-}
+}
+
+
+/* Rahmen */
+
+
+.example {
+    padding: 20px 10px 5px 10px;
+    position: relative;
+    margin: 40px 20px;
+    border-radius: 2px;
+}
+
+.example::before {
+    content: "";
+    position: absolute;
+    top: -0.8rem;
+    left: -10px;
+    right: -10px;
+    bottom: -10px;
+    border: 1px dashed #777;
+    border-radius: 3px;
+}
+
+.example::after {
+    content: "Beispiel";
+    font-family: sans-serif;
+    text-transform: uppercase;
+    color: #666;
+    font-weight: 700;
+    top: -1.7rem;
+    right: 10px;
+    padding: 3px 10px;
+    font-size: 0.8rem;
+    position: absolute;
+    z-index: 1;
+    background: white;
+    border: 1px dashed #777;
+}
+
+:lang(en) .example:after {
+    content: 'Example';
+}
+
+.example[title]:after {
+    content:  attr(title);
+}
+

css/sass/elements/_pagination.scss

@@ -33,7 +33,7 @@
 		}
 		.number {
 
-
+		    color: $colorButton;
 		    background: $colorButtonBackground;
 		    border: 1px solid $colorButtonBackground;
 
@@ -45,7 +45,7 @@
 		border: 1px solid $colorContentBorders;
 		padding: 6px 10px;
 		text-decoration: none;
-		color: $colorButton;
+		// color: $colorButton;
 		@include border-radius(3px);
 		@include px2rem($font-size-textbuttons);
 

css/sass/elements/_quotes.scss

@@ -155,15 +155,8 @@ acronym[title],
 acronym[data-original-title],
 abbr[title],
 abbr[data-original-title] {
-    font-style: italic;
     cursor: help;
-    border-bottom: 1px dotted $colorPrimary;
     text-decoration: none; 
-
-    &:hover, &:focus {
-	background: $colorPrimary;
-	color: $colorPrimaryContrast;
-    }
 }
 acronym.initialism,
 abbr.initialism {

css/sass/elements/_tables.scss

@@ -76,6 +76,10 @@ table {
 		border-bottom: 1px solid $colorContentBorders;
 		text-align: left;
 
+		h1, h2, h3, h4, h5, h6 {
+		    color: $PalettonDunkler;
+		}
+
 
 	}
 	&.sorttable th.header {
@@ -101,6 +105,11 @@ table {
 		color:  $colorLightestContrast;
 		background: $colorStandardHellgrau;
 
+		h1, h2, h3, h4, h5, h6 {
+		    color: $PalettonDunkler;
+		}
+
+
 		ul {
 		    li {
 			color:  $colorLightestContrast;

css/sass/fonts/_awesome.scss

@@ -10,7 +10,7 @@
 	     font-weight: normal; 
 	     font-style: normal; 
 }
-.fa { display: inline-block; font: normal normal normal 14px/1 FontAwesome; font-size: inherit; text-rendering: auto; }
+.fa { display: inline-block; font: normal normal normal 14px/1 FontAwesome; font-size: inherit; }
 
 /* makes the font 33% larger relative to the icon container */
 .fa-lg { font-size: 1.33333em; line-height: 0.75em; vertical-align: -15%; }

css/sass/frameworks/bootstrap/_alerts.scss

@@ -8,7 +8,6 @@
 
 .alert {
   padding: $alert-padding;
-  margin-bottom: $line-height-computed;
   border: 1px solid transparent;
   border-radius: $alert-border-radius;
 

css/sass/frameworks/bootstrap/_buttons.scss

@@ -54,12 +54,6 @@
   // [converter] extracted a& to a.btn
 }
 
-a.btn {
-  &.disabled,
-  fieldset[disabled] & {
-    pointer-events: none; // Future-proof disabling of clicks on `<a>` elements
-  }
-}
 
 
 // Alternate buttons

css/sass/frameworks/bootstrap/_mixins.scss

@@ -2,9 +2,9 @@
 // --------------------------------------------------
 
 // Utilities
-@import "mixins/hide-text";
+// @import "mixins/hide-text";
 @import "mixins/opacity";
-@import "mixins/image";
+// @import "mixins/image";
 @import "mixins/labels";
 @import "mixins/reset-filter";
 @import "mixins/resize";

css/sass/frameworks/bootstrap/_scaffolding.scss

@@ -47,34 +47,6 @@ figure {
 }
 
 
-// Images
-
-// Responsive images (ensure images don't scale beyond their parents)
-.img-responsive {
-	@include img-responsive;
-}
-
-
-// Image thumbnails
-//
-// Heads up! This is mixin-ed into thumbnails.less for `.thumbnail`.
-.img-thumbnail {
-	padding: $thumbnail-padding;
-	line-height: $line-height-base;
-	background-color: $thumbnail-bg;
-	border: 1px solid $thumbnail-border;
-	border-radius: $thumbnail-border-radius;
-	@include transition(all .2s ease-in-out);
-
-	// Keep them at most 100% wide
-	@include img-responsive(inline-block);
-}
-
-// Perfect circle
-.img-circle {
-	border-radius: 50%; // set radius in percents
-}
-
 // iOS "clickable elements" fix for role="button"
 //
 // Fixes "clickability" issue (and more generally, the firing of events such as focus as well)

css/sass/frameworks/bootstrap/_type.scss

@@ -66,22 +66,11 @@ mark,
 @include bg-variant('.bg-danger', $state-danger-bg);
 
 
-// Page header
-// -------------------------
-
-.page-header {
-  padding-bottom: (($line-height-computed / 2) - 1);
-  margin: ($line-height-computed * 2) 0 $line-height-computed;
-  border-bottom: 1px solid $page-header-border-color;
-}
-
-
 
 
 // Description Lists
 dl {
   margin-top: 0; // Remove browser default
-  margin-bottom: $line-height-computed;
 }
 dt,
 dd {

css/sass/frameworks/bootstrap/mixins/_buttons.scss

@@ -59,7 +59,5 @@
 // Button sizes
 @mixin button-size($padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) {
   padding: $padding-vertical $padding-horizontal;
-  font-size: $font-size;
-  line-height: $line-height;
   border-radius: $border-radius;
 }

css/sass/frameworks/slick/_slick-default.scss

@@ -21,7 +21,6 @@
 
     &.dragging {
         cursor: pointer;
-        cursor: hand;
     }
 }
 .slick-slider .slick-track,
@@ -67,9 +66,6 @@
 
     display: none;
 
-    &.dragging img {
-        pointer-events: none;
-    }
 
     .slick-initialized & {
         display: block;

css/sass/mixins/_mixins.scss

@@ -42,7 +42,7 @@ Mixins File for Wordpress Theme FAU
 }
 @mixin linear-gradient-three($fromColor, $toColor, $nextColor) {
     background-color: $fromColor; /* Fallback Color */
-      background-image: linear-gradient(to right, $fromColor, $toColor,$nextColor);
+    background-image: linear-gradient(to right, $fromColor, $toColor,$nextColor);
 }
 @mixin linear-top-gradient-three($fromColor, $toColor, $nextColor) {
     background-color: $fromColor; /* Fallback Color */
@@ -156,6 +156,7 @@ Mixins File for Wordpress Theme FAU
 	@include border-radius(3px);
 	@include px2rem($font-size-textbuttons);
 
+	color: $colorButton;
 	background: $colorButtonBackground;
 	padding: 6px 10px;
 	text-decoration: none;
@@ -170,6 +171,7 @@ Mixins File for Wordpress Theme FAU
 }
 
 
+
 // Set Font Style
 
 @mixin fontFace($family,$src,$weight: normal,$style: normal,$withlocal: true) {