From 8105a913ebc6c828131aca341e34b7ce45039432 Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Wed, 31 May 2023 07:45:42 +0000
Subject: [PATCH] restore forum column width, switch hover color to blue, re
#2469
Merge request studip/studip!1818
---
app/views/course/forum/index/_areas.php | 2 +-
app/views/course/forum/index/_threads.php | 2 +-
public/assets/images/grabber_black.svg | 20 +------------------
public/assets/images/grabber_blue.svg | 1 +
public/assets/images/grabber_grey.svg | 20 +------------------
public/assets/images/grabber_white.svg | 20 +------------------
.../assets/stylesheets/scss/drag-handle.scss | 2 +-
7 files changed, 7 insertions(+), 60 deletions(-)
create mode 100644 public/assets/images/grabber_blue.svg
diff --git a/app/views/course/forum/index/_areas.php b/app/views/course/forum/index/_areas.php
index 20aa3458f69..11f32be4777 100644
--- a/app/views/course/forum/index/_areas.php
+++ b/app/views/course/forum/index/_areas.php
@@ -42,7 +42,7 @@
</caption>
<colgroup>
- <col>
+ <col style="width: 30px">
<col>
<col>
<col class="hidden-tiny-down">
diff --git a/app/views/course/forum/index/_threads.php b/app/views/course/forum/index/_threads.php
index 5a93c8d466b..daf8a2972e9 100644
--- a/app/views/course/forum/index/_threads.php
+++ b/app/views/course/forum/index/_threads.php
@@ -12,7 +12,7 @@
<? if (!empty($list)) foreach ($list as $category_id => $entries) : ?>
<table class="default forum" data-category-id="<?= $category_id ?>">
<colgroup>
- <col>
+ <col style="width: 30px">
<col>
<col>
<col class="hidden-tiny-down">
diff --git a/public/assets/images/grabber_black.svg b/public/assets/images/grabber_black.svg
index 29586cbaef9..ac0a8c5dbd0 100644
--- a/public/assets/images/grabber_black.svg
+++ b/public/assets/images/grabber_black.svg
@@ -1,19 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 20 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
- <g id="c">
- <g id="d">
- <g>
- <ellipse cx="15.97" cy="18.02" rx="4.03" ry="4.01"/>
- <ellipse cx="15.97" cy="4.01" rx="4.03" ry="4.01"/>
- <ellipse cx="15.97" cy="32.03" rx="4.03" ry="4.01"/>
- <ellipse cx="15.97" cy="46.01" rx="4.03" ry="4.01"/>
- <ellipse cx="4.03" cy="10.97" rx="4.03" ry="4.01"/>
- <ellipse cx="4.03" cy="24.98" rx="4.03" ry="4.01"/>
- <ellipse cx="4.03" cy="38.96" rx="4.03" ry="4.01"/>
- <ellipse cx="15.97" cy="59.99" rx="4.03" ry="4.01"/>
- <ellipse cx="4.03" cy="52.95" rx="4.03" ry="4.01"/>
- </g>
- </g>
- </g>
-</svg>
+<svg viewBox="0 0 20 64" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2"><ellipse cx="15.97" cy="18.02" rx="4.03" ry="4.01"/><ellipse cx="15.97" cy="4.01" rx="4.03" ry="4.01"/><ellipse cx="15.97" cy="32.03" rx="4.03" ry="4.01"/><ellipse cx="15.97" cy="46.01" rx="4.03" ry="4.01"/><ellipse cx="4.03" cy="10.97" rx="4.03" ry="4.01"/><ellipse cx="4.03" cy="24.98" rx="4.03" ry="4.01"/><ellipse cx="4.03" cy="38.96" rx="4.03" ry="4.01"/><ellipse cx="15.97" cy="59.99" rx="4.03" ry="4.01"/><ellipse cx="4.03" cy="52.95" rx="4.03" ry="4.01"/></svg>
\ No newline at end of file
diff --git a/public/assets/images/grabber_blue.svg b/public/assets/images/grabber_blue.svg
new file mode 100644
index 00000000000..dd0b465aded
--- /dev/null
+++ b/public/assets/images/grabber_blue.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 20 64" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2"><g fill="#28497c"><ellipse cx="15.97" cy="18.02" rx="4.03" ry="4.01"/><ellipse cx="15.97" cy="4.01" rx="4.03" ry="4.01"/><ellipse cx="15.97" cy="32.03" rx="4.03" ry="4.01"/><ellipse cx="15.97" cy="46.01" rx="4.03" ry="4.01"/><ellipse cx="4.03" cy="10.97" rx="4.03" ry="4.01"/><ellipse cx="4.03" cy="24.98" rx="4.03" ry="4.01"/><ellipse cx="4.03" cy="38.96" rx="4.03" ry="4.01"/><ellipse cx="15.97" cy="59.99" rx="4.03" ry="4.01"/><ellipse cx="4.03" cy="52.95" rx="4.03" ry="4.01"/></g></svg>
\ No newline at end of file
diff --git a/public/assets/images/grabber_grey.svg b/public/assets/images/grabber_grey.svg
index 0809cf8d25d..d5917fccc3f 100644
--- a/public/assets/images/grabber_grey.svg
+++ b/public/assets/images/grabber_grey.svg
@@ -1,19 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 20 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
- <g id="c">
- <g id="d">
- <g>
- <ellipse cx="15.97" cy="18.02" rx="4.03" ry="4.01" style="fill:rgb(110,110,110);"/>
- <ellipse cx="15.97" cy="4.01" rx="4.03" ry="4.01" style="fill:rgb(110,110,110);"/>
- <ellipse cx="15.97" cy="32.03" rx="4.03" ry="4.01" style="fill:rgb(110,110,110);"/>
- <ellipse cx="15.97" cy="46.01" rx="4.03" ry="4.01" style="fill:rgb(110,110,110);"/>
- <ellipse cx="4.03" cy="10.97" rx="4.03" ry="4.01" style="fill:rgb(110,110,110);"/>
- <ellipse cx="4.03" cy="24.98" rx="4.03" ry="4.01" style="fill:rgb(110,110,110);"/>
- <ellipse cx="4.03" cy="38.96" rx="4.03" ry="4.01" style="fill:rgb(110,110,110);"/>
- <ellipse cx="15.97" cy="59.99" rx="4.03" ry="4.01" style="fill:rgb(110,110,110);"/>
- <ellipse cx="4.03" cy="52.95" rx="4.03" ry="4.01" style="fill:rgb(110,110,110);"/>
- </g>
- </g>
- </g>
-</svg>
+<svg viewBox="0 0 20 64" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2"><g fill="#6E6E6E"><ellipse cx="15.97" cy="18.02" rx="4.03" ry="4.01"/><ellipse cx="15.97" cy="4.01" rx="4.03" ry="4.01"/><ellipse cx="15.97" cy="32.03" rx="4.03" ry="4.01"/><ellipse cx="15.97" cy="46.01" rx="4.03" ry="4.01"/><ellipse cx="4.03" cy="10.97" rx="4.03" ry="4.01"/><ellipse cx="4.03" cy="24.98" rx="4.03" ry="4.01"/><ellipse cx="4.03" cy="38.96" rx="4.03" ry="4.01"/><ellipse cx="15.97" cy="59.99" rx="4.03" ry="4.01"/><ellipse cx="4.03" cy="52.95" rx="4.03" ry="4.01"/></g></svg>
\ No newline at end of file
diff --git a/public/assets/images/grabber_white.svg b/public/assets/images/grabber_white.svg
index 84af123ca74..4ea3c1a67e0 100644
--- a/public/assets/images/grabber_white.svg
+++ b/public/assets/images/grabber_white.svg
@@ -1,19 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 20 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
- <g id="c">
- <g id="d">
- <g>
- <ellipse cx="15.97" cy="18.02" rx="4.03" ry="4.01" style="fill:white;"/>
- <ellipse cx="15.97" cy="4.01" rx="4.03" ry="4.01" style="fill:white;"/>
- <ellipse cx="15.97" cy="32.03" rx="4.03" ry="4.01" style="fill:white;"/>
- <ellipse cx="15.97" cy="46.01" rx="4.03" ry="4.01" style="fill:white;"/>
- <ellipse cx="4.03" cy="10.97" rx="4.03" ry="4.01" style="fill:white;"/>
- <ellipse cx="4.03" cy="24.98" rx="4.03" ry="4.01" style="fill:white;"/>
- <ellipse cx="4.03" cy="38.96" rx="4.03" ry="4.01" style="fill:white;"/>
- <ellipse cx="15.97" cy="59.99" rx="4.03" ry="4.01" style="fill:white;"/>
- <ellipse cx="4.03" cy="52.95" rx="4.03" ry="4.01" style="fill:white;"/>
- </g>
- </g>
- </g>
-</svg>
+<svg viewBox="0 0 20 64" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2"><g fill="#fff"><ellipse cx="15.97" cy="18.02" rx="4.03" ry="4.01"/><ellipse cx="15.97" cy="4.01" rx="4.03" ry="4.01"/><ellipse cx="15.97" cy="32.03" rx="4.03" ry="4.01"/><ellipse cx="15.97" cy="46.01" rx="4.03" ry="4.01"/><ellipse cx="4.03" cy="10.97" rx="4.03" ry="4.01"/><ellipse cx="4.03" cy="24.98" rx="4.03" ry="4.01"/><ellipse cx="4.03" cy="38.96" rx="4.03" ry="4.01"/><ellipse cx="15.97" cy="59.99" rx="4.03" ry="4.01"/><ellipse cx="4.03" cy="52.95" rx="4.03" ry="4.01"/></g></svg>
\ No newline at end of file
diff --git a/resources/assets/stylesheets/scss/drag-handle.scss b/resources/assets/stylesheets/scss/drag-handle.scss
index 30925bc8646..4e8adc2256c 100644
--- a/resources/assets/stylesheets/scss/drag-handle.scss
+++ b/resources/assets/stylesheets/scss/drag-handle.scss
@@ -7,7 +7,7 @@
padding-left: 12px;
&:hover {
- background-image: url("#{$image-path}/grabber_black.svg");
+ background-image: url("#{$image-path}/grabber_blue.svg");
}
&.darkbackground:hover {
background-image: url("#{$image-path}/grabber_white.svg");
--
GitLab