Skip to content

Commit

Permalink
Merge pull request #728 from RRZE-Webteam/beta
Browse files Browse the repository at this point in the history
Beta
  • Loading branch information
xwolfde authored Dec 11, 2019
2 parents 77bd9bb + 117fb69 commit 4fe2d55
Show file tree
Hide file tree
Showing 54 changed files with 1,206 additions and 2,874 deletions.
6 changes: 0 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,3 @@ Einstellungen für eigene Watcher:
Mit der Compiler-Option ```--style compressed``` sollen die im produktiven Betrieb erzeugten CSS-Dateien komprimiert sein.


### Hinweis zu Vendor-Prefixes

In den SASS-Dateien befinden sich teilweise noch Vendor-Prefixes. Diese wurde in älteren Versionen in das Theme eingestellt, als es noch keinen Autoprefixer
gab. Diese Vendor-Prefixes sollen in den nächsten Versionen des Themes entfernt werden.

Neue Vendor-Prefixes sollen -sofern sie noch benötigt werden- nur noch durch einen Autoprefixer auf das style.css ergänzt werden.
2 changes: 1 addition & 1 deletion css/editor-style.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/gutenberg.css

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion css/sass/_printer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@
.widget_categories,
.widget_tag_cloud,
.contentmenu,
.link-all-videos,
.events-more-links,
.flex-direction-nav,
.widget_search,
Expand Down
13 changes: 4 additions & 9 deletions css/sass/_reset.scss
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,14 @@ input {
line-height: normal;
}

button,
html input[type="button"],
input[type="reset"],
input[type="submit"] {
cursor: pointer;
}

label,
select,
button,
input[type="button"],
[role="button"],
html input[type="button"],
input[type="reset"],
input[type="submit"],
input[type="submit"],
input[type="button"],
input[type="radio"],
input[type="checkbox"] {
cursor: pointer;
Expand Down
4 changes: 0 additions & 4 deletions css/sass/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
$farbfamilie: 'zuv';
// med, phil, nat, rw, tf, zuv

// DEBUGMODE
// (Sets border around container and main regions)
$debugmode: 'false';

// Define fonts
$fontStack: 'Roboto', sans-serif;
$fontStackSerifs: Georgia, serif;
Expand Down
34 changes: 13 additions & 21 deletions css/sass/elements/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,28 @@ textarea {
}

form {
padding: 20px;
margin: 0;
display: inline-block;
border: 1px solid $colorLightest;

&.noborder {
border: none;
}

border: none;

legend {
margin: 0;
padding: 0 0 11px 0;
@include px2rem($font-size-h3);
color: $colorPrimary;
font-weight: bold;
}

#content & {
padding: 0;
@media (min-width: $screen-sm) {
border: 1px solid $colorLightest;
padding: 20px;
}
}
#content &.noborder {
border: none;
}
}

label {
Expand Down Expand Up @@ -134,18 +140,4 @@ fieldset {
}


@media (max-width: $breakMD) {
input[type="checkbox"],
input[type="radio"] {
border: 1px solid #ccc;
}

#content {
form {
border: none;
padding: 0;
}
}
}


3 changes: 0 additions & 3 deletions css/sass/elements/_general-classes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,6 @@ div.aligncenter {
display: inline !important;
}

.link-all-videos {
padding-top: 10px;
}



Expand Down
7 changes: 4 additions & 3 deletions css/sass/frameworks/bootstrap/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@

// Utilities
// @import "mixins/hide-text";
@import "mixins/opacity";
// @import "mixins/image";

@import "mixins/labels";
@import "mixins/reset-filter";
@import "mixins/resize";
Expand All @@ -14,7 +13,9 @@
@import "mixins/reset-text";
@import "mixins/text-emphasis";
@import "mixins/text-overflow";
@import "mixins/vendor-prefixes";
// @import "mixins/vendor-prefixes";

@import "mixins/rrze-gathered";

// Components
@import "mixins/alerts";
Expand Down
38 changes: 0 additions & 38 deletions css/sass/frameworks/bootstrap/_scaffolding.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,41 +18,3 @@
}


// Body reset



body {
font-family: $font-family-base;
font-size: #{$font-size-base}px;
line-height: $line-height-base;
}

// Reset fonts for relevant elements
input,
button,
select,
textarea {
font-size: inherit;
}


// Figures
//
// We reset this here because previously Normalize had no `figure` margins. This
// ensures we don't break anyone's use of the element.

figure {
margin: 0;
}


// iOS "clickable elements" fix for role="button"
//
// Fixes "clickability" issue (and more generally, the firing of events such as focus as well)
// for traditionally non-focusable elements with role="button"
// see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile

[role="button"] {
cursor: pointer;
}
22 changes: 0 additions & 22 deletions css/sass/frameworks/bootstrap/_type.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,6 @@




// Emphasis & misc
// -------------------------

// Ex: (12px small font / 14px base font) * 100% = about 85%
small,
.small {
font-size: floor((100% * $font-size-small / $font-size-base));
}

mark,
.mark {
background-color: $state-warning-bg;
Expand Down Expand Up @@ -111,13 +101,6 @@ dd {
// Misc
// -------------------------

// Abbreviations and acronyms
abbr[title],
// Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
abbr[data-original-title] {
cursor: help;
border-bottom: 1px dotted $abbr-border-color;
}
.initialism {
font-size: 90%;
@extend .text-uppercase;
Expand Down Expand Up @@ -172,8 +155,3 @@ blockquote.pull-right {
}
}

// Addresses
address {
font-style: normal;
line-height: $line-height-base;
}
25 changes: 0 additions & 25 deletions css/sass/frameworks/bootstrap/mixins/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -61,28 +61,3 @@
}
}

// Form control sizing
//
// Relative text size, padding, and border-radii changes for form controls. For
// horizontal sizing, wrap controls in the predefined grid classes. `<select>`
// element gets special love because it's special, and that's a fact!
// [converter] $parent hack
@mixin input-size($parent, $input-height, $padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) {
#{$parent} {
height: $input-height;
padding: $padding-vertical $padding-horizontal;
font-size: $font-size;
line-height: $line-height;
border-radius: $border-radius;
}

select#{$parent} {
height: $input-height;
line-height: $input-height;
}

textarea#{$parent},
select[multiple]#{$parent} {
height: auto;
}
}
33 changes: 0 additions & 33 deletions css/sass/frameworks/bootstrap/mixins/_image.scss

This file was deleted.

8 changes: 0 additions & 8 deletions css/sass/frameworks/bootstrap/mixins/_opacity.scss

This file was deleted.

40 changes: 40 additions & 0 deletions css/sass/frameworks/bootstrap/mixins/_rrze-gathered.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
and open the template in the editor.
*/
/*
Created on : 06.12.2019, 12:28:59
Author : unrz59
*/



// Opacity

@mixin opacity($opacity) {
opacity: $opacity;
// IE8 filter
$opacity-ie: ($opacity * 100);
filter: alpha(opacity=$opacity-ie);
}


// from _vendor-prefixes.scss:

// User select
// For selecting text on the page

@mixin user-select($select) {
user-select: $select;
}


// Box sizing
@mixin box-sizing($boxmodel) {
box-sizing: $boxmodel;
}

@mixin box-shadow($shadow...) {
box-shadow: $shadow;
}
23 changes: 1 addition & 22 deletions css/sass/frameworks/bootstrap/mixins/_vendor-prefixes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,8 @@
// Note: Deprecated `.box-shadow()` as of v3.1.0 since all of Bootstrap's
// supported browsers that have box shadow capabilities now support it.

@mixin box-shadow($shadow...) {
box-shadow: $shadow;
}

// Box sizing
@mixin box-sizing($boxmodel) {
box-sizing: $boxmodel;
}


// CSS3 Content Columns
@mixin content-columns($column-count, $column-gap: $grid-gutter-width) {
Expand All @@ -75,14 +69,6 @@
hyphens: $mode;
}

// Placeholder text
@mixin placeholder($color: $input-color-placeholder) {
// Firefox
&::-moz-placeholder {
color: $color;
opacity: 1; // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526
}
}

// Transformations
@mixin scale($ratio...) {
Expand Down Expand Up @@ -150,10 +136,3 @@
transition: transform $transition;
}


// User select
// For selecting text on the page

@mixin user-select($select) {
user-select: $select;
}
Loading

0 comments on commit 4fe2d55

Please sign in to comment.