diff --git a/app/views/shared/include_edit.php b/app/views/shared/include_edit.php deleted file mode 100644 index f37c760e5cf67858c4f9aab17138daad1835af1e..0000000000000000000000000000000000000000 --- a/app/views/shared/include_edit.php +++ /dev/null @@ -1,10 +0,0 @@ -<div id="mvv-include-edit<?= $item_id ?>" class="mvv-include-edit"> - <a class="mvv-include-close"></a> - <div class="mvv-include-background"> - <div class="mvv-include-content"> - <h2 class="topic"><?= htmlReady(PageLayout::getTitle()) ?></h2> - <?= $content_for_layout ?> - </div> - </div> - <div class="mvv-edit-bottom"></div> -</div> diff --git a/resources/assets/stylesheets/less/mvv.less b/resources/assets/stylesheets/less/mvv.less deleted file mode 100644 index fc26996d650b2496084ff8b4b1e2e222360ed31e..0000000000000000000000000000000000000000 --- a/resources/assets/stylesheets/less/mvv.less +++ /dev/null @@ -1,690 +0,0 @@ -dl { - &.mvv-form { - margin: 0; - - dt { - font-weight: bold; - padding-left: 15px; - padding-top: 5px; - - label&:after { - content: ":"; - } - } - - dd { - padding: 10px 10px 10px 30px; - border-bottom: 1px solid @dark-gray-color-20; - - label { - display: inline-block; - padding: 10px; - } - - div.mvv-fachsemester label { - display: inline; - padding: 0 10px 0 0; - } - } - - label img { - vertical-align: baseline; - } - - div.studip { - width: 75%; - display: inline; - } - - blockquote { - border: 1px dashed @dark-gray-color-80; - margin: 3px; - padding: 3px; - font-size: 0.9em; - flex: 1 0 auto; - - &:hover { - background-color: @yellow-20; - border-color: @red; - } - } - - } - - &.mvv-details { - margin: 0; - - dt { - font-weight: bold; - padding: 5px 0 0 5px; - } - - dd { - margin: 0; - padding: 5px 0 0 15px; - } - } -} - -span.mvv-chooser-id { - display: none; -} - -table { - - tr td.ellipsis { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - - &.default { - - > tbody { - &.collapsed > tr > td { - border-bottom: 1px solid @dark-gray-color-20; - padding: 5px; - &:first-child { - padding-left: 0; - } - } - - &.not-collapsed { - > tr > td { - border-bottom: 1px solid @dark-gray-color-20; - padding: 5px; - &:first-child { - padding-left: 0; - } - } - > tr.loaded-details > td { - padding: 0px 0px 5px 20px; - } - } - - &:last-of-type > tr.last-child > td { - border-bottom: 1px solid @dark-gray-color-20; - } - - &.ui-sortable-helper { - display: table; - } - - &.ui-sortable-placeholder { - display: block; - } - } - - > tbody.sort_items { - > tr.sort_item > td:first-child { - background: #fff url("@{image-path}/anfasser_24.png") no-repeat left center; - cursor: move; - padding-left: 10px; - } - &.empty > tr.sort_item > td:first-child { - &:extend(& > tr.sort_item > td:first-child); - padding-left: 30px; - } - } - - } - - &.mvv-form tr td { - &:first-child { - vertical-align: top; - font-weight: bold; - } - } - - &.mvv-modul-details { - margin: 10px; - width: 99%; - - td { - vertical-align: top; - } - - th { - text-align: left; - vertical-align: top; - - .mvv-modul-details-head { - text-align: center; - } - } - - table th { - text-align: left; - vertical-align: top; - } - - input[type=checkbox].mvv-cb-more { - display: none; - &:checked ~ ul li { - &:nth-child(n+6) { - height: 0; - visibility: hidden; - } - & label.cb-more-label { - display: block; - } - } - & ~ ul label.cb-more-label { - display: none; - } - } - } - - &.mvv-semsterdata { - width: 100%; - border-collapse: collapse; - border: none; - height: 2em; - - td { - border: none; - border-right:1px solid @dark-gray-color-20; - text-align: center; - margin: 0px; - padding:0px; - - &.type{ - font-size: 0.5em; - &.soll{ - color:@red; - } - &.kann{ - color:@dark-green; - } - } - } - - th { - border: none; - border-right:1px solid @dark-gray-color-20; - text-align: center; - margin: 0px; - padding:0px; - } - } - -} - -ul { - &.mvv-result-list { - list-style-type: none; - padding: 0; - - dt { - padding: 1em; - margin: 0; - } - - li { - padding: 10px 20px; - margin: 0; - } - - dd { - margin: 0; - } - - &.even { - background-color: @dark-gray-color-10; - - &:hover { - background-color: @content-color-60; - } - } - - &.odd { - background-color: @dark-gray-color-5; - - &:hover { - background-color: @content-color-40; - } - } - } - - &.mvv-modul li { - .icon('before', 'learnmodule', 'info', 16, 2px); - padding-left: 20px; - } - - &.mvv-persons { - width: 100%; - - & li { - .icon('before', 'person', 'info', 16, 2px); - padding-left: 20px; - } - } - - &.mvv-faecher li { - .icon('before', 'file', 'info', 16, 2px); - padding-left: 20px; - } - - &.mvv-dokumente li { - > div:first-child { - .icon('before', 'file', 'info', 16, 2px); - } - } - - &.mvv-institute li { - .icon('before', 'institute', 'info', 16, 2px); - padding-left: 20px; - } - - &.mvv-languages li { - .icon('before', 'consultation', 'info', 16, 2px); - padding-left: 20px; - } - - &.mvv-assigned-items { - max-width: 48em; - width: 100%; - list-style-type: none; - margin: 0.5em 0 0; - padding: 0; -// padding: 0px 0px 0px 10px; - - li { - border-bottom: solid @dark-gray-color-45 1px; - padding-top: 5px; - padding-left: 5px; - margin-bottom: 5px; - margin-left: 0; - display: flex; - flex-wrap: wrap; - - &.sort_items { - background: #fff url("@{image-path}/anfasser_24.png") no-repeat left center; - cursor: move; - padding-left: 10px; - } - - } - - &.ui-autocomplete { - max-width: 700px; - } - - } - - li.mvv-item-list-placeholder { - background-image: none !important; - border: none !important; - font-weight: normal !important; -// padding-left: 20px; - } -} - -div { - &.mvv-item-list-properties { - width: 100%; - align-self: baseline; - padding-left: 40px; - div { - font-style: italic; - font-size: 0.9em; - max-height: 1.2em; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - } - - &.mvv-item-list-text { - flex: 9; - } - - &.mvv-item-list-buttons { - flex: 1; - text-align: right; - } - - &.mvv-edit-form-new { - padding: 10px; - } - - &.mvv-property-en { - background: url("@{image-path}/languages/lang_en.gif") no-repeat left center; - padding-left: 20px; - font-style: italic; - height: 1.5em; - text-overflow: ellipsis; - } - - &.mvv-property-de { - background: url("@{image-path}/languages/lang_de.gif") no-repeat left center; - padding-left: 20px; - font-style: italic; - height: 1.5em; - text-overflow: ellipsis; - } -} - -select.mvv-search-select-list { - display: none; - max-width: 40em; -} - -#mvv-chooser { - - div { - float: left; - width: 19%; - } - - ul { - list-style: none inside; - margin: 5px; - padding: 0; - - li { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - border-top: 1px solid @dark-gray-color-60; - padding: 3px 20px 3px 2px; - height: 1.3em; - - &:hover { - background:@dark-gray-color-10; - cursor: pointer; - font-weight: bold; - } - - &.selected { - .background-icon('arr_2right', 'inactive', 16); - background-position: right; - background-repeat: no-repeat; - cursor: pointer; - font-weight: bold; - - &.last { - .background-icon('accept', 'inactive', 16); - background-position: right; - background-repeat: no-repeat; - } - - &:after { - float: right; - } - } - } - } -} - -#mvv-chooser-toggle { - .icon('before', 'arr_2up', 'clickable', 16, 2px); - width: 20px; - height: 20px; - float: right; - cursor: pointer; - display: none; -} - -#exposeMask { - position: fixed !important; - bottom: 0px; -} - -.mvv-add-button { - width: 20px; - display: inline-block; - - a { - cursor: pointer; - display: none; - vertical-align: middle; - } -} - -.mvv-chooser-hidden { - .icon('before', 'arr_2down', 'clickable', 16, 2px); -} - -.mvv-hideable-hidden { - display: none; -} - -.mvv-include-edit { - background: url("{@plugin-path}/images/edit-top.png") no-repeat center top; - width: 580px; - margin: 0px; - padding-top: 20px; -} - -.mvv-edit-form-ovl { - width: 560px; - - input[type=text], textarea { - width: 90%; - vertical-align: top; - } -} - -.mvv-include-content { - margin: 0 15px; - position: relative; - height: 400px; - overflow: auto; -} - -.mvv-edit-bottom { - background: url("{@plugin-path}/images/edit-bottom.png") no-repeat center bottom; - padding-top: 20px; -} - -.mvv-include-close { - background: url("{@plugin-path}/images/close.png") no-repeat; - cursor: pointer; - height: 35px; - position: absolute; - right: -30px; - top: -13px; - width: 35px; - z-index: 1000; -} - -.mvv-include-background { - background: url("{@plugin-path}/images/edit-bg.png") repeat-y 0 0; -} - -.mvv-search-reset { - display: none; - cursor: pointer; -} -table.default { - thead tr th, - tbody tr td { - &.mvv-search-modules-row { - padding-left: 25px; - } - } -} -.sortable a { - cursor: pointer; -} - -.ui-resizable-handle { - z-index: 999; -} - -.ui-menu-item a { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - -.clear{ - clear:both; -} - -form.default .mvv-inst-chooser select { - width: 20em; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - margin-left: 10px; -} - -.mvv-inst-next-button { - width: 20px; - height: 20px; - display: inline-block; - vertical-align: middle; - - img { - display: none; - cursor: pointer; - } -} - -.mvv-inst-add-button { - width: 20px; - height: 20px; - vertical-align: middle; - display: inline-block; - - img { - display: none; - cursor: pointer; - } -} - -.mvv-select-group { - padding-bottom: 25px; - - li { - font-weight: bold; - - ul { - padding: 10px 0 0 10px; - list-style-type: none; - - li { - font-weight: normal; - } - } - } -} - -.mvv-orig-lang { - display: none; - border: 1px solid @light-gray-color-40; - margin: 3px; - padding: 3px; - font-size: 0.9em; - background-color: #fff; - max-height: 10em; - overflow: auto; -} - -#lvgruppe_selection { - padding: 1em; - - h3 { - margin-top: 1em; - } - - &.odd { - background-color: @dark-gray-color-5; - } - - &.even { - background-color: @content-color-20; - } -} - -#lvgruppe_selection_chosen { - width: 49%; - float: left; - margin: 0; - padding: 0; - - ul { - /* list-style: none; */ - padding: 0; - margin: 0; - - li { - list-style: none; - padding: 0 0 0 1em; - margin: 0; - } - } -} - -#lvgruppe_selection_none, -#lvgruppe_selection_at_least_one { - font-style: italic; -} - -#lvgruppe_selection_selectables { - width: 49%; - margin: 0 0 0 50%; - padding: 0; - - ul { - padding: 0; - margin: 0; - - li { - list-style: none; - padding: 0 0 0 1em; - margin: 0; - } - } -} - - -#lvgruppe_selection_selected li ul li { - list-style: inside; - padding-bottom: 0.3em; -} - -#admin_seminare_assi #lvgruppe_selection { - font-size: 0.8em; - - h3 { - font-weight: normal; - } -} - -.mvv-no-entry { - font-style: italic; -} - -.mvv-content-overlay { - width: 1100px; - position: absolute; - background-color: #fff; - height: 80%; -} - -.mvv-content-overlay-close{ - right: -15px; -} - -.mvv-content-overlay-inner { - overflow: auto; - position: absolute; - left: 18px; - right: 18px; - top: 18px; - bottom: 18px; -} - -.quicksearch_frame { - white-space: nowrap; -} - -.difflog { - color: brown; - font-size: smaller; - vertical-align: text-top; - text-decoration: none; -} diff --git a/resources/assets/stylesheets/less/scroll-to-top.less b/resources/assets/stylesheets/less/scroll-to-top.less deleted file mode 100644 index c3a7bc141c802fd7f204458c697d2ce3191e4470..0000000000000000000000000000000000000000 --- a/resources/assets/stylesheets/less/scroll-to-top.less +++ /dev/null @@ -1,27 +0,0 @@ -body #scroll-to-top { - @scroll-to-top-height: 45px; - @scroll-to-top-width: 45px; - @scroll-to-top-margin: 35px; - width: @scroll-to-top-height; - height: @scroll-to-top-width; - margin-right: @scroll-to-top-margin; - margin-bottom: @scroll-to-top-margin; - padding: 10px; - background: @base-color; - border: .05rem solid transparent; - background-clip: padding-box; - cursor: pointer; - box-sizing: border-box; - position: fixed; - right: 0; - bottom: 0; - transition: all 250ms ease-in-out; - z-index: 1; - &:hover { - background: @brand-color-darker; - border-radius: .12rem; - } - &.hide { - bottom: calc( 0px - @scroll-to-top-height - @scroll-to-top-margin); - } -} diff --git a/resources/assets/stylesheets/less/smileys.less b/resources/assets/stylesheets/less/smileys.less index 19df38944219a503c5d6a8bf9a6febe3ba6b06b8..beab53659eb54107bd66d3576409b6d6daf888af 100644 --- a/resources/assets/stylesheets/less/smileys.less +++ b/resources/assets/stylesheets/less/smileys.less @@ -17,7 +17,7 @@ float: none; margin: 0; white-space: nowrap; - + &.favorites a { .icon('before', 'smiley', 'info_alt'); } @@ -72,7 +72,7 @@ display: inline-block; vertical-align: middle; - &.favorite { + &.favorite { .background-icon('checkbox-checked', 'clickable'); } &.ajax { @@ -88,7 +88,7 @@ clear: left; float: left; padding-right: 0.5em; - + &::after { content: ':'; } @@ -160,4 +160,4 @@ .ui-dialog-content { padding: 0; } -} \ No newline at end of file +} diff --git a/resources/assets/stylesheets/mixins/misc.scss b/resources/assets/stylesheets/mixins/misc.scss index f8f7a3be8ad61990af0b31e766a792986cdbcfd9..98a1a96f97c9be41425835aad35677340fd27b76 100644 --- a/resources/assets/stylesheets/mixins/misc.scss +++ b/resources/assets/stylesheets/mixins/misc.scss @@ -15,3 +15,16 @@ clear: both; } } +@mixin list-unstyled { + padding-left: 0; + list-style: none; +} + + +@mixin size($height, $width) { + width: $width; + height: $height; +} +@mixin square($size) { + @include size($size, $size); +} diff --git a/resources/assets/stylesheets/less/admin.less b/resources/assets/stylesheets/scss/admin.scss similarity index 81% rename from resources/assets/stylesheets/less/admin.less rename to resources/assets/stylesheets/scss/admin.scss index e26e1754e584c81aaad9aa1853185bdbec722e9e..bd147e580b9d535bc4c114c121793544d46bf6c6 100644 --- a/resources/assets/stylesheets/less/admin.less +++ b/resources/assets/stylesheets/scss/admin.scss @@ -7,12 +7,12 @@ padding-left: 0px; position: relative; text-align: center; - background-color: @content-color-20; - .background-icon('upload', 'clickable', 50); + background-color: $content-color-20; + @include background-icon(upload, clickable, 50); background-repeat: no-repeat; background-position: center 10px; padding-top: 70px; - color: @base-color; + color: $base-color; cursor: pointer; input[type=file] { @@ -27,9 +27,9 @@ } &.hovered { - background-color: @base-color; - .background-icon('upload', 'info_alt', 50); - color: white; + background-color: $base-color; + @include background-icon(upload, info_alt, 50); + color: $white; } } .js .widget-links .drag-and-drop { @@ -40,7 +40,7 @@ fieldset.attribute_table { border-collapse: collapse; ul { - margin: 0px; + margin: 0; } .sem_class_name .sem_class_edit { display: none; @@ -73,7 +73,7 @@ fieldset.attribute_table { background-color: #dddddd; font-size: 12px; text-align: center; - margin: 0px; + margin: 0; } div[container] > div.droparea { min-height: 30px; @@ -127,28 +127,28 @@ fieldset.attribute_table { .course-admin { .course-completion { - .hide-text(); - .square(16px); + @include hide-text(); + @include square(16px); background-repeat: no-repeat; display: block; } th .course-completion { - .background-icon('radiobutton-checked', 'clickable'); + @include background-icon(radiobutton-checked, clickable); } td .course-completion { - .background-icon('radiobutton-checked', 'status-red'); + @include background-icon(radiobutton-checked, status-red); &[data-course-completion="1"] { - .background-icon('radiobutton-checked', 'status-yellow'); + @include background-icon(radiobutton-checked, status-yellow); } &[data-course-completion="2"] { - .background-icon('radiobutton-checked', 'status-green'); + @include background-icon(radiobutton-checked, status-green); } &.ajaxing { - background-image: url("@{image-path}/ajax_indicator_small.gif"); + background-image: url("#{$image-path}/ajax_indicator_small.gif"); } } } diff --git a/resources/assets/stylesheets/less/links.less b/resources/assets/stylesheets/scss/links.scss similarity index 67% rename from resources/assets/stylesheets/less/links.less rename to resources/assets/stylesheets/scss/links.scss index 4f62ec085b33bc8e01ba646fe7dd1119bebf0ecb..34b37cd45bab1c1de0335020ff075db5e490cfa2 100644 --- a/resources/assets/stylesheets/less/links.less +++ b/resources/assets/stylesheets/scss/links.scss @@ -1,6 +1,6 @@ /* --- Links ---------------------------------------------------------------- */ a, a:link, a:visited { - color: @base-color; + color: $base-color; text-decoration: none; &.index { color: #444; } @@ -12,7 +12,7 @@ a, a:link, a:visited { } } a[href] { - @media not (prefers-reduced-motion) { + @media not prefers-reduced-motion { transition: color 0.3s; } } @@ -21,7 +21,7 @@ a[disabled] { } a:hover, a:active, a:hover.index, a:active.index, a:hover.tree { - color: @active-color; + color: $active-color; text-decoration: none; } @@ -34,16 +34,16 @@ a.link-intern, a.link-extern { } a.link-intern { - .icon('before', 'link-intern', 'clickable', 16, 2px); + @include icon(before, link-intern, clickable, 16px, 2px); } a.link-extern { - .icon('before', 'link-extern', 'clickable', 16, 2px); + @include icon(before, link-extern, clickable, 16px, 2px); } a.link-add { - .icon('before', 'add', 'clickable', 16, 2px); + @include icon(before, add, clickable, 16px, 2px); } a.link-edit { - .icon('before', 'edit', 'clickable', 16, 2px); + @include icon(before, edit, clickable, 16px, 2px); } a img { diff --git a/resources/assets/stylesheets/scss/mvv.scss b/resources/assets/stylesheets/scss/mvv.scss index 0642a2e491012e356278aa356bc406bd0c05dc81..a6e41251da91bcab78f2d60001070cf5cd4de616 100644 --- a/resources/assets/stylesheets/scss/mvv.scss +++ b/resources/assets/stylesheets/scss/mvv.scss @@ -11,15 +11,7 @@ } input[type="submit"] { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; - - // Activate when twitter-mixins is included as scss and remove the above rules - // @include hide-text(); - + @include hide-text(); width: 29px; height: 20px; @include background-icon(search, info_alt); @@ -31,3 +23,647 @@ } } } + +dl { + &.mvv-form { + margin: 0; + + dt { + font-weight: bold; + padding-left: 15px; + padding-top: 5px; + + label { + &:after { + content: ":"; + } + } + } + + dd { + padding: 10px 10px 10px 30px; + border-bottom: 1px solid $dark-gray-color-20; + + label { + display: inline-block; + padding: 10px; + } + + div.mvv-fachsemester label { + display: inline; + padding: 0 10px 0 0; + } + } + + label img { + vertical-align: baseline; + } + + div.studip { + width: 75%; + display: inline; + } + + blockquote { + border: 1px dashed $dark-gray-color-80; + margin: 3px; + padding: 3px; + font-size: 0.9em; + flex: 1 0 auto; + + &:hover { + background-color: $yellow-20; + border-color: $red; + } + } + + } + + &.mvv-details { + margin: 0; + + dt { + font-weight: bold; + padding: 5px 0 0 5px; + } + + dd { + margin: 0; + padding: 5px 0 0 15px; + } + } +} + +span.mvv-chooser-id { + display: none; +} + +table { + + tr td.ellipsis { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + &.default { + + > tbody { + &.collapsed > tr > td { + border-bottom: 1px solid $dark-gray-color-20; + padding: 5px; + &:first-child { + padding-left: 0; + } + } + + &.not-collapsed { + > tr > td { + border-bottom: 1px solid $dark-gray-color-20; + padding: 5px; + &:first-child { + padding-left: 0; + } + } + > tr.loaded-details > td { + padding: 0 0 5px 20px; + } + } + + &:last-of-type > tr.last-child > td { + border-bottom: 1px solid $dark-gray-color-20; + } + + &.ui-sortable-helper { + display: table; + } + + &.ui-sortable-placeholder { + display: block; + } + } + + > tbody.sort_items { + > tr.sort_item > td:first-child { + &.empty { + padding-left: 30px; + } + background: $white url("#{$image-path}/anfasser_24.png") no-repeat left center; + cursor: move; + padding-left: 10px; + } + } + + } + + &.mvv-form tr td { + &:first-child { + vertical-align: top; + font-weight: bold; + } + } + + &.mvv-modul-details { + margin: 10px; + width: 99%; + + td { + vertical-align: top; + } + + th { + text-align: left; + vertical-align: top; + + .mvv-modul-details-head { + text-align: center; + } + } + + table th { + text-align: left; + vertical-align: top; + } + + input[type=checkbox].mvv-cb-more { + display: none; + &:checked ~ ul li { + &:nth-child(n+6) { + height: 0; + visibility: hidden; + } + & label.cb-more-label { + display: block; + } + } + & ~ ul label.cb-more-label { + display: none; + } + } + } + + &.mvv-semsterdata { + width: 100%; + border-collapse: collapse; + border: none; + height: 2em; + + td { + border: none; + border-right:1px solid $dark-gray-color-20; + text-align: center; + margin: 0; + padding:0; + + &.type{ + font-size: 0.5em; + &.soll{ + color:$red; + } + &.kann{ + color:$dark-green; + } + } + } + + th { + border: none; + border-right:1px solid $dark-gray-color-20; + text-align: center; + margin: 0; + padding:0; + } + } + +} + +ul { + &.mvv-result-list { + list-style-type: none; + padding: 0; + + dt { + padding: 1em; + margin: 0; + } + + li { + padding: 10px 20px; + margin: 0; + } + + dd { + margin: 0; + } + + &.even { + background-color: $dark-gray-color-10; + + &:hover { + background-color: $content-color-60; + } + } + + &.odd { + background-color: $dark-gray-color-5; + + &:hover { + background-color: $content-color-40; + } + } + } + + &.mvv-modul li { + @include icon(before, learnmodule, info, 16px, 2px); + padding-left: 20px; + } + + &.mvv-persons { + width: 100%; + + & li { + @include icon(before, person, info, 16px, 2px); + padding-left: 20px; + } + } + + &.mvv-faecher li { + @include icon(before, file, info, 16px, 2px); + padding-left: 20px; + } + + &.mvv-dokumente li { + > div:first-child { + @include icon(before, file, info, 16px, 2px); + } + } + + &.mvv-institute li { + @include icon(before, institute, info, 16px, 2px); + padding-left: 20px; + } + + &.mvv-languages li { + @include icon(before, consultation, info, 16px, 2px); + padding-left: 20px; + } + + &.mvv-assigned-items { + max-width: 48em; + width: 100%; + list-style-type: none; + margin: 0.5em 0 0; + padding: 0; + + li { + border-bottom: solid $dark-gray-color-45 1px; + padding-top: 5px; + padding-left: 5px; + margin-bottom: 5px; + margin-left: 0; + display: flex; + flex-wrap: wrap; + + &.sort_items { + background: $white url("#{$image-path}/anfasser_24.png") no-repeat left center; + cursor: move; + padding-left: 10px; + } + + } + + &.ui-autocomplete { + max-width: 700px; + } + + } + + li.mvv-item-list-placeholder { + background-image: none !important; + border: none !important; + font-weight: normal !important; + } +} + +div { + &.mvv-item-list-properties { + width: 100%; + align-self: baseline; + padding-left: 40px; + div { + font-style: italic; + font-size: 0.9em; + max-height: 1.2em; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } + + &.mvv-item-list-text { + flex: 9; + } + + &.mvv-item-list-buttons { + flex: 1; + text-align: right; + } + + &.mvv-edit-form-new { + padding: 10px; + } + + &.mvv-property-en { + background: url("#{$image-path}/languages/lang_en.gif") no-repeat left center; + padding-left: 20px; + font-style: italic; + height: 1.5em; + text-overflow: ellipsis; + } + + &.mvv-property-de { + background: url("#{$image-path}/languages/lang_de.gif") no-repeat left center; + padding-left: 20px; + font-style: italic; + height: 1.5em; + text-overflow: ellipsis; + } +} + +select.mvv-search-select-list { + display: none; + max-width: 40em; +} + +#mvv-chooser { + + div { + float: left; + width: 19%; + } + + ul { + list-style: none inside; + margin: 5px; + padding: 0; + + li { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + border-top: 1px solid $dark-gray-color-60; + padding: 3px 20px 3px 2px; + height: 1.3em; + + &:hover { + background:$dark-gray-color-10; + cursor: pointer; + font-weight: bold; + } + + &.selected { + @include background-icon(arr_2right, inactive); + background-position: right; + background-repeat: no-repeat; + cursor: pointer; + font-weight: bold; + + &.last { + @include background-icon(accept, inactive); + background-position: right; + background-repeat: no-repeat; + } + + &:after { + float: right; + } + } + } + } +} + +#mvv-chooser-toggle { + @include icon(before,'arr_2up', 'clickable', 16px, 2px); + width: 20px; + height: 20px; + float: right; + cursor: pointer; + display: none; +} + +#exposeMask { + position: fixed !important; + bottom: 0; +} + +.mvv-add-button { + width: 20px; + display: inline-block; + + a { + cursor: pointer; + display: none; + vertical-align: middle; + } +} + +.mvv-chooser-hidden { + @include icon(before,'arr_2down', 'clickable', 16px, 2px); +} + +.mvv-search-reset { + display: none; + cursor: pointer; +} + +table.default { + thead tr th, + tbody tr td { + &.mvv-search-modules-row { + padding-left: 25px; + } + } +} +.sortable a { + cursor: pointer; +} + +.ui-resizable-handle { + z-index: 999; +} + +.ui-menu-item a { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.clear{ + clear:both; +} + +form.default .mvv-inst-chooser select { + width: 20em; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + margin-left: 10px; +} + +.mvv-inst-next-button { + width: 20px; + height: 20px; + display: inline-block; + vertical-align: middle; + + img { + display: none; + cursor: pointer; + } +} + +.mvv-inst-add-button { + width: 20px; + height: 20px; + vertical-align: middle; + display: inline-block; + + img { + display: none; + cursor: pointer; + } +} + +.mvv-select-group { + padding-bottom: 25px; + + li { + font-weight: bold; + + ul { + padding: 10px 0 0 10px; + list-style-type: none; + + li { + font-weight: normal; + } + } + } +} + +.mvv-orig-lang { + display: none; + border: 1px solid $light-gray-color-40; + margin: 3px; + padding: 3px; + font-size: 0.9em; + background-color: $white; + max-height: 10em; + overflow: auto; +} + +#lvgruppe_selection { + padding: 1em; + + h3 { + margin-top: 1em; + } + + &.odd { + background-color: $dark-gray-color-5; + } + + &.even { + background-color: $content-color-20; + } +} + +#lvgruppe_selection_chosen { + width: 49%; + float: left; + margin: 0; + padding: 0; + + ul { + /* list-style: none; */ + padding: 0; + margin: 0; + + li { + list-style: none; + padding: 0 0 0 1em; + margin: 0; + } + } +} + +#lvgruppe_selection_none, +#lvgruppe_selection_at_least_one { + font-style: italic; +} + +#lvgruppe_selection_selectables { + width: 49%; + margin: 0 0 0 50%; + padding: 0; + + ul { + padding: 0; + margin: 0; + + li { + list-style: none; + padding: 0 0 0 1em; + margin: 0; + } + } +} + + +#lvgruppe_selection_selected li ul li { + list-style: inside; + padding-bottom: 0.3em; +} + +#admin_seminare_assi #lvgruppe_selection { + font-size: 0.8em; + + h3 { + font-weight: normal; + } +} + +.mvv-no-entry { + font-style: italic; +} + +.mvv-content-overlay { + width: 1100px; + position: absolute; + background-color: $white; + height: 80%; +} + +.mvv-content-overlay-close{ + right: -15px; +} + +.mvv-content-overlay-inner { + overflow: auto; + position: absolute; + left: 18px; + right: 18px; + top: 18px; + bottom: 18px; +} + +.quicksearch_frame { + white-space: nowrap; +} + +.difflog { + color: $brown; + font-size: smaller; + vertical-align: text-top; + text-decoration: none; +} diff --git a/resources/assets/stylesheets/less/pagination.less b/resources/assets/stylesheets/scss/pagination.scss similarity index 84% rename from resources/assets/stylesheets/less/pagination.less rename to resources/assets/stylesheets/scss/pagination.scss index c6b3498b868bd966fa883420f105107b360b5de8..b55fd0cbec1808d8dda2b6b5c09e1f73273505ba 100644 --- a/resources/assets/stylesheets/less/pagination.less +++ b/resources/assets/stylesheets/scss/pagination.scss @@ -28,20 +28,20 @@ .pagination--link { background-color: transparent; border: 0; - color: @base-color; + color: $base-color; cursor: pointer; padding: 0; } .current .pagination--link { font-weight: bold; - color: #000; + color: $black; } .prev, .next { .pagination--link { - .hide-text; + @include hide-text(); background-position: center; background-repeat: no-repeat; display: inline-block; @@ -51,9 +51,9 @@ } } .prev .pagination--link { - .background-icon('arr_1left'); + @include background-icon(arr_1left); } .next .pagination--link { - .background-icon('arr_1right'); + @include background-icon(arr_1right); } } diff --git a/resources/assets/stylesheets/less/profile.less b/resources/assets/stylesheets/scss/profile.scss similarity index 91% rename from resources/assets/stylesheets/less/profile.less rename to resources/assets/stylesheets/scss/profile.scss index c79145158d0417dd5966964fc5aae63d6433a3c9..d6c621f0a78d12247abd2ae4b98d709a71f60b40 100644 --- a/resources/assets/stylesheets/less/profile.less +++ b/resources/assets/stylesheets/scss/profile.scss @@ -13,14 +13,13 @@ padding: 0 1em; } .profile-view-actions { - .list-unstyled(); - + @include list-unstyled(); img { vertical-align: text-top; } } -.media-breakpoint-tiny-down({ +@include media-breakpoint-tiny-down(){ table.settings-privacy { &, thead, tbody, th, td, tr { @@ -46,7 +45,7 @@ width: auto; } } -}); +}; @@ -78,10 +77,10 @@ } #select_fach_abschluss > tbody > tr:last-child > td { - border-bottom: 1px solid @table-header-color; + border-bottom: 1px solid $table-header-color; } -.media-breakpoint-small-up({ +@include media-breakpoint-small-up(){ #select_fach_abschluss tbody { td::before { display: none; @@ -104,4 +103,4 @@ text-align: center; } } -}); +}; diff --git a/resources/assets/stylesheets/less/raumzeit.less b/resources/assets/stylesheets/scss/raumzeit.scss similarity index 77% rename from resources/assets/stylesheets/less/raumzeit.less rename to resources/assets/stylesheets/scss/raumzeit.scss index 96d8303c3e164287a9da4f0536fedd56faa149a5..fde8fd3ff0e989fab00371a279c35fbb7ba7c167 100644 --- a/resources/assets/stylesheets/less/raumzeit.less +++ b/resources/assets/stylesheets/scss/raumzeit.scss @@ -15,27 +15,27 @@ div.at_least_one_teacher { } .is_ex_termin { - color: @dark-gray-color-80; + color: $dark-gray-color-80; text-decoration: line-through; } .contentbox.timesrooms { > form { article { - border-color: @content-color-40; + border-color: $content-color-40; border-style: solid; border-width: 1px; margin: 10px; > section { - max-height: 0px; + max-height: 0; opacity: 0; padding: 0; transition: opacity 0.3s; } &:not(.open) header ~ * { - max-height: 0px; + max-height: 0; opacity: 0; overflow: auto; transition: opacity 0.3s; @@ -64,7 +64,7 @@ div.at_least_one_teacher { // Show visual toggle indicator header h1 a { - .icon('before', 'arr_1right', 'clickable'); + @include icon(before, arr_1right, clickable); } &.open { @@ -76,23 +76,22 @@ div.at_least_one_teacher { } article header { &.red { - border-left: 3px solid @red; + border-left: 3px solid $red; } &.yellow { - border-left: 3px solid @activity-color; + border-left: 3px solid $activity-color; } &.green { - border-left: 3px solid @green; + border-left: 3px solid $green; } &.red .tooltip-icon { - .icon('before', 'arr_1right', 'clickable'); - .icon('before', 'radiobutton-checked', 'status-red'); + @include icon(before, radiobutton-checked, status-red); } &.yellow .tooltip-icon { - .icon('before', 'radiobutton-checked', 'status-yellow'); + @include icon(before, radiobutton-checked, status-yellow); } &.green .tooltip-icon { - .icon('before', 'radiobutton-checked', 'status-green'); + @include icon(before, radiobutton-checked, status-green); } } form.default { diff --git a/resources/assets/stylesheets/scss/scroll-to-top.scss b/resources/assets/stylesheets/scss/scroll-to-top.scss new file mode 100644 index 0000000000000000000000000000000000000000..9765db55f120b92fec7019fb1ec2983c3a517eae --- /dev/null +++ b/resources/assets/stylesheets/scss/scroll-to-top.scss @@ -0,0 +1,28 @@ +$scroll-to-top-height: 45px; +$scroll-to-top-width: 45px; +$scroll-to-top-margin: 35px; + +body #scroll-to-top { + width: $scroll-to-top-height; + height: $scroll-to-top-width; + margin-right: $scroll-to-top-margin; + margin-bottom: $scroll-to-top-margin; + padding: 10px; + background: $base-color; + border: .05rem solid transparent; + background-clip: padding-box; + cursor: pointer; + box-sizing: border-box; + position: fixed; + right: 0; + bottom: 0; + transition: all 250ms ease-in-out; + z-index: 1; + &:hover { + background: $brand-color-darker; + border-radius: .12rem; + } + &.hide { + bottom: calc( 0px - #{$scroll-to-top-height - $scroll-to-top-margin}); + } +} diff --git a/resources/assets/stylesheets/less/skiplinks.less b/resources/assets/stylesheets/scss/skiplinks.scss similarity index 77% rename from resources/assets/stylesheets/less/skiplinks.less rename to resources/assets/stylesheets/scss/skiplinks.scss index b57cdf90461518c80368045c7a77d6d7a97c005f..b30a43d5337143087f0f3ef807f70459eb89f78d 100644 --- a/resources/assets/stylesheets/less/skiplinks.less +++ b/resources/assets/stylesheets/scss/skiplinks.scss @@ -1,7 +1,7 @@ /* skiplink-area highlighting -------------------------------------------- */ #skip_link_navigation { - background-color: #fff; - border: 2px solid #f60; + background-color: $white; + border: 2px solid $orange; left: -600px; margin: 0; padding: 10px; @@ -18,7 +18,7 @@ .skip_target { position: absolute; - .hide-text(); + @include hide-text(); } #skiplink_list { @@ -27,15 +27,15 @@ button.skiplink { border: 0; - background-color: #fff; - color: @base-color; + background-color: $white; + color: $base-color; line-height: 1em; margin-bottom: 0.1em; } body.enable-skiplinks { *:not(:empty):focus { - outline: 2px dashed @orange; + outline: 2px dashed $orange; } #tabs { diff --git a/resources/assets/stylesheets/less/start.less b/resources/assets/stylesheets/scss/start.scss similarity index 84% rename from resources/assets/stylesheets/less/start.less rename to resources/assets/stylesheets/scss/start.scss index 32ad49b6a1ba3fbb3405116f42b9f5f8cf873d67..29a3f2762e604caa3090902a55f66fcdd0cf90c8 100644 --- a/resources/assets/stylesheets/less/start.less +++ b/resources/assets/stylesheets/scss/start.scss @@ -1,5 +1,5 @@ #sort1, #sort0, #sort3 { - padding : 0 0px; + padding : 0; } #admin_widget_container { padding-top: 1em; @@ -8,7 +8,7 @@ #main, #choices { width: 99%; - border: 1px solid @dark-gray-color-60; + border: 1px solid $dark-gray-color-60; } .studip-widget-wrapper { @@ -17,21 +17,18 @@ } .studip-widget { - border: 1px solid @base-color-20; + border: 1px solid $base-color-20; transition: border-color 300ms ease-in-out; .widget-header { box-sizing: border-box; - - background-color: @content-color-20; - color: @brand-color-dark; - + background-color: $content-color-20; + color: $brand-color-dark; font-size: 1.1em; font-weight: bold; line-height: 2em; padding: 0 1ex; text-align: left; - overflow: hidden; text-overflow: ellipsis; } @@ -57,12 +54,12 @@ } .studip-widget:hover { - border: 1px solid @brand-color-darker; + border: 1px solid $brand-color-darker; transition: border-color 300ms ease-in-out; } #widget_choices{ - border-right: 1px dashed @brand-color-darker; + border-right: 1px dashed $brand-color-darker; margin-right: 25px; } .start-widgetcontainer { @@ -83,7 +80,7 @@ width: 100%; } .ui-widgetContainer { - color: white; + color: $white; background-image: none; } @@ -95,9 +92,9 @@ line-height: 30px; text-align: center; - color: white; + color: $white; font-size: 1.3em; - background-color: @content-color; + background-color: $content-color; } .ui-widget_head:hover { @@ -107,24 +104,24 @@ .ui-widget_head h1 { line-height: 100px; text-align: center; - color: black; + color: $black; } .addclip-widgets { - color: #000; + color: $black; list-style: none; margin: 0; padding: 0; a:link, a:visited { - color: #000; + color: $black; } a:hover, a:active { - color: @active-color; + color: $active-color; } li { - border-top: 1px solid @content-color; + border-top: 1px solid $content-color; padding: 4px 0; &:first-child { @@ -166,7 +163,7 @@ div.start-widgetcontainer { display: none; } &.move { - border: @base-color-80 dashed 1px; + border: $base-color-80 dashed 1px; } } } @@ -195,7 +192,7 @@ div.available-widgets { } &.move { - border: @base-color-80 dashed 1px; + border: $base-color-80 dashed 1px; } } diff --git a/resources/assets/stylesheets/less/studygroup.less b/resources/assets/stylesheets/scss/studygroup.scss similarity index 94% rename from resources/assets/stylesheets/less/studygroup.less rename to resources/assets/stylesheets/scss/studygroup.scss index 84fe43800babbb4813354e29ca62b535b943088c..7bdefb4d00ca35a290168bb293dde2e8c821530d 100644 --- a/resources/assets/stylesheets/less/studygroup.less +++ b/resources/assets/stylesheets/scss/studygroup.scss @@ -26,7 +26,7 @@ ul.studygroup-gallery { } } .new-member .member-avatar { - .icon('after', 'star', 'new', 12); + @include icon(after, star, new, 12px); &::after { position: absolute; margin: -1px 0 0 -14px; diff --git a/resources/assets/stylesheets/less/tfa.less b/resources/assets/stylesheets/scss/tfa.scss similarity index 85% rename from resources/assets/stylesheets/less/tfa.less rename to resources/assets/stylesheets/scss/tfa.scss index b5b38f5f0b560de5964c7d6778966a74d8be5948..e6b939000c4f5a332bacdf836ef98824969fa779 100644 --- a/resources/assets/stylesheets/less/tfa.less +++ b/resources/assets/stylesheets/scss/tfa.scss @@ -13,7 +13,7 @@ form.default { .tfa-code-input { text-align: center; .tfa-code-wrapper { - border: 1px solid @base-gray; + border: 1px solid $base-gray; display: inline-block; font-size: 2em; line-height: 2em; @@ -21,7 +21,7 @@ form.default { } input[type="number"] { - background: @dark-gray-color-10; + background: $dark-gray-color-10; border: 0; box-sizing: unset; font-family: monospace; @@ -33,15 +33,15 @@ form.default { text-align: center; vertical-align: top; - color: @base-gray; + color: $base-gray; &:focus { - background-color: @activity-color-20; - color: #000; + background-color: $activity-color-20; + color:$black; outline: 0; } &:invalid { box-shadow: none; - color: #888; + color: $base-gray; outline: 0; } diff --git a/resources/assets/stylesheets/less/tour.less b/resources/assets/stylesheets/scss/tour.scss similarity index 70% rename from resources/assets/stylesheets/less/tour.less rename to resources/assets/stylesheets/scss/tour.scss index e0068cda1418b63c028554d57e54d06ac7aebc94..006a732dd4ac72de831e1616a84037d7d7cde121 100644 --- a/resources/assets/stylesheets/less/tour.less +++ b/resources/assets/stylesheets/scss/tour.scss @@ -17,10 +17,10 @@ bottom: 20px; right: 20px; z-index:20001; - border: solid 1px #28497c; - background-color: #ffffff; + border: solid 1px $base-color; + background-color: $white; padding: 10px 10px; - font-family: @font-family-base; + font-family: $font-family-base; overflow-y: auto; box-shadow: 0px 0px 8px rgba(0,0,0,0.5); } @@ -30,7 +30,7 @@ } .tour_focus_box { - border: 2px dashed #ffbd33; + border: 2px dashed $yellow; } #tour_tip { @@ -38,25 +38,26 @@ position: absolute; z-index:20000; max-width: 300px; - font-family: @font-family-base; + font-family: $font-family-base; font-size: 16px; box-sizing: border-box; - background-color: #28497c; - color: #ffffff; border: - solid 1px #aaaaaa; + background-color: $base-color; + color: $white; + border: solid 1px $dark-gray-color-80; box-shadow: 0px 0px 8px rgba(0,0,0,0.5); + a.link-extern { - .icon('before', 'link-extern', 'info_alt', 16, 2px); + @include icon(before, link-extern, info-alt); } a.link-intern { - .icon('before', 'link-intern', 'info_alt', 16, 2px); + @include icon(before, link-intern, info-alt); } a, a:link, a:visited { - color: #FFFFFF; + color: $white; text-decoration: none; } a:hover, a:active, a:hover.index, a:active.index, a:hover.tree { - color: #FFFFFF; + color: $white; text-decoration: underline; } } @@ -66,12 +67,12 @@ position: absolute; z-index:20000; max-width: 300px; - font-family: @font-family-base; + font-family: $font-family-base; font-size: 16px; box-sizing: border-box; - background-color: #ffbd33; - color: #000000; - border: solid 1px #aaaaaa; + background-color: $yellow; + color: $black; + border: solid 1px $dark-gray-color-10; box-shadow: 0px 0px 8px rgba(0,0,0,0.5); } @@ -87,7 +88,7 @@ } #tour_overlay { - background-color: #ffffff; + background-color: $white; opacity: 0.4; position: fixed; z-index: 10000; @@ -96,7 +97,7 @@ } #tour_selector_overlay { - background-color: #000000; + background-color: $white; opacity: 0.5; position: absolute; } diff --git a/resources/assets/stylesheets/studip.less b/resources/assets/stylesheets/studip.less index 739121c8e5a2232cd075d1e88911d1e7e6ec69fb..d521c36d894605509f11a88c8af873637bbab4bb 100644 --- a/resources/assets/stylesheets/studip.less +++ b/resources/assets/stylesheets/studip.less @@ -11,7 +11,6 @@ @import "less/visibility.less"; @import "less/responsive.less"; -@import "less/links.less"; @import "less/tables.less"; @import "less/forms.less"; @import "less/content.less"; @@ -38,12 +37,10 @@ @import "less/messages.less"; @import "less/quicksearch.less"; @import "less/search.less"; -@import "less/skiplinks.less"; @import "less/tabs.less"; @import "less/questionnaire.less"; @import "less/copyable-links.less"; -@import "less/admin.less"; @import "less/calendar.less"; @import "less/contacts.less"; @import "less/cronjobs.less"; @@ -55,19 +52,13 @@ @import "less/news.less"; @import "less/schedule.less"; @import "less/study-area-selection.less"; -@import "less/tour.less"; @import "less/ilias-interface.less"; -@import "less/studygroup.less"; -@import "less/raumzeit.less"; @import "less/opengraph.less"; @import "less/statusgroups.less"; -@import "less/start.less"; -@import "less/profile.less"; @import "less/consultation.less"; @import "less/activityfeed.less"; @import "less/mobile.less"; -@import "less/pagination.less"; @import "less/enrolment.less"; @import "less/dialog.less"; @import "less/studip-overlay.less"; @@ -78,8 +69,6 @@ @import "less/smileys.less"; @import "less/big-image-handler.less"; @import "less/i18n.less"; -@import "less/tfa.less"; -@import "less/scroll-to-top.less"; @import "less/globalsearch.less"; @import "less/gradebook.less"; @@ -88,7 +77,6 @@ @import "less/deprecated.less"; -@import "less/mvv.less"; @import "less/overlapping.less"; @import "less/feedback.less"; diff --git a/resources/assets/stylesheets/studip.scss b/resources/assets/stylesheets/studip.scss index 62bc7b59ca9c451205f4a39bd91a1bcf09687373..4b8ae99f6fa7388972800a4d4346df0d9795195b 100644 --- a/resources/assets/stylesheets/studip.scss +++ b/resources/assets/stylesheets/studip.scss @@ -9,6 +9,7 @@ @import "scss/visibility"; @import "scss/actionmenu"; +@import "scss/admin"; @import "scss/admin-courses"; @import "scss/admission"; @import "scss/avatar"; @@ -21,10 +22,15 @@ @import "scss/forum"; @import "scss/fullscreen"; @import "scss/progress_indicator.scss"; +@import "scss/links"; @import "scss/my_courses"; +@import "scss/mvv"; @import "scss/oer"; @import "scss/qrcode"; @import "scss/oauth2"; +@import "scss/pagination"; +@import "scss/profile"; +@import "scss/raumzeit"; @import "scss/report"; @import "scss/resources"; @import "scss/sidebar"; @@ -32,6 +38,12 @@ @import "scss/table_of_contents"; @import "scss/wiki"; @import "scss/select"; +@import "scss/skiplinks"; +@import "scss/start"; +@import "scss/scroll-to-top"; +@import "scss/studygroup"; +@import "scss/tfa"; +@import "scss/tour"; @import "scss/grid";